Changeset 1498 for trunk/libffado/src/bebob/focusrite/focusrite_saffire.cpp

Timestamp:

12/07/08 05:50:41 (3 years ago)

Author:

ppalmers

Message:

Merge all changes from 2.0 branch into trunk (since r1361). This _should_ contain all forward merges done in the mean time. At this moment in time both branches should be in sync.

Files:

• trunk/libffado/src/bebob/focusrite/focusrite_saffire.cpp (modified) (3 diffs)

trunk/libffado/src/bebob/focusrite/focusrite_saffire.cpp

@@ -35 +35 @@
-                 getConfigRom().getNodeId() );
-
-    // the saffire doesn't seem to like it if the commands are too fast
-    if (AVC::AVCCommand::getSleepAfterAVCCommand() < 1000) {
-        AVC::AVCCommand::setSleepAfterAVCCommand( 1000 );
-    }
-
-    if(getConfigRom().getGuid() < 0x130e0100040000LL) {
-        m_isSaffireLE = false;
@@ -253 +248 @@
-        result &= m_MixerContainer->addElement(
-            new DialPositionControl(*this, 
-
+ 0,
-                    "MonitorDial", "Monitor Dial", "Monitor Dial Value"));
-
@@ -384 +379 @@
-    delete m_MixerContainer;
-    return true;
+}
+
+std::vector<int>
+SaffireDevice::getSupportedSamplingFrequencies()
+{
+    std::vector<int> frequencies;
+    frequencies.push_back(44100);
+    frequencies.push_back(48000);
+    frequencies.push_back(88200);
+    frequencies.push_back(96000);
+    return frequencies;
-}
-