Changeset 585:6fb31f1faf3d in roaraudio

Timestamp:

08/19/08 16:16:42 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

allow monetoring streams to use codec filters, and cast cleanup

File:

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

roard/streams.c

@@ -619 +619 @@
  ROAR_DBG("streams_send_mon(id=%i) = ?", id);
 
- s = (struct roar_stream *) (ss = g_streams[id]);
+ s = ROAR_STREAM((ss = g_streams[id]));
 
  if ( (fh = s->fh) == -1 )
@@ -629 +629 @@
  ROAR_DBG("streams_send_mon(id=%i): fh = %i", id, fh);
 
- if ( write(fh, g_output_buffer, g_output_buffer_len) == g_output_buffer_len )
-  return 0;
+ errno = 0;
+
+ if ( ss->codecfilter == -1 ) {
+  if ( write(fh, g_output_buffer, g_output_buffer_len) == g_output_buffer_len )
+   return 0;
+ } else {
+  if ( codecfilter_write(ss->codecfilter_inst, ss->codecfilter, g_output_buffer, g_output_buffer_len)
+            == g_output_buffer_len ) {
+   return 0;
+  } else { // we cann't retry on codec filetered streams
+   return -1;
+  }
+ }
 
  if ( errno == EAGAIN ) {