Changeset 404
- Timestamp:
- 02/18/07 07:09:00 (16 years ago)
- Files:
-
- branches/streaming-rework/configure.ac (modified) (9 diffs)
- branches/streaming-rework/src/bebob/bebob_avdevice.cpp (modified) (8 diffs)
- branches/streaming-rework/src/bebob/bebob_avdevice.h (modified) (4 diffs)
- branches/streaming-rework/src/bebob/bebob_avdevice_subunit.cpp (modified) (2 diffs)
- branches/streaming-rework/src/bebob/bebob_avdevice_subunit.h (modified) (2 diffs)
- branches/streaming-rework/src/bebob/bebob_avdevice_xml.cpp (modified) (2 diffs)
- branches/streaming-rework/src/bebob/bebob_avplug.cpp (modified) (2 diffs)
- branches/streaming-rework/src/bebob/bebob_avplug.h (modified) (2 diffs)
- branches/streaming-rework/src/bebob/bebob_avplug_xml.cpp (modified) (2 diffs)
- branches/streaming-rework/src/bebob/bebob_dl_bcd.cpp (modified) (2 diffs)
- branches/streaming-rework/src/bebob/bebob_dl_bcd.h (modified) (2 diffs)
- branches/streaming-rework/src/bebob/bebob_dl_codes.cpp (modified) (2 diffs)
- branches/streaming-rework/src/bebob/bebob_dl_codes.h (modified) (2 diffs)
- branches/streaming-rework/src/bebob/bebob_dl_mgr.cpp (modified) (2 diffs)
- branches/streaming-rework/src/bebob/bebob_dl_mgr.h (modified) (2 diffs)
- branches/streaming-rework/src/bebob/bebob_functionblock.cpp (modified) (2 diffs)
- branches/streaming-rework/src/bebob/bebob_functionblock.h (modified) (2 diffs)
- branches/streaming-rework/src/bounce/bounce_avdevice.cpp (modified) (2 diffs)
- branches/streaming-rework/src/bounce/bounce_avdevice.h (modified) (2 diffs)
- branches/streaming-rework/src/devicemanager.cpp (modified) (7 diffs)
- branches/streaming-rework/src/dice (added)
- branches/streaming-rework/src/dice/dice_avdevice.cpp (added)
- branches/streaming-rework/src/dice/dice_avdevice.h (added)
- branches/streaming-rework/src/libstreaming/AmdtpPort.cpp (modified) (2 diffs)
- branches/streaming-rework/src/libstreaming/AmdtpPort.h (modified) (2 diffs)
- branches/streaming-rework/src/libstreaming/AmdtpPortInfo.cpp (modified) (3 diffs)
- branches/streaming-rework/src/libstreaming/AmdtpPortInfo.h (modified) (3 diffs)
- branches/streaming-rework/src/libstreaming/AmdtpStreamProcessor.cpp (modified) (3 diffs)
- branches/streaming-rework/src/libstreaming/AmdtpStreamProcessor.h (modified) (3 diffs)
- branches/streaming-rework/src/libstreaming/MotuPort.cpp (modified) (2 diffs)
- branches/streaming-rework/src/libstreaming/MotuPort.h (modified) (2 diffs)
- branches/streaming-rework/src/libstreaming/MotuPortInfo.cpp (modified) (2 diffs)
- branches/streaming-rework/src/libstreaming/MotuPortInfo.h (modified) (2 diffs)
- branches/streaming-rework/src/Makefile.am (modified) (3 diffs)
- branches/streaming-rework/src/maudio/maudio_avdevice.cpp (modified) (2 diffs)
- branches/streaming-rework/src/maudio/maudio_avdevice.h (modified) (2 diffs)
- branches/streaming-rework/src/metrichalo (added)
- branches/streaming-rework/src/metrichalo/mh_avdevice.cpp (added)
- branches/streaming-rework/src/metrichalo/mh_avdevice.h (added)
- branches/streaming-rework/src/motu/motu_avdevice.cpp (modified) (6 diffs)
- branches/streaming-rework/src/motu/motu_avdevice.h (modified) (3 diffs)
- branches/streaming-rework/src/rme/rme_avdevice.cpp (modified) (8 diffs)
- branches/streaming-rework/src/rme/rme_avdevice.h (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/streaming-rework/configure.ac
r400 r404 203 203 dnl Conditional compilation of targets 204 204 205 dnl Build BeBoB code? 206 207 build_bebob=true 205 dnl --- Build BeBoB code? 206 208 207 AC_ARG_ENABLE(bebob, 209 208 AC_HELP_STRING([--enable-bebob], … … 213 212 no) build_bebob=false;; 214 213 *) AC_MSG_ERROR(bad value ${enableval} for --enable-bebob) ;; 215 esac], [build_bebob=false])216 217 dnl Build Motu code? 218 219 build_motu=false 214 esac], 215 [build_bebob=true]) 216 217 dnl --- Build Motu code? 218 220 219 AC_ARG_ENABLE(motu, 221 220 AC_HELP_STRING([--enable-motu], … … 225 224 no) build_motu=false;; 226 225 *) AC_MSG_ERROR(bad value ${enableval} for --enable-motu) ;; 227 esac], [build_motu=false])228 229 dnl Build DICE code? 230 231 build_dice=false 226 esac], 227 [build_motu=false]) 228 229 dnl --- Build DICE code? 230 232 231 AC_ARG_ENABLE(dice, 233 232 AC_HELP_STRING([--enable-dice], … … 237 236 no) build_dice=false;; 238 237 *) AC_MSG_ERROR(bad value ${enableval} for --enable-dice) ;; 239 esac], [build_dice=false])240 241 dnl Build Metric Halo code? 242 243 build_metric_halo=false 238 esac], 239 [build_dice=false]) 240 241 dnl --- Build Metric Halo code? 242 244 243 AC_ARG_ENABLE(metric-halo, 245 244 AC_HELP_STRING([--enable-metric-halo], 246 [build Metric Halo support ( default=no)]),245 [build Metric Halo support (note: completely useless) (default=no)]), 247 246 [case "${enableval}" in 248 247 yes) build_metric_halo=true;; 249 248 no) build_metric_halo=false;; 250 249 *) AC_MSG_ERROR(bad value ${enableval} for --enable-metric-halo) ;; 251 esac],[build_metric_halo=false]) 250 esac], 251 [build_metric_halo=false]) 252 253 dnl --- Build Metric Halo code? 254 255 AC_ARG_ENABLE(rme, 256 AC_HELP_STRING([--enable-rme], 257 [build RME support (note: completely useless) (default=no)]), 258 [case "${enableval}" in 259 yes) build_rme=true;; 260 no) build_rme=false;; 261 *) AC_MSG_ERROR(bad value ${enableval} for --enable-rme) ;; 262 esac], 263 [build_rme=false]) 264 265 dnl --- Build Bounce device code? 266 267 AC_ARG_ENABLE(bounce, 268 AC_HELP_STRING([--enable-bounce], 269 [build Bounce device support (default=no)]), 270 [case "${enableval}" in 271 yes) build_bounce=true;; 272 no) build_bounce=false;; 273 *) AC_MSG_ERROR(bad value ${enableval} for --enable-bounce) ;; 274 esac], 275 [build_bounce=false]) 276 277 dnl --- Build support for all supported devices? 278 279 AC_ARG_ENABLE(all-devices, 280 AC_HELP_STRING([--enable-all-devices], 281 [build support for all supported devices (default=no)]), 282 [case "${enableval}" in 283 yes) build_all=true;; 284 no) build_all=false;; 285 *) AC_MSG_ERROR(bad value ${enableval} for --enable-all-devices) ;; 286 esac], 287 [build_all=false]) 252 288 253 289 … … 264 300 265 301 dnl Device classes 302 if test "${build_all}" = true; then 303 build_bebob=true 304 build_motu=true 305 build_dice=true 306 build_metric_halo=true 307 build_bounce=true 308 build_rme=true 309 fi; 310 266 311 if test "${build_bebob}" = true; then 267 312 CFLAGS="$CFLAGS -DENABLE_BEBOB" 268 313 CXXFLAGS="$CXXFLAGS -DENABLE_BEBOB" 269 314 supported_devices="${supported_devices}BeBoB " 315 BIN_PROGRAMS="$BIN_PROGRAMS freebob-downloader freebob-sync" 270 316 fi; 271 317 … … 274 320 CXXFLAGS="$CXXFLAGS -DENABLE_MOTU" 275 321 supported_devices="${supported_devices}Motu " 322 BIN_PROGRAMS="$BIN_PROGRAMS" 276 323 fi; 277 324 … … 280 327 CXXFLAGS="$CXXFLAGS -DENABLE_DICE" 281 328 supported_devices="${supported_devices}DICE " 329 BIN_PROGRAMS="$BIN_PROGRAMS" 282 330 fi; 283 331 … … 285 333 CFLAGS="$CFLAGS -DENABLE_METRIC_HALO" 286 334 CXXFLAGS="$CXXFLAGS -DENABLE_METRIC_HALO" 287 supported_devices="${supported_devices}Metric Halo " 335 supported_devices="${supported_devices}Metric Halo (useless) " 336 BIN_PROGRAMS="$BIN_PROGRAMS" 337 fi; 338 339 if test "${build_bounce}" = true; then 340 CFLAGS="$CFLAGS -DENABLE_BOUNCE" 341 CXXFLAGS="$CXXFLAGS -DENABLE_BOUNCE" 342 supported_devices="${supported_devices}Bounce " 343 BIN_PROGRAMS="$BIN_PROGRAMS" 344 fi; 345 346 if test "${build_rme}" = true; then 347 CFLAGS="$CFLAGS -DENABLE_RME" 348 CXXFLAGS="$CXXFLAGS -DENABLE_RME" 349 supported_devices="${supported_devices}RME (useless) " 350 BIN_PROGRAMS="$BIN_PROGRAMS" 288 351 fi; 289 352 … … 312 375 AC_SUBST([LIBXML_CFLAGS]) 313 376 377 AC_SUBST([BIN_PROGRAMS]) 378 314 379 AC_CONFIG_FILES([Makefile 315 380 doc/Makefile branches/streaming-rework/src/bebob/bebob_avdevice.cpp
r396 r404 19 19 */ 20 20 21 #ifdef ENABLE_BEBOB 22 21 23 #include "bebob/bebob_avdevice.h" 22 24 #include "bebob/bebob_avdevice_subunit.h" … … 39 41 40 42 IMPL_DEBUG_MODULE( AvDevice, AvDevice, DEBUG_LEVEL_NORMAL ); 43 44 static VendorModelEntry supportedDeviceList[] = 45 { 46 {0x00000f, 0x00010065, "Mackie", "Onyx Firewire"}, 47 48 {0x0003db, 0x00010048, "Apogee Electronics", "Rosetta 200"}, 49 50 {0x0007f5, 0x00010048, "BridgeCo", "RD Audio1"}, 51 52 {0x000a92, 0x00010000, "PreSonus", "FIREBOX"}, 53 {0x000a92, 0x00010066, "PreSonus", "FirePOD"}, 54 55 {0x000aac, 0x00000003, "TerraTec Electronic GmbH", "Phase 88 FW"}, 56 {0x000aac, 0x00000004, "TerraTec Electronic GmbH", "Phase X24 FW (model version 4)"}, 57 {0x000aac, 0x00000007, "TerraTec Electronic GmbH", "Phase X24 FW (model version 7)"}, 58 59 {0x000f1b, 0x00010064, "ESI", "Quatafire 610"}, 60 61 {0x00130e, 0x00000003, "Focusrite", "Saffire Pro26IO"}, 62 63 {0x0040ab, 0x00010048, "EDIROL", "FA-101"}, 64 {0x0040ab, 0x00010049, "EDIROL", "FA-66"}, 65 }; 66 41 67 42 68 AvDevice::AvDevice( std::auto_ptr< ConfigRom >( configRom ), … … 49 75 , m_pPlugManager( new AvPlugManager( verboseLevel ) ) 50 76 , m_activeSyncInfo( 0 ) 77 , m_model ( NULL ) 78 , m_nodeId ( nodeId ) 51 79 , m_id( 0 ) 52 80 , m_receiveProcessor ( 0 ) … … 66 94 , m_pPlugManager( 0 ) 67 95 , m_activeSyncInfo( 0 ) 96 , m_model ( NULL ) 97 , m_nodeId ( -1 ) 68 98 , m_id( 0 ) 69 99 , m_receiveProcessor ( 0 ) … … 108 138 } 109 139 110 struct VendorModelEntry {111 unsigned int vendor_id;112 unsigned int model_id;113 };114 115 static VendorModelEntry supportedDeviceList[] =116 {117 {0x00000f, 0x00010065}, // Mackie, Onyx Firewire118 119 {0x0003db, 0x00010048}, // Apogee Electronics, Rosetta 200120 121 {0x0007f5, 0x00010048}, // BridgeCo, RD Audio1122 123 {0x000a92, 0x00010000}, // PreSonus FIREBOX124 {0x000a92, 0x00010066}, // PreSonus FirePOD125 126 {0x000aac, 0x00000003}, // TerraTec Electronic GmbH, Phase 88 FW127 {0x000aac, 0x00000004}, // TerraTec Electronic GmbH, Phase X24 FW (model version 4)128 {0x000aac, 0x00000007}, // TerraTec Electronic GmbH, Phase X24 FW (model version 7)129 130 {0x000f1b, 0x00010064}, // ESI, Quatafire 610131 132 {0x00130e, 0x00000003}, // Focusrite, Pro26IO (Saffire 26)133 134 {0x0040ab, 0x00010048}, // EDIROL, FA-101135 {0x0040ab, 0x00010049}, // EDIROL, FA-66136 };137 138 140 bool 139 141 AvDevice::probe( ConfigRom& configRom ) … … 159 161 AvDevice::discover() 160 162 { 163 unsigned int vendorId = m_pConfigRom->getNodeVendorId(); 164 unsigned int modelId = m_pConfigRom->getModelId(); 165 166 for ( unsigned int i = 0; 167 i < ( sizeof( supportedDeviceList )/sizeof( VendorModelEntry ) ); 168 ++i ) 169 { 170 if ( ( supportedDeviceList[i].vendor_id == vendorId ) 171 && ( supportedDeviceList[i].model_id == modelId ) 172 ) 173 { 174 m_model = &(supportedDeviceList[i]); 175 } 176 } 177 178 if (m_model != NULL) { 179 debugOutput( DEBUG_LEVEL_VERBOSE, "found %s %s\n", 180 m_model->vendor_name, m_model->model_name); 181 } else return false; 182 161 183 if ( !enumerateSubUnits() ) { 162 184 debugError( "Could not enumarate sub units\n" ); … … 871 893 AvDevice::showDevice() const 872 894 { 895 debugOutput(DEBUG_LEVEL_VERBOSE, 896 "%s %s at node %d\n", m_model->vendor_name, m_model->model_name, 897 m_nodeId); 898 873 899 m_pPlugManager->showPlugs(); 874 900 } … … 1581 1607 1582 1608 } // end of namespace 1609 1610 #endif //#ifdef ENABLE_BEBOB branches/streaming-rework/src/bebob/bebob_avdevice.h
r379 r404 19 19 */ 20 20 21 #ifdef ENABLE_BEBOB 22 21 23 #ifndef BEBOB_AVDEVICE_H 22 24 #define BEBOB_AVDEVICE_H … … 47 49 48 50 namespace BeBoB { 51 52 struct VendorModelEntry { 53 unsigned int vendor_id; 54 unsigned int model_id; 55 char *vendor_name; 56 char *model_name; 57 }; 49 58 50 59 class AvDevice : public IAvDevice { … … 171 180 SyncInfoVector m_syncInfos; 172 181 SyncInfo* m_activeSyncInfo; 182 struct VendorModelEntry* m_model; 183 int m_nodeId; 173 184 unsigned int m_id; 174 185 … … 186 197 187 198 #endif 199 200 #endif //#ifdef ENABLE_BEBOB branches/streaming-rework/src/bebob/bebob_avdevice_subunit.cpp
r378 r404 18 18 * MA 02111-1307 USA. 19 19 */ 20 21 #ifdef ENABLE_BEBOB 20 22 21 23 #include "bebob/bebob_functionblock.h" … … 586 588 return true; 587 589 } 590 591 #endif //#ifdef ENABLE_BEBOB branches/streaming-rework/src/bebob/bebob_avdevice_subunit.h
r376 r404 18 18 * MA 02111-1307 USA. 19 19 */ 20 21 #ifdef ENABLE_BEBOB 20 22 21 23 #ifndef BEBOB_AVDEVICESUBUNIT_H … … 154 156 155 157 #endif 158 159 #endif //#ifdef ENABLE_BEBOB branches/streaming-rework/src/bebob/bebob_avdevice_xml.cpp
r336 r404 18 18 * MA 02111-1307 USA. 19 19 */ 20 21 #ifdef ENABLE_BEBOB 20 22 21 23 // AvDevice XML stuff … … 120 122 121 123 } 124 125 #endif //#ifdef ENABLE_BEBOB branches/streaming-rework/src/bebob/bebob_avplug.cpp
r376 r404 18 18 * MA 02111-1307 USA. 19 19 */ 20 21 #ifdef ENABLE_BEBOB 20 22 21 23 #include "bebob/bebob_avplug.h" … … 2220 2222 2221 2223 } 2224 2225 #endif //#ifdef ENABLE_BEBOB branches/streaming-rework/src/bebob/bebob_avplug.h
r376 r404 18 18 * MA 02111-1307 USA. 19 19 */ 20 21 #ifdef ENABLE_BEBOB 20 22 21 23 #ifndef BEBOB_AVPLUG_H … … 356 358 357 359 #endif 360 361 #endif //#ifdef ENABLE_BEBOB branches/streaming-rework/src/bebob/bebob_avplug_xml.cpp
r375 r404 18 18 * MA 02111-1307 USA. 19 19 */ 20 21 #ifdef ENABLE_BEBOB 20 22 21 23 // AvPlug XML stuff … … 298 300 299 301 } 302 303 #endif //#ifdef ENABLE_BEBOB branches/streaming-rework/src/bebob/bebob_dl_bcd.cpp
r336 r404 19 19 */ 20 20 21 #ifdef ENABLE_BEBOB 22 21 23 #include "bebob_dl_bcd.h" 22 24 … … 383 385 } 384 386 387 #endif //#ifdef ENABLE_BEBOB branches/streaming-rework/src/bebob/bebob_dl_bcd.h
r336 r404 18 18 * MA 02111-1307 USA. 19 19 */ 20 21 #ifdef ENABLE_BEBOB 20 22 21 23 #ifndef BEBOB_DL_BCD_H … … 114 116 115 117 #endif 118 119 #endif //#ifdef ENABLE_BEBOB branches/streaming-rework/src/bebob/bebob_dl_codes.cpp
r336 r404 19 19 */ 20 20 21 #ifdef ENABLE_BEBOB 22 21 23 #include "bebob/bebob_dl_codes.h" 22 24 #include "bebob/bebob_dl_bcd.h" … … 344 346 return result; 345 347 } 348 349 #endif //#ifdef ENABLE_BEBOB branches/streaming-rework/src/bebob/bebob_dl_codes.h
r365 r404 19 19 */ 20 20 21 #ifdef ENABLE_BEBOB 22 21 23 #ifndef BEBOB_DL_CODES_H 22 24 #define BEBOB_DL_CODES_H … … 311 313 }; 312 314 #endif 315 316 #endif //#ifdef ENABLE_BEBOB branches/streaming-rework/src/bebob/bebob_dl_mgr.cpp
r365 r404 18 18 * MA 02111-1307 USA. 19 19 */ 20 21 #ifdef ENABLE_BEBOB 20 22 21 23 #include "bebob_dl_mgr.h" … … 714 716 return false; 715 717 } 718 719 #endif //#ifdef ENABLE_BEBOB branches/streaming-rework/src/bebob/bebob_dl_mgr.h
r336 r404 18 18 * MA 02111-1307 USA. 19 19 */ 20 21 #ifdef ENABLE_BEBOB 20 22 21 23 #ifndef BEBOB_DL_MGR_H … … 125 127 126 128 #endif 129 130 #endif //#ifdef ENABLE_BEBOB branches/streaming-rework/src/bebob/bebob_functionblock.cpp
r378 r404 19 19 */ 20 20 21 #ifdef ENABLE_BEBOB 22 21 23 #include "bebob/bebob_functionblock.h" 22 24 #include "bebob/bebob_avdevice_subunit.h" … … 551 553 return true; 552 554 } 555 556 #endif //#ifdef ENABLE_BEBOB branches/streaming-rework/src/bebob/bebob_functionblock.h
r378 r404 19 19 */ 20 20 21 #ifdef ENABLE_BEBOB 22 21 23 #ifndef BEBOB_FUNCTION_BLOCK_H 22 24 #define BEBOB_FUNCTION_BLOCK_H … … 218 220 219 221 #endif 222 223 #endif //#ifdef ENABLE_BEBOB branches/streaming-rework/src/bounce/bounce_avdevice.cpp
r386 r404 20 20 */ 21 21 22 #ifdef ENABLE_BOUNCE 23 22 24 #include "bounce/bounce_avdevice.h" 23 25 #include "configrom.h" … … 377 379 } 378 380 379 380 381 } 381 } // namespace 382 383 #endif // #ifdef ENABLE_BOUNCE branches/streaming-rework/src/bounce/bounce_avdevice.h
r336 r404 19 19 * MA 02111-1307 USA. 20 20 */ 21 22 #ifdef ENABLE_BOUNCE 21 23 22 24 #ifndef BOUNCEDEVICE_H … … 100 102 101 103 #endif 104 105 #endif // #ifdef ENABLE_BOUNCE branches/streaming-rework/src/devicemanager.cpp
r384 r404 32 32 #include "rme/rme_avdevice.h" 33 33 #include "maudio/maudio_avdevice.h" 34 #include "dice/dice_avdevice.h" 35 #include "metrichalo/mh_avdevice.h" 34 36 35 37 #include <iostream> … … 149 151 int id, int level ) 150 152 { 153 #ifdef ENABLE_BEBOB 151 154 if ( BeBoB::AvDevice::probe( *configRom.get() ) ) { 152 155 return new BeBoB::AvDevice( configRom, *m_1394Service, id, level ); 153 156 } 154 155 #ifdef ENABLE_MOTU 157 #endif 158 159 #ifdef ENABLE_BEBOB 156 160 if ( MAudio::AvDevice::probe( *configRom.get() ) ) { 157 161 return new MAudio::AvDevice( configRom, *m_1394Service, id, level ); 158 162 } 159 160 163 #endif 164 165 #ifdef ENABLE_MOTU 161 166 if ( Motu::MotuDevice::probe( *configRom.get() ) ) { 162 167 return new Motu::MotuDevice( configRom, *m_1394Service, id, level ); 163 168 } 164 169 #endif 170 171 #ifdef ENABLE_DICE 172 if ( Dice::DiceAvDevice::probe( *configRom.get() ) ) { 173 return new Dice::DiceAvDevice( configRom, *m_1394Service, id, level ); 174 } 175 #endif 176 177 #ifdef ENABLE_METRIC_HALO 178 if ( MetricHalo::MHAvDevice::probe( *configRom.get() ) ) { 179 return new MetricHalo::MHAvDevice( configRom, *m_1394Service, id, level ); 180 } 181 #endif 182 183 #ifdef ENABLE_RME 165 184 if ( Rme::RmeDevice::probe( *configRom.get() ) ) { 166 185 return new Rme::RmeDevice( configRom, *m_1394Service, id, level ); 167 186 } 168 187 #endif 188 189 #ifdef ENABLE_BOUNCE 169 190 if ( Bounce::BounceDevice::probe( *configRom.get() ) ) { 170 191 return new Bounce::BounceDevice( configRom, *m_1394Service, id, level ); … … 366 387 DeviceManager::saveCache( Glib::ustring fileName ) 367 388 { 368 int i = 0; 369 for ( IAvDeviceVectorIterator it = m_avDevices.begin(); 370 it != m_avDevices.end(); 371 ++it ) 372 { 373 IAvDevice* pAvDevice = *it; 389 int i; 390 i=0; // avoids unused warning 391 392 for ( IAvDeviceVectorIterator it = m_avDevices.begin(); 393 it != m_avDevices.end(); 394 ++it ) 395 { 396 IAvDevice* pAvDevice; 397 pAvDevice = *it; // avoids unused warning 398 399 #ifdef ENABLE_BEBOB 374 400 BeBoB::AvDevice* pBeBoBDevice = reinterpret_cast< BeBoB::AvDevice* >( pAvDevice ); 375 401 if ( pBeBoBDevice ) { … … 390 416 std::cout << "a bebob device serialized" << std::endl; 391 417 } 418 #endif 392 419 } 393 420 return true; … … 397 424 DeviceManager::loadCache( Glib::ustring fileName ) 398 425 { 426 int i; 427 i=0; // avoids unused warning 399 428 Util::XMLDeserialize deser( fileName ); 400 BeBoB::AvDevice* pBeBoBDevice = 0;401 int i = 0;402 429 403 430 typedef std::vector<ConfigRom*> ConfigRomVector; … … 425 452 } 426 453 454 #ifdef ENABLE_BEBOB 455 BeBoB::AvDevice* pBeBoBDevice = 0; 427 456 do { 428 457 ostringstream strstrm; … … 449 478 } 450 479 } while ( pBeBoBDevice ); 451 480 #endif 481 452 482 return true; 453 483 } branches/streaming-rework/src/libstreaming/AmdtpPort.cpp
r228 r404 26 26 * 27 27 */ 28 #ifdef ENABLE_BEBOB 29 #ifndef ENABLE_AMDTP_SP 30 #define ENABLE_AMDTP_SP 31 #endif 32 #endif 33 34 #ifdef ENABLE_DICE 35 #ifndef ENABLE_AMDTP_SP 36 #define ENABLE_AMDTP_SP 37 #endif 38 #endif 39 40 #ifdef ENABLE_BOUNCE 41 #ifndef ENABLE_AMDTP_SP 42 #define ENABLE_AMDTP_SP 43 #endif 44 #endif 45 46 #ifdef ENABLE_AMDTP_SP 28 47 29 48 #include "AmdtpPort.h" … … 33 52 34 53 } // end of namespace FreebobStreaming 54 55 #endif // #ifdef ENABLE_AMDTP_SP branches/streaming-rework/src/libstreaming/AmdtpPort.h
r228 r404 26 26 * 27 27 */ 28 #ifdef ENABLE_BEBOB 29 #ifndef ENABLE_AMDTP_SP 30 #define ENABLE_AMDTP_SP 31 #endif 32 #endif 33 34 #ifdef ENABLE_DICE 35 #ifndef ENABLE_AMDTP_SP 36 #define ENABLE_AMDTP_SP 37 #endif 38 #endif 39 40 #ifdef ENABLE_BOUNCE 41 #ifndef ENABLE_AMDTP_SP 42 #define ENABLE_AMDTP_SP 43 #endif 44 #endif 45 46 #ifdef ENABLE_AMDTP_SP 47 28 48 #ifndef __FREEBOB_AMDTPPORT__ 29 49 #define __FREEBOB_AMDTPPORT__ … … 100 120 #endif /* __FREEBOB_AMDTPPORT__ */ 101 121 102 122 #endif // #ifdef ENABLE_AMDTP_SP branches/streaming-rework/src/libstreaming/AmdtpPortInfo.cpp
r221 r404 7 7 * http://freebob.sf.net 8 8 * 9 * Copyright (C) 2005,2006 Pieter Palmers <pieterpalmers@users.sourceforge.net>9 * Copyright (C) 2005,2006,2007 Pieter Palmers <pieterpalmers@users.sourceforge.net> 10 10 * 11 11 * This program is free software {} you can redistribute it and/or modify … … 27 27 */ 28 28 29 #ifdef ENABLE_BEBOB 30 #ifndef ENABLE_AMDTP_SP 31 #define ENABLE_AMDTP_SP 32 #endif 33 #endif 34 35 #ifdef ENABLE_DICE 36 #ifndef ENABLE_AMDTP_SP 37 #define ENABLE_AMDTP_SP 38 #endif 39 #endif 40 41 #ifdef ENABLE_BOUNCE 42 #ifndef ENABLE_AMDTP_SP 43 #define ENABLE_AMDTP_SP 44 #endif 45 #endif 46 47 #ifdef ENABLE_AMDTP_SP 48 29 49 #include "AmdtpPortInfo.h" 30 50 #include <assert.h> … … 35 55 36 56 } // end of namespace FreebobStreaming 57 58 #endif // #ifdef ENABLE_AMDTP_SP branches/streaming-rework/src/libstreaming/AmdtpPortInfo.h
r246 r404 7 7 * http://freebob.sf.net 8 8 * 9 * Copyright (C) 2005,2006 Pieter Palmers <pieterpalmers@users.sourceforge.net>9 * Copyright (C) 2005,2006,2007 Pieter Palmers <pieterpalmers@users.sourceforge.net> 10 10 * 11 11 * This program is free software {} you can redistribute it and/or modify … … 26 26 * 27 27 */ 28 29 #ifdef ENABLE_BEBOB 30 #ifndef ENABLE_AMDTP_SP 31 #define ENABLE_AMDTP_SP 32 #endif 33 #endif 34 35 #ifdef ENABLE_DICE 36 #ifndef ENABLE_AMDTP_SP 37 #define ENABLE_AMDTP_SP 38 #endif 39 #endif 40 41 #ifdef ENABLE_BOUNCE 42 #ifndef ENABLE_AMDTP_SP 43 #define ENABLE_AMDTP_SP 44 #endif 45 #endif 46 47 #ifdef ENABLE_AMDTP_SP 48 28 49 #ifndef __FREEBOB_AMDTPPORTINFO__ 29 50 #define __FREEBOB_AMDTPPORTINFO__ … … 87 108 #endif /* __FREEBOB_AMDTPPORTINFO__ */ 88 109 89 110 #endif // #ifdef ENABLE_AMDTP_SP branches/streaming-rework/src/libstreaming/AmdtpStreamProcessor.cpp
r402 r404 7 7 * http://freebob.sf.net 8 8 * 9 * Copyright (C) 2005,2006 Pieter Palmers <pieterpalmers@users.sourceforge.net>9 * Copyright (C) 2005,2006,2007 Pieter Palmers <pieterpalmers@users.sourceforge.net> 10 10 * 11 11 * This program is free software {} you can redistribute it and/or modify … … 26 26 * 27 27 */ 28 29 #ifdef ENABLE_BEBOB 30 #ifndef ENABLE_AMDTP_SP 31 #define ENABLE_AMDTP_SP 32 #endif 33 #endif 34 35 #ifdef ENABLE_DICE 36 #ifndef ENABLE_AMDTP_SP 37 #define ENABLE_AMDTP_SP 38 #endif 39 #endif 40 41 #ifdef ENABLE_BOUNCE 42 #ifndef ENABLE_AMDTP_SP 43 #define ENABLE_AMDTP_SP 44 #endif 45 #endif 46 47 #ifdef ENABLE_AMDTP_SP 28 48 29 49 #include "AmdtpStreamProcessor.h" … … 1421 1441 1422 1442 } // end of namespace FreebobStreaming 1443 1444 #endif // #ifdef ENABLE_AMDTP_SP branches/streaming-rework/src/libstreaming/AmdtpStreamProcessor.h
r402 r404 7 7 * http://freebob.sf.net 8 8 * 9 * Copyright (C) 2005,2006 Pieter Palmers <pieterpalmers@users.sourceforge.net>9 * Copyright (C) 2005,2006,2007 Pieter Palmers <pieterpalmers@users.sourceforge.net> 10 10 * 11 11 * This program is free software {} you can redistribute it and/or modify … … 26 26 * 27 27 */ 28 #ifdef ENABLE_BEBOB 29 #ifndef ENABLE_AMDTP_SP 30 #define ENABLE_AMDTP_SP 31 #endif 32 #endif 33 34 #ifdef ENABLE_DICE 35 #ifndef ENABLE_AMDTP_SP 36 #define ENABLE_AMDTP_SP 37 #endif 38 #endif 39 40 #ifdef ENABLE_BOUNCE 41 #ifndef ENABLE_AMDTP_SP 42 #define ENABLE_AMDTP_SP 43 #endif 44 #endif 45 46 #ifdef ENABLE_AMDTP_SP 47 28 48 #ifndef __FREEBOB_AMDTPSTREAMPROCESSOR__ 29 49 #define __FREEBOB_AMDTPSTREAMPROCESSOR__ … … 215 235 #endif /* __FREEBOB_AMDTPSTREAMPROCESSOR__ */ 216 236 217 237 #endif // #ifdef ENABLE_AMDTP_SP 238 branches/streaming-rework/src/libstreaming/MotuPort.cpp
r246 r404 27 27 */ 28 28 29 #ifdef ENABLE_MOTU 30 29 31 #include "MotuPort.h" 30 32 #include <assert.h> … … 33 35 34 36 } // end of namespace FreebobStreaming 37 38 #endif //#ifdef ENABLE_MOTU branches/streaming-rework/src/libstreaming/MotuPort.h
r312 r404 26 26 * 27 27 */ 28 29 #ifdef ENABLE_MOTU 30 28 31 #ifndef __FREEBOB_MOTUPORT__ 29 32 #define __FREEBOB_MOTUPORT__ … … 118 121 #endif /* __FREEBOB_MOTUPORT__ */ 119 122 123 #endif //#ifdef ENABLE_MOTU 120 124 branches/streaming-rework/src/libstreaming/MotuPortInfo.cpp
r246 r404 26 26 * 27 27 */ 28 29 #ifdef ENABLE_MOTU 28 30 29 31 #include "MotuPortInfo.h" 30 32 #include <assert.h> 31 32 33 33 34 namespace FreebobStreaming { … … 35 36 36 37 } // end of namespace FreebobStreaming 38 39 #endif //#ifdef ENABLE_MOTU branches/streaming-rework/src/libstreaming/MotuPortInfo.h
r265 r404 26 26 * 27 27 */ 28 #ifdef ENABLE_MOTU 29 28 30 #ifndef __FREEBOB_MOTUPORTINFO__ 29 31 #define __FREEBOB_MOTUPORTINFO__ … … 91 93 #endif /* __FREEBOB_MOTUPORTINFO__ */ 92 94 95 #endif //#ifdef ENABLE_MOTU 93 96 branches/streaming-rework/src/Makefile.am
r391 r404 31 31 bebob/bebob_avdevice_subunit.h bebob/bebob_avplug.h bebob/bebob_dl_bcd.h bebob/bebob_dl_codes.h \ 32 32 bebob/bebob_dl_mgr.h bebob/bebob_functionblock.h bounce/bounce_avdevice.h \ 33 maudio/maudio_avdevice.h motu/motu_avdevice.h rme/rme_avdevice.h libfreebobavc/avc_connect.h \ 33 maudio/maudio_avdevice.h motu/motu_avdevice.h rme/rme_avdevice.h \ 34 metrichalo/mh_avdevice.h dice/dice_avdevice.h \ 35 libfreebobavc/avc_connect.h \ 34 36 libfreebobavc/avc_definitions.h libfreebobavc/avc_extended_cmd_generic.h \ 35 37 libfreebobavc/avc_extended_plug_info.h libfreebobavc/avc_extended_stream_format.h \ … … 65 67 bebob/bebob_functionblock.cpp \ 66 68 bounce/bounce_avdevice.cpp \ 69 dice/dice_avdevice.cpp \ 67 70 maudio/maudio_avdevice.cpp \ 71 metrichalo/mh_avdevice.cpp \ 68 72 motu/motu_avdevice.cpp \ 69 73 rme/rme_avdevice.cpp \ … … 121 125 ############### 122 126 123 bin_PROGRAMS = freebob-downloader freebob-sync127 bin_PROGRAMS = @BIN_PROGRAMS@ 124 128 129 EXTRA_PROGRAMS = freebob-downloader freebob-sync 125 130 freebob_downloader_SOURCES = freebob-downloader.cpp 126 131 freebob_downloader_LDADD = $(top_builddir)/src/libfreebob.la branches/streaming-rework/src/maudio/maudio_avdevice.cpp
r386 r404 18 18 * MA 02111-1307 USA. 19 19 */ 20 21 #ifdef ENABLE_BEBOB 20 22 21 23 #include "maudio/maudio_avdevice.h" … … 546 548 547 549 } 550 551 #endif //#ifdef ENABLE_BEBOB branches/streaming-rework/src/maudio/maudio_avdevice.h
r336 r404 18 18 * MA 02111-1307 USA. 19 19 */ 20 21 #ifdef ENABLE_BEBOB 20 22 21 23 #ifndef MAUDIODEVICE_H … … 87 89 88 90 #endif 91 92 #endif //#ifdef ENABLE_BEBOB branches/streaming-rework/src/motu/motu_avdevice.cpp
r402 r404 1 1 /* motu_avdevice.cpp 2 * Copyright (C) 2006 by Pieter Palmers2 * Copyright (C) 2006,2007 by Pieter Palmers 3 3 * Copyright (C) 2006 by Jonathan Woithe 4 4 * … … 46 46 IMPL_DEBUG_MODULE( MotuDevice, MotuDevice, DEBUG_LEVEL_NORMAL ); 47 47 48 char *motufw_modelname[] = {"[unknown]","828MkII", "Traveler"}; 48 // to define the supported devices 49 static VendorModelEntry supportedDeviceList[] = 50 { 51 // {vendor_id, model_id, unit_version, unit_specifier_id, model, vendor_name,model_name} 52 {0x000001f2, 0, 0x00000003, 0x000001f2, MOTUFW_MODEL_828mkII, "MOTU", "828MkII"}, 53 {0x000001f2, 0, 0x00000009, 0x000001f2, MOTUFW_MODEL_TRAVELER, "MOTU", "Traveler"}, 54 }; 49 55 50 56 /* ======================================================================= */ … … 145 151 } 146 152 147 struct VendorModelEntry {148 unsigned int vendor_id;149 unsigned int model_id;150 };151 152 static VendorModelEntry supportedDeviceList[] =153 {154 {0x0001f2, 0x00000000}, // Motu device, model entry not used155 156 };157 158 153 bool 159 154 MotuDevice::probe( ConfigRom& configRom ) 160 155 { 161 156 unsigned int vendorId = configRom.getNodeVendorId(); 162 unsigned int modelId = configRom.getModelId(); 157 // unsigned int modelId = configRom.getModelId(); 158 unsigned int unitVersion = configRom.getUnitVersion(); 159 unsigned int unitSpecifierId = configRom.getUnitSpecifierId(); 163 160 164 161 for ( unsigned int i = 0; … … 167 164 { 168 165 if ( ( supportedDeviceList[i].vendor_id == vendorId ) 169 //&& ( supportedDeviceList[i].model_id == modelId ) 170 ) 166 // && ( supportedDeviceList[i].model_id == modelId ) 167 && ( supportedDeviceList[i].unit_version == unitVersion ) 168 && ( supportedDeviceList[i].unit_specifier_id == unitSpecifierId ) 169 ) 171 170 { 172 switch (configRom.getUnitVersion()) { 173 case MOTUFW_UNITVER_828mkII: 174 return true; 175 case MOTUFW_UNITVER_TRAVELER: 176 return true; 177 } 171 return true; 178 172 } 179 173 } … … 185 179 MotuDevice::discover() 186 180 { 187 // Find out if this device is one we know about 188 if (m_configRom->getUnitSpecifierId() == MOTUFW_VENDOR_MOTU) { 189 switch (m_configRom->getUnitVersion()) { 190 case MOTUFW_UNITVER_828mkII: 191 m_motu_model = MOTUFW_MODEL_828mkII; 192 break; 193 case MOTUFW_UNITVER_TRAVELER: 194 m_motu_model = MOTUFW_MODEL_TRAVELER; 195 break; 196 } 181 unsigned int vendorId = m_configRom->getNodeVendorId(); 182 // unsigned int modelId = m_configRom->getModelId(); 183 unsigned int unitVersion = m_configRom->getUnitVersion(); 184 unsigned int unitSpecifierId = m_configRom->getUnitSpecifierId(); 185 186 for ( unsigned int i = 0; 187 i < ( sizeof( supportedDeviceList )/sizeof( VendorModelEntry ) ); 188 ++i ) 189 { 190 if ( ( supportedDeviceList[i].vendor_id == vendorId ) 191 // && ( supportedDeviceList[i].model_id == modelId ) 192 && ( supportedDeviceList[i].unit_version == unitVersion ) 193 && ( supportedDeviceList[i].unit_specifier_id == unitSpecifierId ) 194 ) 195 { 196 m_model = &(supportedDeviceList[i]); 197 m_motu_model=supportedDeviceList[i].model; 197 198 } 198 199 if (m_motu_model != MOTUFW_MODEL_NONE) { 200 debugOutput( DEBUG_LEVEL_VERBOSE, "found MOTU %s\n", 201 motufw_modelname[m_motu_model]); 202 return true; 203 } 204 205 return false; 199 } 200 201 if (m_model != NULL) { 202 debugOutput( DEBUG_LEVEL_VERBOSE, "found %s %s\n", 203 m_model->vendor_name, m_model->model_name); 204 return true; 205 } 206 207 return false; 206 208 } 207 209 … … 364 366 MotuDevice::showDevice() const 365 367 { 366 367 "MOTU %s at node %d\n", motufw_modelname[m_motu_model],368 368 debugOutput(DEBUG_LEVEL_VERBOSE, 369 "%s %s at node %d\n", m_model->vendor_name, m_model->model_name, 370 m_nodeId); 369 371 } 370 372 branches/streaming-rework/src/motu/motu_avdevice.h
r384 r404 75 75 namespace Motu { 76 76 77 class MotuDevice : public IAvDevice { 78 public: 79 enum EMotuModel { 77 enum EMotuModel { 80 78 MOTUFW_MODEL_NONE = 0x0000, 81 79 MOTUFW_MODEL_828mkII = 0x0001, 82 80 MOTUFW_MODEL_TRAVELER = 0x0002, 83 }; 81 }; 82 83 struct VendorModelEntry { 84 unsigned int vendor_id; 85 unsigned int model_id; 86 unsigned int unit_version; 87 unsigned int unit_specifier_id; 88 enum EMotuModel model; 89 char *vendor_name; 90 char *model_name; 91 }; 92 93 class MotuDevice : public IAvDevice { 94 public: 84 95 85 96 MotuDevice( std::auto_ptr<ConfigRom>( configRom ), … … 123 134 124 135 signed int m_motu_model; 136 struct VendorModelEntry * m_model; 125 137 int m_nodeId; 126 138 int m_verboseLevel; … … 144 156 signed int WriteRegister(unsigned int reg, quadlet_t data); 145 157 146 // IEEE1394 Vendor IDs. One would expect only MOTU, but you never147 // know if a clone might appear some day.148 enum EVendorId {149 MOTUFW_VENDOR_MOTU = 0x000001f2,150 };151 152 // IEEE1394 Unit directory version IDs for different MOTU hardware153 enum EUnitVersionId {154 MOTUFW_UNITVER_828mkII = 0x00000003,155 MOTUFW_UNITVER_TRAVELER = 0x00000009,156 };157 158 158 // debug support 159 159 DECLARE_DEBUG_MODULE; branches/streaming-rework/src/rme/rme_avdevice.cpp
r386 r404 1 1 /* rme_avdevice.cpp 2 2 * Copyright (C) 2006 by Jonathan Woithe 3 * Copyright (C) 2006 by Pieter Palmers3 * Copyright (C) 2006,2007 by Pieter Palmers 4 4 * 5 5 * This file is part of FreeBob. … … 20 20 */ 21 21 22 #ifdef ENABLE_RME 23 #warning RME support is currently useless (detection only) 24 22 25 #include "rme/rme_avdevice.h" 23 26 #include "configrom.h" … … 44 47 IMPL_DEBUG_MODULE( RmeDevice, RmeDevice, DEBUG_LEVEL_NORMAL ); 45 48 46 char *rme_modelname[] = {"[unknown]","Fireface-800"}; 49 // to define the supported devices 50 static VendorModelEntry supportedDeviceList[] = 51 { 52 {0x00000a35, 0x0001, "RME", "Fireface-800"}, // RME Fireface-800 53 }; 47 54 48 55 /* ======================================================================= */ … … 102 109 : m_configRom( configRom ) 103 110 , m_1394Service( &ieee1394service ) 104 , m_ rme_model( RME_MODEL_NONE)111 , m_model( NULL ) 105 112 , m_nodeId( nodeId ) 106 113 , m_verboseLevel( verboseLevel ) … … 144 151 } 145 152 146 struct VendorModelEntry {147 unsigned int vendor_id;148 unsigned int model_id;149 };150 151 static VendorModelEntry supportedDeviceList[] =152 {153 {0x00000a35, 0x0001}, // RME Fireface-800154 155 };156 157 153 bool 158 154 RmeDevice::probe( ConfigRom& configRom ) … … 179 175 RmeDevice::discover() 180 176 { 181 // Find out if this device is one we know about 182 if (m_configRom->getUnitSpecifierId() == RME_VENDOR_RME) { 183 switch (m_configRom->getModelId()) { 184 case RME_MODELID_FIREFACE800: 185 m_rme_model = RME_MODEL_FIREFACE800; 186 break; 187 } 177 unsigned int vendorId = m_configRom->getNodeVendorId(); 178 unsigned int modelId = m_configRom->getModelId(); 179 180 for ( unsigned int i = 0; 181 i < ( sizeof( supportedDeviceList )/sizeof( VendorModelEntry ) ); 182 ++i ) 183 { 184 if ( ( supportedDeviceList[i].vendor_id == vendorId ) 185 && ( supportedDeviceList[i].model_id == modelId ) 186 ) 187 { 188 m_model = &(supportedDeviceList[i]); 188 189 } 189 if (m_rme_model != RME_MODEL_NONE) { 190 debugOutput( DEBUG_LEVEL_VERBOSE, "found RME %s\n", 191 rme_modelname[m_rme_model]); 192 return true; 193 } 194 195 return false; 190 } 191 192 if (m_model != NULL) { 193 debugOutput( DEBUG_LEVEL_VERBOSE, "found %s %s\n", 194 m_model->vendor_name, m_model->model_name); 195 return true; 196 } 197 198 return false; 196 199 } 197 200 … … 225 228 { 226 229 debugOutput(DEBUG_LEVEL_VERBOSE, 227 " RME %s at node %d\n", rme_modelname[m_rme_model],230 "%s %s at node %d\n", m_model->vendor_name, m_model->model_name, 228 231 m_nodeId); 229 232 } … … 547 550 548 551 } 552 553 #endif //#ifdef ENABLE_RME branches/streaming-rework/src/rme/rme_avdevice.h
r336 r404 1 1 /* rme_avdevice.h 2 2 * Copyright (C) 2006 Jonathan Woithe 3 * Copyright (C) 2006 by Pieter Palmers3 * Copyright (C) 2006,2007 by Pieter Palmers 4 4 * 5 5 * This file is part of FreeBob. … … 20 20 */ 21 21 22 #ifdef ENABLE_RME 23 22 24 #ifndef RMEDEVICE_H 23 25 #define RMEDEVICE_H … … 36 38 namespace Rme { 37 39 40 // struct to define the supported devices 41 struct VendorModelEntry { 42 unsigned int vendor_id; 43 unsigned int model_id; 44 char *vendor_name; 45 char *model_name; 46 }; 47 38 48 class RmeDevice : public IAvDevice { 39 49 public: 40 enum ERmeModel {41 RME_MODEL_NONE = 0x0000,42 RME_MODEL_FIREFACE800 = 0x0001,43 };44 50 45 51 RmeDevice( std::auto_ptr<ConfigRom>( configRom ), … … 80 86 Ieee1394Service* m_1394Service; 81 87 82 signed int m_rme_model; 88 struct VendorModelEntry *m_model; 89 83 90 int m_nodeId; 84 91 int m_verboseLevel; … … 102 109 signed int WriteRegister(unsigned int reg, quadlet_t data); 103 110 104 // IEEE1394 Vendor IDs. One would expect only RME, but you never105 // know if a clone might appear some day.106 enum EVendorId {107 RME_VENDOR_RME = 0x00000a35,108 };109 110 // IEEE1394 Model IDs for different RME hardware111 enum EUnitVersionId {112 RME_MODELID_FIREFACE800 = 0x00101800,113 };114 115 111 // debug support 116 112 DECLARE_DEBUG_MODULE; … … 120 116 121 117 #endif 118 119 #endif //#ifdef ENABLE_RME