Changeset 934:0277459c7e79 in roaraudio

Timestamp:

12/07/08 18:20:23 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

got output streams basicly working, we should clean up some code anyway

Location:

roard

Files:

• clients.c (modified) (2 diffs)
• driver_oss.c (modified) (1 diff)
• roard.c (modified) (2 diffs)
• streams.c (modified) (3 diffs)

roard/clients.c

@@ -353 +353 @@
 int clients_send_mon  (struct roar_audio_info * sa, uint32_t pos) {
  int i;
- int fh;
+// int fh;
+ int j;
 
  for (i = 0; i < ROAR_CLIENTS_MAX; i++) {
@@ -359 +360 @@
    continue;
 
+/*
   if ( (fh = g_clients[i]->fh) == -1 )
    continue;
+*/
 
   if ( g_clients[i]->execed == -1 ) {
    // TODO: add some code to send a message to the client insetd of the raw data.
+   for (j = 0; j < ROAR_CLIENTS_MAX_STREAMS_PER_CLIENT; j++) {
+    //if ( (fh = streams_get_fh(g_clients[i]->streams[j])) != -1 ) {
+    ROAR_DBG("clients_send_mon(*): client=%i, stream=%i -> %i", i, j, g_clients[i]->streams[j]);
+    if ( g_clients[i]->streams[j] != -1 )
+     streams_send_mon(g_clients[i]->streams[j]);
+   }
   } else {
 //   streams_check(g_clients[i]->execed);

roard/driver_oss.c

@@ -88 +88 @@
  }
 
+ ROAR_WARN("driver_oss_open(*): OSS devices opened :)");
+
  return 0;
 }

roard/roard.c

@@ -130 +130 @@
 
  if ( (stream = streams_new()) == -1 ) {
+  ROAR_WARN("add_output(drv='%s', dev='%s', opts='%s') = -1", drv, dev, opts);
   return -1;
  }
@@ -145 +146 @@
  if ( driver_openvio(&(ss->vio), &(ss->driver_id), drv, dev, &(s->info), -1) ) {
   streams_delete(stream);
+  ROAR_WARN("add_output(drv='%s', dev='%s', opts='%s') = -1", drv, dev, opts);
   return -1;
  }

roard/streams.c

@@ -684 +684 @@
  s = ROAR_STREAM((ss = g_streams[id]));
 
+/*
  if ( (fh = s->fh) == -1 )
   return 0;
+*/
 
  if ( s->dir != ROAR_DIR_MONITOR && s->dir != ROAR_DIR_OUTPUT && s->dir != ROAR_DIR_BIDIR )
@@ -693 +695 @@
   return 0;
 
- ROAR_DBG("streams_send_mon(id=%i): fh = %i", id, fh);
+ ROAR_WARN("streams_send_mon(id=%i): fh = %i", id, fh);
 
  if ( s->info.channels != g_sa->channels || s->info.bits  != g_sa->bits ||
@@ -850 +852 @@
   return -1;
 
- roar_vio_set_fh(&(stream->vio), ROAR_STREAM(stream)->fh);
+ if ( roar_vio_get_fh(&(stream->vio)) == -1 && ROAR_STREAM(stream)->fh != -1 )
+  roar_vio_set_fh(&(stream->vio), ROAR_STREAM(stream)->fh);
+
+// ROAR_WARN("stream_vio_s_write(*): writing...");
 
  return roar_vio_write(&(stream->vio), buf, count);