- Timestamp:
- 12/03/06 14:15:46 (17 years ago)
- Files:
-
- branches/libfreebob-2.0/src/devicemanager.cpp (modified) (4 diffs)
- branches/libfreebob-2.0/src/devicemanager.h (modified) (1 diff)
- branches/libfreebob-2.0/src/Makefile.am (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/libfreebob-2.0/src/devicemanager.cpp
r265 r331 31 31 #include "bounce/bounce_avdevice.h" 32 32 #include "motu/motu_avdevice.h" 33 #include "rme/rme_avdevice.h" 33 34 34 35 #include <iostream> … … 42 43 #define MOTU_VENDOR_ID 0x000001f2 43 44 45 // The vendor ID for RME devices 46 #define RME_VENDOR_ID 0x00000a35 47 44 48 using namespace std; 45 49 … … 51 55 m_probeList.push_back( probeBeBoB ); 52 56 m_probeList.push_back( probeMotu ); 57 m_probeList.push_back( probeRme ); 53 58 m_probeList.push_back( probeBounce ); 54 59 } … … 227 232 } 228 233 234 IAvDevice* 235 DeviceManager::probeRme(Ieee1394Service& service, ConfigRom& configRom, int id, int level) 236 { 237 IAvDevice* avDevice; 238 239 // Do a first-pass test to see if it's likely that this device is a RME 240 if (configRom.getUnitSpecifierId() != RME_VENDOR_ID) { 241 debugOutput( DEBUG_LEVEL_VERBOSE, "Not a RME device...\n"); 242 return NULL; 243 } 244 245 avDevice = new Rme::RmeDevice( service, id, level ); 246 if ( !avDevice ) { 247 return NULL; 248 } 249 250 // RME's discover() needs to differentiate between different models, so 251 // for now keep all probing code in there since that's how we had to 252 // do it for MOTU. If RME turns out to be simpler we could move the 253 // logic into here. 254 if ( !avDevice->discover() ) { 255 debugOutput( DEBUG_LEVEL_VERBOSE, "Not a RME device...\n"); 256 delete avDevice; 257 return NULL; 258 } 259 debugOutput( DEBUG_LEVEL_VERBOSE, "RME device discovered...\n"); 260 261 return avDevice; 262 } 263 229 264 bool 230 265 DeviceManager::isValidNode(int node) branches/libfreebob-2.0/src/devicemanager.h
r262 r331 64 64 static IAvDevice* probeBounce(Ieee1394Service& service, ConfigRom& configRom, int id, int level); 65 65 static IAvDevice* probeMotu(Ieee1394Service& service, ConfigRom& configRom, int id, int level); 66 static IAvDevice* probeRme(Ieee1394Service& service, ConfigRom& configRom, int id, int level); 66 67 67 68 protected: branches/libfreebob-2.0/src/Makefile.am
r250 r331 33 33 bebob_light/bebob_light_avplug.h \ 34 34 bounce/bounce_avdevice.h \ 35 motu/motu_avdevice.h 35 motu/motu_avdevice.h \ 36 rme/rme_avdevice.h 36 37 # bebob/bebob_avdevice.h \ 37 38 # bebob/bebob_avdevice_subunit.h \ … … 49 50 bebob_light/bebob_light_avplug.cpp \ 50 51 bounce/bounce_avdevice.cpp \ 51 motu/motu_avdevice.cpp 52 motu/motu_avdevice.cpp \ 53 rme/rme_avdevice.cpp 54 52 55 # bebob/bebob_avdevice.cpp \ 53 56 # bebob/bebob_avdevice_xml.cpp \