Changeset 739 for trunk/libffado/src/ffadodevice.cpp
- Timestamp:
- 11/28/07 12:02:08 (16 years ago)
- Files:
-
- trunk/libffado/src/ffadodevice.cpp (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libffado/src/ffadodevice.cpp
r734 r739 33 33 #include <assert.h> 34 34 35 IMPL_DEBUG_MODULE( FFADODevice, FFADODevice, DEBUG_LEVEL_ VERBOSE);35 IMPL_DEBUG_MODULE( FFADODevice, FFADODevice, DEBUG_LEVEL_NORMAL ); 36 36 37 FFADODevice::FFADODevice( Ieee1394Service& ieee1394Service, 38 std::auto_ptr<ConfigRom>( configRom )) 37 FFADODevice::FFADODevice( std::auto_ptr<ConfigRom>( configRom )) 39 38 : Control::Container() 40 39 , m_pConfigRom( configRom ) 41 , m_p1394Service( &ieee1394Service )42 40 { 43 41 addOption(Util::OptionContainer::Option("id",std::string("dev?"))); … … 59 57 60 58 FFADODevice * 61 FFADODevice::createDevice( Ieee1394Service& , 62 std::auto_ptr<ConfigRom>( x )) 59 FFADODevice::createDevice(std::auto_ptr<ConfigRom>( x )) 63 60 { 64 61 // re-implement this!! … … 89 86 { 90 87 return *m_pConfigRom; 88 } 89 90 Ieee1394Service& 91 FFADODevice::get1394Service() 92 { 93 return getConfigRom().get1394Service(); 91 94 } 92 95 … … 144 147 FFADODevice::showDevice() 145 148 { 146 debugOutput(DEBUG_LEVEL_NORMAL, "Node...........: %d\n", getNodeId()); 147 debugOutput(DEBUG_LEVEL_NORMAL, "GUID...........: %s\n", getConfigRom().getGuidString().c_str()); 148 149 Ieee1394Service& s = getConfigRom().get1394Service(); 150 debugOutput(DEBUG_LEVEL_NORMAL, "Attached to port.......: %d (%s)\n", 151 s.getPort(), s.getPortName().c_str()); 152 debugOutput(DEBUG_LEVEL_NORMAL, "Node...................: %d\n", getNodeId()); 153 debugOutput(DEBUG_LEVEL_NORMAL, "GUID...................: %s\n", 154 getConfigRom().getGuidString().c_str()); 155 149 156 std::string id=std::string("dev? [none]"); 150 157 getOption("id", id); 151 158 152 159 debugOutput(DEBUG_LEVEL_NORMAL, "Assigned ID....: %s\n", id.c_str()); 153 160