- Timestamp:
- 11/15/09 14:51:57 (14 years ago)
- Files:
-
- trunk/libffado/src/dice/dice_avdevice.cpp (modified) (2 diffs)
- trunk/libffado/src/dice/focusrite/saffire_pro24.cpp (copied) (copied from trunk/libffado/src/dice/focusrite/saffire_pro40.cpp) (2 diffs)
- trunk/libffado/src/dice/focusrite/saffire_pro24.h (copied) (copied from trunk/libffado/src/dice/focusrite/saffire_pro40.h) (3 diffs)
- trunk/libffado/src/SConscript (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libffado/src/dice/dice_avdevice.cpp
r1630 r1712 47 47 48 48 #include "focusrite/saffire_pro40.h" 49 #include "focusrite/saffire_pro24.h" 49 50 50 51 using namespace std; … … 127 128 case 0x00000005: 128 129 return new Focusrite::SaffirePro40(d, configRom); 130 case 0x00000007: 131 return new Focusrite::SaffirePro24(d, configRom); 129 132 default: // return a plain Dice device 130 133 return new Device(d, configRom); trunk/libffado/src/dice/focusrite/saffire_pro24.cpp
r1630 r1712 1 1 /* 2 2 * Copyright (C) 2009 by Pieter Palmers 3 * Copyright (C) 2009 by Arnold Krille 3 4 * 4 5 * This file is part of FFADO … … 22 23 */ 23 24 24 #include "saffire_pro 40.h"25 #include "saffire_pro24.h" 25 26 26 27 namespace Dice { 27 28 namespace Focusrite { 28 29 29 SaffirePro 40::SaffirePro40( DeviceManager& d,30 SaffirePro24::SaffirePro24( DeviceManager& d, 30 31 std::auto_ptr<ConfigRom>( configRom )) 31 32 : Dice::Device( d , configRom) 32 33 { 33 debugOutput( DEBUG_LEVEL_VERBOSE, "Created Dice::Focusrite::SaffirePro 40(NodeID %d)\n",34 debugOutput( DEBUG_LEVEL_VERBOSE, "Created Dice::Focusrite::SaffirePro24 (NodeID %d)\n", 34 35 getConfigRom().getNodeId() ); 35 36 } 36 37 37 SaffirePro 40::~SaffirePro40()38 SaffirePro24::~SaffirePro24() 38 39 { 39 40 } 40 41 41 42 void 42 SaffirePro 40::showDevice()43 SaffirePro24::showDevice() 43 44 { 44 debugOutput(DEBUG_LEVEL_VERBOSE, "This is a Dice::Focusrite::SaffirePro 40\n");45 debugOutput(DEBUG_LEVEL_VERBOSE, "This is a Dice::Focusrite::SaffirePro24\n"); 45 46 Dice::Device::showDevice(); 46 47 } trunk/libffado/src/dice/focusrite/saffire_pro24.h
r1630 r1712 1 1 /* 2 2 * Copyright (C) 2009 by Pieter Palmers 3 * Copyright (C) 2009 by Arnold Krille 3 4 * 4 5 * This file is part of FFADO … … 22 23 */ 23 24 24 #ifndef DICE_FOCUSRITE_SAFFIRE_PRO 40_H25 #define DICE_FOCUSRITE_SAFFIRE_PRO 40_H25 #ifndef DICE_FOCUSRITE_SAFFIRE_PRO24_H 26 #define DICE_FOCUSRITE_SAFFIRE_PRO24_H 26 27 27 28 #include "dice/dice_avdevice.h" … … 32 33 namespace Focusrite { 33 34 34 class SaffirePro 40: public Dice::Device {35 class SaffirePro24 : public Dice::Device { 35 36 public: 36 SaffirePro 40( DeviceManager& d,37 SaffirePro24( DeviceManager& d, 37 38 std::auto_ptr<ConfigRom>( configRom )); 38 virtual ~SaffirePro 40();39 virtual ~SaffirePro24(); 39 40 40 41 virtual void showDevice(); trunk/libffado/src/SConscript
r1672 r1712 160 160 dice/dice_eap.cpp \ 161 161 dice/focusrite/saffire_pro40.cpp \ 162 dice/focusrite/saffire_pro24.cpp \ 162 163 ' ) 163 164