Changeset 58
- Timestamp:
- 01/23/05 09:12:24 (18 years ago)
- Files:
-
- trunk/freebob/src/avdevice.cpp (modified) (4 diffs)
- trunk/freebob/src/avdevice.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/freebob/src/avdevice.cpp
r57 r58 33 33 AvDevice::AvDevice(octlet_t oGuid) 34 34 : m_iNodeId( -1 ) 35 , m_handle( 0 )36 35 , m_iPort( -1 ) 37 36 , m_bInitialised( false ) … … 56 55 for( it = cSubUnits.begin(); it != cSubUnits.end(); it++ ) { 57 56 delete *it; 58 }59 60 if ( m_handle ) {61 raw1394_destroy_handle( m_handle );62 m_handle = 0;63 57 } 64 58 AvDevicePool::instance()->unregisterAvDevice( this ); … … 97 91 { 98 92 if ( !m_bInitialised ) { 99 FBReturnCodes eStatus = create1394RawHandle(); 100 if ( eStatus != eFBRC_Success ) { 101 debugError( "Could not create 1394 raw handle\n" ); 102 return eStatus; 103 } 104 105 eStatus = enumerateSubUnits(); 93 FBReturnCodes eStatus = enumerateSubUnits(); 106 94 if ( eStatus != eFBRC_Success ) { 107 95 debugError( "Could not enumrate SubUnits\n" ); … … 117 105 { 118 106 return m_bInitialised; 119 }120 121 FBReturnCodes AvDevice::create1394RawHandle()122 {123 m_handle = raw1394_new_handle();124 if ( !m_handle ) {125 if ( !errno ) {126 debugPrint( DEBUG_LEVEL_DEVICE,127 "libraw1394 not compatible.\n" );128 } else {129 perror( "Could not get 1394 handle" );130 debugPrint(DEBUG_LEVEL_DEVICE,131 "Is ieee1394 and raw1394 driver loaded?\n");132 }133 return eFBRC_Creating1394HandleFailed;134 }135 136 raw1394_set_userdata( m_handle, this );137 138 if ( raw1394_set_port( m_handle, m_iPort ) < 0 ) {139 perror( "Could not set port" );140 return eFBRC_Setting1394PortFailed;141 }142 return eFBRC_Success;143 107 } 144 108 trunk/freebob/src/avdevice.h
r57 r58 93 93 private: 94 94 int m_iNodeId; 95 raw1394handle_t m_handle;96 95 int m_iPort; 97 96 bool m_bInitialised;