Changeset 1042:44f94f4095dd in roaraudio

Timestamp:

12/23/08 07:13:10 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added streams_get_flag(), fixed a bug with only-vio drivers

Location:

roard

Files:

• include/streams.h (modified) (1 diff)
• streams.c (modified) (3 diffs)

roard/include/streams.h

@@ -80 +80 @@
 int streams_set_flag     (int id, int flag);
 int streams_reset_flag   (int id, int flag);
+int streams_get_flag     (int id, int flag);
 
 int stream_add_buffer     (int id, struct roar_buffer *  buf);

roard/streams.c

@@ -282 +282 @@
 }
 
+int streams_get_flag     (int id, int flag) {
+ if ( g_streams[id] == NULL )
+  return -1;
+
+ return g_streams[id]->flags & flag ? 1 : 0;
+}
+
 int streams_get_outputbuffer  (int id, void ** buffer, size_t size) {
  if ( g_streams[id] == NULL )
@@ -728 +735 @@
   return 0;
 
- ROAR_DBG("streams_send_mon(id=%i): fh = %i", id, fh);
+ ROAR_DBG("streams_send_mon(id=%i): fh = %i", id, s->fh);
 
  if ( s->info.channels != g_sa->channels || s->info.bits  != g_sa->bits ||
@@ -753 +760 @@
 
  if ( ss->codecfilter == -1 ) {
-  if ( s->fh == -1 )
+  ROAR_DBG("streams_send_mon(id=%i): not a CF stream", id);
+  if ( s->fh == -1 && roar_vio_get_fh(&(ss->vio)) == -1 )
    return 0;