Changeset 66:a75c2005faeb in roaraudio

Timestamp:

07/12/08 13:38:56 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

finaly got sources working!

Location:

roard

Files:

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

roard/clients.c

@@ -111 +111 @@
  struct timeval tv;
  fd_set r, e;
- int i;
+ int i, j;
  int ret;
  int fh;
@@ -126 +126 @@
    continue;
 
-  if ( (fh = g_clients[i]->fh) == -1 )
-   continue;
-
-  FD_SET(fh, &r);
-  FD_SET(fh, &e);
-
-  if ( fh > max_fh )
-   max_fh = fh;
+  if ( (fh = g_clients[i]->fh) != -1 ) {
+   FD_SET(fh, &r);
+   FD_SET(fh, &e);
+
+   if ( fh > max_fh )
+    max_fh = fh;
+  } else {
+
+   for (j = 0; j < ROAR_CLIENTS_MAX_STREAMS_PER_CLIENT; j++) {
+    if ( (fh = streams_get_fh(g_clients[i]->streams[j])) != -1 ) {
+     FD_SET(fh, &r);
+
+     if ( fh > max_fh )
+      max_fh = fh;
+    }
+   }
+  }
+
  }
 
@@ -144 +154 @@
    continue;
 
-  if ( (fh = g_clients[i]->fh) == -1 )
-   continue;
-
-  if ( FD_ISSET(fh, &r) ) {
-   if ( g_clients[i]->execed == -1 ) {
-    clients_check(i);
-   } else {
-    streams_check(g_clients[i]->execed);
-   }
-  }
-
-  if ( FD_ISSET(fh, &e) )
-   clients_delete(i);
+  if ( (fh = g_clients[i]->fh) != -1 ) {
+
+   if ( FD_ISSET(fh, &r) ) {
+    if ( g_clients[i]->execed == -1 ) {
+     clients_check(i);
+    } else {
+     streams_check(g_clients[i]->execed);
+    }
+   }
+
+   if ( FD_ISSET(fh, &e) )
+    clients_delete(i);
+  } else {
+   for (j = 0; j < ROAR_CLIENTS_MAX_STREAMS_PER_CLIENT; j++) {
+    if ( (fh = streams_get_fh(g_clients[i]->streams[j])) != -1 ) {
+     if ( FD_ISSET(fh, &r) ) {
+      streams_check(g_clients[i]->streams[j]);
+     }
+    }
+   }
+  }
  }
 

roard/include/streams.h

@@ -34 +34 @@
 
 int streams_set_fh     (int id, int fh);
+int streams_get_fh     (int id);
 int streams_get        (int id, struct roar_stream_server ** stream);
 

roard/streams.c

@@ -121 +121 @@
 }
 
+int streams_get_fh     (int id) {
+ if ( g_streams[id] == NULL )
+  return -1;
+
+ return ((struct roar_stream *)g_streams[id])->fh;
+}
 
 int streams_get    (int id, struct roar_stream_server ** stream) {