Changeset 1844:5454eaa259aa in roaraudio

Timestamp:

05/23/09 05:39:54 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

corrected DMX512 codec filter to always write in 512 byte blocks

File:

• roard/light.c (modified) (2 diffs)

roard/light.c

@@ -111 +111 @@
  struct roar_stream_server *  ss;
  char buf[512];
+ register char * bufptr;
 
  if ( g_streams[id] == NULL )
@@ -126 +127 @@
      chans = 512;
 
-    if ( stream_vio_s_write(ss, g_light_state.state, chans) != chans ) {
+    if ( chans == 512 ) {
+     bufptr = g_light_state.state;
+    } else {
+     memset(buf, 0, 512);
+     memcpy(buf, g_light_state.state, chans);
+     bufptr = buf;
+    }
+
+    if ( stream_vio_s_write(ss, bufptr, 512) != 512 ) {
      streams_delete(id);
      return -1;
-    }
-
-    if ( chans < 512 ) {
-     chans = 512 - chans;
-     memset(buf, 0, chans);
-     if ( stream_vio_s_write(ss, g_light_state.state, chans) != chans ) {
-      streams_delete(id);
-      return -1;
-     }
     }