Changeset 547

Timestamp:

08/21/07 08:36:17 (16 years ago)

Author:

arnonym

Message:

Port ppalmers fixes for spdif to this scons branch. This will affect nothing in the end, as the transition from scons-branch to trunk will involve only the build-system and (almost) no sources...

Files:

• branches/libffado-scons_porting_work/src/bebob/bebob_avdevice.cpp (modified) (6 diffs)
• branches/libffado-scons_porting_work/src/libstreaming/AmdtpStreamProcessor.cpp (modified) (1 diff)
• branches/libffado-scons_porting_work/src/libstreaming/IsoHandler.cpp (modified) (1 diff)

branches/libffado-scons_porting_work/src/bebob/bebob_avdevice.cpp

@@ -60 +60 @@
-    {0x000f1b, 0x00010064, "ESI", "Quatafire 610"},
-
+    {0x00130e, 0x00000000, "Focusrite", "Saffire (LE)"},
-    {0x00130e, 0x00000003, "Focusrite", "Saffire Pro26IO"},
-    {0x00130e, 0x00000006, "Focusrite", "Saffire Pro10IO"},
@@ -436 +437 @@
-    }
-
-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(
@@ -472 +485 @@
-    debugOutput( DEBUG_LEVEL_VERBOSE, "PCR Iso Output Plugs:\n" );
-    showAvPlugs( isoPCROutputPlugs );
-
-
+
+
+
+
-    debugOutput( DEBUG_LEVEL_VERBOSE, "MSU Sync Input Plugs:\n" );
-    showAvPlugs( syncMSUInputPlugs );
@@ -503 +518 @@
-                                      "Internal (CSP)" );
-
-PCR 
+
-    // -> SPDIF/ADAT sync
-
+
+
+
+
+
+
+
-                                      syncMSUInputPlugs,
-                                      "Digital Input Sync" );
@@ -1160 +1181 @@
-        return false;
-    }
-
+
-    if (!addPlugToProcessor(*outputPlug,p,
-        Streaming::Port::E_Capture)) {
@@ -1281 +1302 @@
-            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:

branches/libffado-scons_porting_work/src/libstreaming/AmdtpStreamProcessor.cpp

@@ -80 +80 @@
-                  unsigned char *tag, unsigned char *sy,
-                  int cycle, unsigned int dropped, unsigned int max_length) {
-
+
-    struct iec61883_packet *packet = (struct iec61883_packet *) data;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Xmit handler for cycle %d, (running=%d, enabled=%d,%d)\n",
-        cycle, m_running, m_disabled, m_is_disabled);
+    
+    m_last_cycle=cycle;
-
-#ifdef DEBUG

branches/libffado-scons_porting_work/src/libstreaming/IsoHandler.cpp

@@ -569 +569 @@
-bool IsoXmitHandler::start(int cycle)
-{
-
+
+
-
-    if(!(IsoHandler::start(cycle))) {