Changeset 537

Timestamp:

08/21/07 07:57:04 (16 years ago)

Author:

ppalmers

Message:

- SPDIF out works (tested)
- SPDIF in should work (untested)
- sync from external sync plug works

Files:

• trunk/libffado/src/bebob/bebob_avdevice.cpp (modified) (6 diffs)

trunk/libffado/src/bebob/bebob_avdevice.cpp

@@ -62 +62 @@
-    {0x000f1b, 0x00010064, "ESI", "Quatafire 610"},
-
+    {0x00130e, 0x00000000, "Focusrite", "Saffire (LE)"},
-    {0x00130e, 0x00000003, "Focusrite", "Saffire Pro26IO"},
-    {0x00130e, 0x00000006, "Focusrite", "Saffire Pro10IO"},
@@ -440 +441 @@
-    }
-
-PCR
+External
-                                                    AvPlug::eAPD_Input,
-                                                    AvPlug::eAPT_Digital );
+    if ( !digitalExternalInputPlugs.size() ) {
+        debugOutput( DEBUG_LEVEL_VERBOSE, "No external digital input plugs found\n" );
+
+    }
+    
+    AvPlugVector syncExternalInputPlugs = getPlugsByType( m_externalPlugs,
+                                                    AvPlug::eAPD_Input,
+                                                    AvPlug::eAPT_Sync );
+    if ( !syncExternalInputPlugs.size() ) {
+        debugOutput( DEBUG_LEVEL_VERBOSE, "No external sync input plugs found\n" );
+
+    }
-
-    AvPlugVector syncMSUInputPlugs = m_pPlugManager->getPlugsByType(
@@ -476 +489 @@
-    debugOutput( DEBUG_LEVEL_VERBOSE, "PCR Iso Output Plugs:\n" );
-    showAvPlugs( isoPCROutputPlugs );
-
-
+
+
+
+
-    debugOutput( DEBUG_LEVEL_VERBOSE, "MSU Sync Input Plugs:\n" );
-    showAvPlugs( syncMSUInputPlugs );
@@ -507 +522 @@
-                                      "Internal (CSP)" );
-
-PCR 
+
-    // -> SPDIF/ADAT sync
-
+
+
+
+
+
+
+
-                                      syncMSUInputPlugs,
-                                      "Digital Input Sync" );
@@ -1161 +1182 @@
-        return false;
-    }
-
+
-    if (!addPlugToProcessor(*outputPlug,p,
-        Streaming::Port::E_Capture)) {
@@ -1282 +1303 @@
-            case ExtendedPlugInfoClusterInfoSpecificData::ePT_MADI:
-            case ExtendedPlugInfoClusterInfoSpecificData::ePT_Digital:
+                p=new Streaming::AmdtpAudioPort(
+                        portname.str(),
+                        direction,
+                        // \todo: streaming backend expects indexing starting from 0
+                        // but bebob reports it starting from 1. Decide where
+                        // and how to handle this (pp: here)
+                        channelInfo->m_streamPosition - 1,
+                        channelInfo->m_location - 1,
+                        Streaming::AmdtpPortInfo::E_MBLA
+                );
+                break;
-            case ExtendedPlugInfoClusterInfoSpecificData::ePT_NoType:
-            default: