Changeset 5022:b2a2e896974d in roaraudio for roard

Timestamp:

05/27/11 17:13:54 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Converted most roarclients to to use VS API (See: #87)

Location:

roard

Files:

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

roard/include/streams.h

@@ -203 +203 @@
 int streams_check      (int id);
 int streams_send_mon   (int id);
+int streams_send_filter_all(void);
 int streams_send_filter(int id);
 

roard/loop.c

@@ -128 +128 @@
 #endif
    clients_send_filter(sa, g_pos);
+//   streams_send_filter_all(); // this currently results in deadlocks.
    clients_send_mon(sa, g_pos);
 #ifdef ROAR_HAVE_USLEEP

roard/streams.c

@@ -2549 +2549 @@
 #undef _return
 
+int streams_send_filter_all(void) {
+ struct roar_stream_server *  ss;
+ int i;
+
+ for (i = 0; i < ROAR_STREAMS_MAX; i++) {
+  if ( (ss = g_streams[i]) == NULL )
+   continue;
+
+  if ( ROAR_STREAM(ss)->dir != ROAR_DIR_FILTER )
+   continue;
+
+  if ( !ss->ready )
+   continue;
+
+  if ( ss->state == ROAR_STREAMSTATE_CLOSING )
+   continue;
+
+  streams_send_filter(i);
+ }
+
+ return 0;
+}
+
 int streams_send_filter(int id) {
  int fh;