Changeset 734 for trunk/libffado/src/genericavc

Timestamp:

11/28/07 05:03:31 (15 years ago)

Author:

ppalmers

Message:

merge ppalmers-streaming branch

Files:

• trunk/libffado/src/genericavc/avc_avdevice.cpp (modified) (4 diffs)
• trunk/libffado/src/genericavc/avc_avdevice.h (modified) (1 diff)

trunk/libffado/src/genericavc/avc_avdevice.cpp

@@ -236 +236 @@
-        bool found=false;
-        for ( PlugVector::const_iterator it2 = syncMSUInputPlugs.begin();
-  
-  
+
+
-        {
-            AVC::Plug* msuPlug = *it2;
@@ -422 +422 @@
-    }
-
-    int samplerate=outputPlug->getSampleRate();
-
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Initializing receive processor...\n");
-    // create & add streamprocessors
-    Streaming::StreamProcessor *p;
-
+    if ( outputPlug->getNrOfChannels() == 0 ) {
+        debugError("Receive plug has no channels\n");
+        return false;
+    }
-    p=new Streaming::AmdtpReceiveStreamProcessor(
-                             get1394Service().getPort(),
-                             samplerate,
-                             outputPlug->getNrOfChannels());
-
@@ -455 +456 @@
-        p=new Streaming::AmdtpReceiveStreamProcessor(
-                                  get1394Service().getPort(),
-                                  samplerate,
-                                  inputPlug->getNrOfChannels());
-    } else {
-        p=new Streaming::AmdtpTransmitStreamProcessor(
-                                get1394Service().getPort(),
-                                samplerate,
-                                inputPlug->getNrOfChannels());
-    }
@@ -596 +595 @@
-AvDevice::getStreamCount() {
-    return m_receiveProcessors.size() + m_transmitProcessors.size();
+    //return 1;
-}
-

trunk/libffado/src/genericavc/avc_avdevice.h

@@ -34 +34 @@
-#include "libavc/general/avc_plug.h"
-
-
-
-
+
+
+
+
-
-#include "debugmodule/debugmodule.h"