Changeset 734 for trunk/libffado/src/dice

Timestamp:

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

Author:

ppalmers

Message:

merge ppalmers-streaming branch

Files:

• trunk/libffado/src/dice/dice_avdevice.cpp (modified) (5 diffs)
• trunk/libffado/src/dice/dice_avdevice.h (modified) (1 diff)

trunk/libffado/src/dice/dice_avdevice.cpp

@@ -28 +28 @@
-#include "libieee1394/ieee1394service.h"
-
-#include "libstreaming/AmdtpStreamProcessor.h"
-
-#include "debugmodule/debugmodule.h"
-
@@ -51 +49 @@
-    // vendor id, model id, vendor name, model name
-    {FW_VENDORID_TCAT, 0x00000002, "TCAT", "DiceII EVM"},
+    {FW_VENDORID_TCAT, 0x00000004, "TCAT", "DiceII EVM (vxx)"},
-};
-
@@ -448 +447 @@
-bool
-DiceAvDevice::prepare() {
-    int samplerate=getSamplingFrequency();
-
-    // prepare receive SP's
-    for (unsigned int i=0;i<m_nb_tx;i++) {
@@ -494 +491 @@
-        p=new Streaming::AmdtpReceiveStreamProcessor(
-                             m_p1394Service->getPort(),
-                             samplerate,
-                             nb_channels);
-
@@ -581 +577 @@
-        p=new Streaming::AmdtpTransmitStreamProcessor(
-                             m_p1394Service->getPort(),
-                             samplerate,
-                             nb_channels);
-

trunk/libffado/src/dice/dice_avdevice.h

@@ -30 +30 @@
-#include "libavc/avc_definitions.h"
-
-
-
+
+
+
-#include "libieee1394/ARMHandler.h"
-