Changeset 298
- Timestamp:
- 08/27/06 11:48:42 (18 years ago)
- Files:
-
- trunk/libfreebob/ChangeLog (modified) (1 diff)
- trunk/libfreebob/configure.ac (modified) (2 diffs)
- trunk/libfreebob/libfreebob/freebob.h (modified) (1 diff)
- trunk/libfreebob/src/bebob/bebob_avdevice.cpp (modified) (2 diffs)
- trunk/libfreebob/src/bounce/bounce_avdevice.cpp (modified) (3 diffs)
- trunk/libfreebob/src/bounce/bounce_avdevice.h (modified) (2 diffs)
- trunk/libfreebob/src/devicemanager.cpp (modified) (2 diffs)
- trunk/libfreebob/src/freebob.cpp (modified) (1 diff)
- trunk/libfreebob/src/Makefile.am (modified) (2 diffs)
- trunk/libfreebob/src/maudio (added)
- trunk/libfreebob/src/maudio/maudio_avdevice.cpp (added)
- trunk/libfreebob/src/maudio/maudio_avdevice.h (added)
- trunk/libfreebob/src/maudio/refdesign.xml (added)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libfreebob/ChangeLog
r297 r298 1 2006-08-27 Daniel Wagner <wagi@monom.org> 2 3 * configure.ac: Version set to 1.4.0 4 * maudio device support infrastructure added. Implements 5 IAvDevice interface, discover reads the information from 6 an xml file. 7 1 8 2006-08-22 Daniel Wagner <wagi@monom.org> 2 9 trunk/libfreebob/configure.ac
r297 r298 23 23 24 24 m4_define(freebob_major_version, 1) 25 m4_define(freebob_minor_version, 3)25 m4_define(freebob_minor_version, 4) 26 26 m4_define(freebob_micro_version, 0) 27 27 … … 197 197 ) 198 198 199 200 199 CFLAGS="$CFLAGS -Wall -std=gnu99" 201 CXXFLAGS="$CXXFLAGS -Wall "200 CXXFLAGS="$CXXFLAGS -Wall -DDATADIR=\\\"\$(datadir)\\\"" 202 201 203 202 if test "${debug}" = true; then trunk/libfreebob/libfreebob/freebob.h
r251 r298 167 167 freebob_get_version(); 168 168 169 constint169 int 170 170 freebob_get_api_version(); 171 171 trunk/libfreebob/src/bebob/bebob_avdevice.cpp
r297 r298 39 39 IMPL_DEBUG_MODULE( AvDevice, AvDevice, DEBUG_LEVEL_NORMAL ); 40 40 41 42 43 44 41 AvDevice::AvDevice( std::auto_ptr< ConfigRom >( configRom ), 42 Ieee1394Service& ieee1394service, 43 int nodeId, 44 int verboseLevel ) 45 45 : m_configRom( configRom ) 46 46 , m_1394Service( &ieee1394service ) … … 100 100 {0x00000f, 0x00010065}, // Mackie, Onyx Firewire 101 101 102 {0x0007f5, 0x00010048}, // BridgeCo, RD Audio1102 // {0x0007f5, 0x00010048}, // BridgeCo, RD Audio1 103 103 104 104 {0x000aac, 0x00000004}, // TerraTec Electronic GmbH, Phase X24 FW (model version 4) trunk/libfreebob/src/bounce/bounce_avdevice.cpp
r278 r298 35 35 IMPL_DEBUG_MODULE( BounceDevice, BounceDevice, DEBUG_LEVEL_NORMAL ); 36 36 37 BounceDevice::BounceDevice( Ieee1394Service& ieee1394service, 37 38 BounceDevice::BounceDevice( std::auto_ptr< ConfigRom >( configRom ), 39 Ieee1394Service& ieee1394service, 38 40 int nodeId, 39 41 int verboseLevel ) 40 : m_1394Service( &ieee1394service ) 42 : m_configRom( configRom ) 43 , m_1394Service( &ieee1394service ) 41 44 , m_nodeId( nodeId ) 42 45 , m_verboseLevel( verboseLevel ) … … 47 50 debugOutput( DEBUG_LEVEL_VERBOSE, "Created Bounce::BounceDevice (NodeID %d)\n", 48 51 nodeId ); 49 m_configRom = new ConfigRom( *m_1394Service, m_nodeId );50 m_configRom->initialize();51 52 } 52 53 … … 60 61 { 61 62 return *m_configRom; 63 } 64 65 bool 66 BounceDevice::probe( ConfigRom& configRom ) 67 { 68 // do the magic 69 70 return false; 62 71 } 63 72 trunk/libfreebob/src/bounce/bounce_avdevice.h
r241 r298 37 37 class BounceDevice : public IAvDevice { 38 38 public: 39 BounceDevice( Ieee1394Service& ieee1394Service, 39 BounceDevice( std::auto_ptr<ConfigRom>( configRom ), 40 Ieee1394Service& ieee1394Service, 40 41 int nodeId, 41 42 int verboseLevel ); 42 43 virtual ~BounceDevice(); 43 44 45 static bool probe( ConfigRom& configRom ); 44 46 virtual bool discover(); 45 47 virtual ConfigRom& getConfigRom() const; … … 50 52 51 53 protected: 54 std::auto_ptr<ConfigRom>( m_configRom ); 52 55 Ieee1394Service* m_1394Service; 53 ConfigRom* m_configRom;54 56 int m_nodeId; 55 57 int m_verboseLevel; trunk/libfreebob/src/devicemanager.cpp
r297 r298 29 29 #include "bebob/bebob_avdevice.h" 30 30 #include "bounce/bounce_avdevice.h" 31 #include "maudio/maudio_avdevice.h" 31 32 32 33 #include <iostream> … … 147 148 } 148 149 150 if ( MAudio::AvDevice::probe( *configRom.get() ) ) { 151 return new MAudio::AvDevice( configRom, *m_1394Service, id, level ); 152 } 153 154 if ( Bounce::BounceDevice::probe( *configRom.get() ) ) { 155 return new Bounce::BounceDevice( configRom, *m_1394Service, id, level ); 156 } 157 149 158 return 0; 150 159 } trunk/libfreebob/src/freebob.cpp
r251 r298 46 46 } 47 47 48 constint48 int 49 49 freebob_get_api_version() { 50 50 return FREEBOB_API_VERSION; trunk/libfreebob/src/Makefile.am
r293 r298 54 54 bounce/bounce_avdevice.h \ 55 55 bounce/bounce_avdevice.cpp \ 56 maudio/maudio_avdevice.h \ 57 maudio/maudio_avdevice.cpp \ 56 58 libfreebobavc/avc_connect.cpp \ 57 59 libfreebobavc/avc_definitions.cpp \ … … 101 103 $(LIBXML_LIBS) -lpthread 102 104 105 nobase_dist_pkgdata_DATA = \ 106 maudio/refdesign.xml 107 103 108 bin_PROGRAMS = freebob_downloader freebob_sync 104 109