Changeset 544

Timestamp:

08/21/07 08:18:46 (16 years ago)

Author:

ppalmers

Message:

- fix midi related bug
- fix length bug (as in trunk)

Files:

• branches/echoaudio/src/libstreaming/AmdtpStreamProcessor.cpp (modified) (3 diffs)

branches/echoaudio/src/libstreaming/AmdtpStreamProcessor.cpp

@@ -82 +82 @@
-
-    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
@@ -740 +750 @@
-{
-    bool ok=true;
-char
+quadlet_t
-
-    quadlet_t *target_event=NULL;
@@ -772 +782 @@
-
-        for(j = (dbc & 0x07)+mp->getLocation(); j < nevents; j += 8) {
-
+
+
+
-            target_event=(quadlet_t *)(data + ((j * m_dimension) + mp->getPosition()));
-
+
-            if(mp->canRead()) { // we can send a byte
-                mp->readEvent(&byte);
-
+
+
-                    IEC61883_AM824_SET_LABEL((byte)<<16,
-                                             IEC61883_AM824_LABEL_MIDI_1X));
+
+                debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "MIDI port %s, pos=%d, loc=%d, dbc=%d, nevents=%d, dim=%d\n",
+                    mp->getName().c_str(), mp->getPosition(), mp->getLocation(), dbc, nevents, m_dimension);
+                debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "base=%p, target=%p, value=%08X\n",
+                    data, target_event, tmpval);
+                    
-            } else {
-                // can't send a byte, either because there is no byte,
-                // or because this would exceed the maximum rate
-*target_event
+tmpval
-                    IEC61883_AM824_SET_LABEL(0,IEC61883_AM824_LABEL_MIDI_NO_DATA));
-            }
+            
+            *target_event=tmpval;
-        }
-