Changeset 231
- Timestamp:
- 05/29/06 04:43:44 (18 years ago)
- Files:
-
- trunk/libfreebob/configure.ac (modified) (1 diff)
- trunk/libfreebob/src/bebob/bebob_avdevice.cpp (modified) (1 diff)
- trunk/libfreebob/src/bebob/bebob_avdevice.h (modified) (1 diff)
- trunk/libfreebob/src/bebob_light/bebob_light_avdevice.cpp (modified) (3 diffs)
- trunk/libfreebob/src/bebob_light/bebob_light_avdevice.h (modified) (2 diffs)
- trunk/libfreebob/src/bounce/bounce_avdevice.cpp (modified) (1 diff)
- trunk/libfreebob/src/bounce/bounce_avdevice.h (modified) (1 diff)
- trunk/libfreebob/src/configrom.cpp (modified) (1 diff)
- trunk/libfreebob/src/devicemanager.cpp (modified) (3 diffs)
- trunk/libfreebob/src/iavdevice.h (modified) (1 diff)
- trunk/libfreebob/src/libfreebobstreaming/freebob_streaming.c (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libfreebob/configure.ac
r224 r231 24 24 m4_define(freebob_major_version, 0) 25 25 m4_define(freebob_minor_version, 9) 26 m4_define(freebob_micro_version, 2)26 m4_define(freebob_micro_version, 3) 27 27 28 28 m4_define(freebob_version, freebob_major_version.freebob_minor_version.freebob_micro_version) trunk/libfreebob/src/bebob/bebob_avdevice.cpp
r187 r231 791 791 } 792 792 793 } 793 bool AvDevice::setId( unsigned int id) { 794 return true; 795 } 796 797 } trunk/libfreebob/src/bebob/bebob_avdevice.h
r187 r231 52 52 virtual bool setSamplingFrequency( ESamplingFrequency samplingFrequency ); 53 53 virtual void showDevice() const; 54 virtual bool setId(unsigned int id); 54 55 55 56 Ieee1394Service* get1394Service() trunk/libfreebob/src/bebob_light/bebob_light_avdevice.cpp
r188 r231 49 49 , m_nodeId( nodeId ) 50 50 , m_verboseLevel( verboseLevel ) 51 , m_id( 0 ) 51 52 { 52 53 if ( m_verboseLevel ) { … … 1262 1263 } 1263 1264 1265 asprintf( &result, "%d", m_id & 0xff ); 1266 if ( !xmlNewChild( connection, 0, 1267 BAD_CAST "Id", BAD_CAST result ) ) { 1268 debugError( "Couldn't create 'Id' node\n" ); 1269 return false; 1270 } 1271 1264 1272 asprintf( &result, "%d", m_1394Service->getPort() ); 1265 1273 if ( !xmlNewChild( connection, 0, … … 1674 1682 } 1675 1683 1676 } 1684 bool AvDevice::setId( unsigned int id) { 1685 m_id=id; 1686 return true; 1687 } 1688 1689 } trunk/libfreebob/src/bebob_light/bebob_light_avdevice.h
r188 r231 54 54 virtual bool setSamplingFrequency( ESamplingFrequency samplingFrequency ); 55 55 virtual void showDevice() const; 56 bool setId(unsigned int id); 56 57 57 58 protected: … … 109 110 nr_of_plugs_t m_serialBusIsochronousOutputPlugs; 110 111 112 unsigned int m_id; 113 111 114 DECLARE_DEBUG_MODULE; 112 115 }; trunk/libfreebob/src/bounce/bounce_avdevice.cpp
r185 r231 98 98 } 99 99 100 bool 101 BounceDevice::setId(unsigned int id) 102 { 103 return true; 100 104 } 105 106 } trunk/libfreebob/src/bounce/bounce_avdevice.h
r185 r231 47 47 virtual bool setSamplingFrequency( ESamplingFrequency samplingFrequency ); 48 48 virtual void showDevice() const; 49 virtual bool setId(unsigned int id); 49 50 50 51 protected: trunk/libfreebob/src/configrom.cpp
r224 r231 185 185 ( quadlet_t* )buffer) ) 186 186 { 187 debugOutput( DEBUG_LEVEL_VERBOSE, "ConfigRom: Read failed\n");187 //debugOutput( DEBUG_LEVEL_VERBOSE, "ConfigRom: Read failed\n"); 188 188 return -1; 189 189 } trunk/libfreebob/src/devicemanager.cpp
r188 r231 119 119 if ( avDevice ) { 120 120 m_avDevices.push_back( avDevice ); 121 122 if ( !avDevice->setId( m_avDevices.size() ) ) { 123 debugError( "setting Id failed\n" ); 124 } 121 125 if ( verboseLevel ) { 122 126 avDevice->showDevice(); … … 256 260 { 257 261 debugError( "Couldn't create 'NodeId' node" ); 258 return false;262 return 0; 259 263 } 260 264 … … 306 310 xmlFreeDoc( doc ); 307 311 xmlCleanupParser(); 308 return false;312 return 0; 309 313 } 310 314 trunk/libfreebob/src/iavdevice.h
r185 r231 37 37 virtual bool addXmlDescription( xmlNodePtr deviceNode ) = 0; 38 38 virtual void showDevice() const = 0; 39 virtual bool setId(unsigned int id) = 0; 39 40 }; 40 41 trunk/libfreebob/src/libfreebobstreaming/freebob_streaming.c
r224 r231 367 367 stream->parent->spec.plug, stream->spec.name); 368 368 */ 369 return snprintf (buffer, buffersize, " %s_%s",370 "cap", stream->spec.name);369 return snprintf (buffer, buffersize, "dev%d%s_%s", 370 stream->parent->spec.id , "c", stream->spec.name); 371 371 } else { 372 372 return -1; … … 383 383 stream->parent->spec.plug, stream->spec.name); 384 384 */ 385 return snprintf (buffer, buffersize, " %s_%s",386 "pbk", stream->spec.name);385 return snprintf (buffer, buffersize, "dev%d%s_%s", 386 stream->parent->spec.id, "p", stream->spec.name); 387 387 } else { 388 388 return -1; … … 2426 2426 memcpy(&connection->status.cip,&old_cip,sizeof(struct iec61883_cip)); 2427 2427 2428 // retry this packed 2429 retval=RAW1394_ISO_AGAIN; 2428 // retry this packet 2429 retval=RAW1394_ISO_AGAIN; 2430 // retval=RAW1394_ISO_DEFER; 2430 2431 nsamples=0; 2431 2432 } else {