[FFADO-svn] r1712 - in trunk/libffado/src: . dice dice/focusrite

[<tr...@ff...>]

Author: arnonym
Date: 2009-11-15 14:51:57 -0800 (Sun, 15 Nov 2009)
New Revision: 1712

Added:
   trunk/libffado/src/dice/focusrite/saffire_pro24.cpp
   trunk/libffado/src/dice/focusrite/saffire_pro24.h
Modified:
   trunk/libffado/src/SConscript
   trunk/libffado/src/dice/dice_avdevice.cpp
Log:
Start a special class for the saffire24...


Modified: trunk/libffado/src/SConscript
===================================================================
--- trunk/libffado/src/SConscript	2009-11-15 22:20:11 UTC (rev 1711)
+++ trunk/libffado/src/SConscript	2009-11-15 22:51:57 UTC (rev 1712)
@@ -159,6 +159,7 @@
 	dice/dice_avdevice.cpp \
 	dice/dice_eap.cpp \
 	dice/focusrite/saffire_pro40.cpp \
+	dice/focusrite/saffire_pro24.cpp \
 ' )
 
 bounce_source = env.Split( '\

Modified: trunk/libffado/src/dice/dice_avdevice.cpp
===================================================================
--- trunk/libffado/src/dice/dice_avdevice.cpp	2009-11-15 22:20:11 UTC (rev 1711)
+++ trunk/libffado/src/dice/dice_avdevice.cpp	2009-11-15 22:51:57 UTC (rev 1712)
@@ -46,6 +46,7 @@
 #include "devicemanager.h"
 
 #include "focusrite/saffire_pro40.h"
+#include "focusrite/saffire_pro24.h"
 
 using namespace std;
 
@@ -126,6 +127,8 @@
             switch(modelId) {
                 case 0x00000005:
                     return new Focusrite::SaffirePro40(d, configRom);
+                case 0x00000007:
+                    return new Focusrite::SaffirePro24(d, configRom);
                 default: // return a plain Dice device
                     return new Device(d, configRom);
            }

Copied: trunk/libffado/src/dice/focusrite/saffire_pro24.cpp (from rev 1705, trunk/libffado/src/dice/focusrite/saffire_pro40.cpp)
===================================================================
--- trunk/libffado/src/dice/focusrite/saffire_pro24.cpp	                        (rev 0)
+++ trunk/libffado/src/dice/focusrite/saffire_pro24.cpp	2009-11-15 22:51:57 UTC (rev 1712)
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2009 by Pieter Palmers
+ * Copyright (C) 2009 by Arnold Krille
+ *
+ * This file is part of FFADO
+ * FFADO = Free Firewire (pro-)audio drivers for linux
+ *
+ * FFADO is based upon FreeBoB.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) version 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "saffire_pro24.h"
+
+namespace Dice {
+namespace Focusrite {
+
+SaffirePro24::SaffirePro24( DeviceManager& d,
+                                        std::auto_ptr<ConfigRom>( configRom ))
+    : Dice::Device( d , configRom)
+{
+    debugOutput( DEBUG_LEVEL_VERBOSE, "Created Dice::Focusrite::SaffirePro24 (NodeID %d)\n",
+                 getConfigRom().getNodeId() );
+}
+
+SaffirePro24::~SaffirePro24()
+{
+}
+
+void
+SaffirePro24::showDevice()
+{
+    debugOutput(DEBUG_LEVEL_VERBOSE, "This is a Dice::Focusrite::SaffirePro24\n");
+    Dice::Device::showDevice();
+}
+
+}
+}

Copied: trunk/libffado/src/dice/focusrite/saffire_pro24.h (from rev 1705, trunk/libffado/src/dice/focusrite/saffire_pro40.h)
===================================================================
--- trunk/libffado/src/dice/focusrite/saffire_pro24.h	                        (rev 0)
+++ trunk/libffado/src/dice/focusrite/saffire_pro24.h	2009-11-15 22:51:57 UTC (rev 1712)
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2009 by Pieter Palmers
+ * Copyright (C) 2009 by Arnold Krille
+ *
+ * This file is part of FFADO
+ * FFADO = Free Firewire (pro-)audio drivers for linux
+ *
+ * FFADO is based upon FreeBoB.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) version 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef DICE_FOCUSRITE_SAFFIRE_PRO24_H
+#define DICE_FOCUSRITE_SAFFIRE_PRO24_H
+
+#include "dice/dice_avdevice.h"
+
+#include "libieee1394/configrom.h"
+
+namespace Dice {
+namespace Focusrite {
+
+class SaffirePro24 : public Dice::Device {
+public:
+    SaffirePro24( DeviceManager& d,
+                  std::auto_ptr<ConfigRom>( configRom ));
+    virtual ~SaffirePro24();
+
+    virtual void showDevice();
+
+private:
+};
+
+}
+}
+
+#endif