Changeset 624

Timestamp:

09/07/07 10:46:04 (15 years ago)

Author:

ppalmers

Message:

some more experiments regarding setting the samplerate on the saffire

Files:

• trunk/libffado/src/bebob/focusrite/focusrite_cmd.h (modified) (1 diff)
• trunk/libffado/src/bebob/focusrite/focusrite_device.cpp (modified) (7 diffs)
• trunk/libffado/src/bebob/focusrite/focusrite_device.h (modified) (1 diff)

trunk/libffado/src/bebob/focusrite/focusrite_cmd.h

@@ -32 +32 @@
-
-#define FOCUSRITE_CMD_ID_SAMPLERATE         84
+#define FOCUSRITE_CMD_ID_SAMPLERATE_MIRROR  115
-
-#define FOCUSRITE_CMD_ID_PHANTOM14          98

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

@@ -35 +35 @@
-                 getConfigRom().getNodeId() );
-
+    // the saffire pro doesn't seem to like it if the commands are too fast
+    if (AVC::AVCCommand::getSleepAfterAVCCommand() < 200) {
+        AVC::AVCCommand::setSleepAfterAVCCommand( 200 );
+    }
+
-    // create control objects for the saffire pro
-    m_Phantom1 = new BinaryControl(*this, FOCUSRITE_CMD_ID_PHANTOM14,
@@ -230 +235 @@
-    
-    cmd.setVerbose( getDebugLevel() );
-
+// 
-    
-    cmd.m_id=id;
@@ -254 +259 @@
-    
-    cmd.setVerbose( getDebugLevel() );
-
+// 
-    
-    cmd.m_id=id;
@@ -269 +274 @@
-
-int
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-        case FOCUSRITE_CMD_SAMPLERATE_44K1:  return 44100;
-        case FOCUSRITE_CMD_SAMPLERATE_48K:   return 48000;
@@ -291 +286 @@
-}
-
+uint32_t
+SaffireProDevice::convertSrToDef( int sr ) {
+    switch(sr) {
+        case 44100:  return FOCUSRITE_CMD_SAMPLERATE_44K1;
+        case 48000:  return FOCUSRITE_CMD_SAMPLERATE_48K;
+        case 88200:  return FOCUSRITE_CMD_SAMPLERATE_88K2;
+        case 96000:  return FOCUSRITE_CMD_SAMPLERATE_96K;
+        case 176400: return FOCUSRITE_CMD_SAMPLERATE_176K4;
+        case 192000: return FOCUSRITE_CMD_SAMPLERATE_192K;
+        default:
+            debugWarning("Unsupported samplerate: %d\n", sr);
+            return 0;
+    }
+}
+
+int
+SaffireProDevice::getSamplingFrequency( ) {
+    uint32_t sr;
+    if ( !getSpecificValue(FOCUSRITE_CMD_ID_SAMPLERATE, &sr ) ) {
+        debugError( "getSpecificValue failed\n" );
+        return 0;
+    }
+    
+    debugOutput( DEBUG_LEVEL_NORMAL,
+                     "getSampleRate: %d\n", sr );
+
+    return convertDefToSr(sr);
+}
+
-bool
-SaffireProDevice::setSamplingFrequencyDo( int s )
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    if ( !setSpecificValue(FOCUSRITE_CMD_ID_SAMPLERATE, value) ) {
-        debugError( "setSpecificValue failed\n" );
@@ -313 +324 @@
-    }
-    return true;
+}
+
+// FIXME: this is not really documented, and is an assumtion
+int
+SaffireProDevice::getSamplingFrequencyMirror( ) {
+    uint32_t sr;
+    if ( !getSpecificValue(FOCUSRITE_CMD_ID_SAMPLERATE_MIRROR, &sr ) ) {
+        debugError( "getSpecificValue failed\n" );
+        return 0;
+    }
+    
+    debugOutput( DEBUG_LEVEL_NORMAL,
+                     "getSampleRateMirror: %d\n", sr );
+
+    return convertDefToSr(sr);
-}
-
@@ -332 +358 @@
-        return true;
-    } else {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-            if(!setSamplingFrequencyDo( s )) {
-                debugWarning("setSamplingFrequencyDo failed\n");
-            }
-            
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
+        
+        if (ntries==0) {
+            debugError("Setting samplerate failed...\n");
+            return false;
+        }
+
-        return true;
-    }

trunk/libffado/src/bebob/focusrite/focusrite_device.h

@@ -87 +87 @@
-private:
-    virtual bool setSamplingFrequencyDo( int );
-
+
+
+
+
-    BinaryControl * m_Phantom1;
-    BinaryControl * m_Phantom2;