Changeset 4819:bfe88a001985 in roaraudio

Timestamp:

03/28/11 12:41:15 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

avoid warning when record stream is not yet fully up

Location:

roard

Files:

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

roard/driver_oss.c

@@ -535 +535 @@
 
 ssize_t driver_oss_write   (struct roar_vio_calls * vio, void *buf, size_t count) {
+ ROAR_DBG("driver_oss_write(vio=%p, buf=%p, count=%llu) = ?", vio, buf, (long long unsigned int)count);
+
  if ( _get(vio,fh) == -1 )
   return -1;
@@ -548 +550 @@
 
 ssize_t driver_oss_read     (struct roar_vio_calls * vio, void *buf, size_t count) {
+ ROAR_DBG("driver_oss_read(vio=%p, buf=%p, count=%llu) = ?", vio, buf, (long long unsigned int)count);
+
  if ( _get(vio,fh) == -1 )
   return -1;
@@ -553 +557 @@
  if ( _get(vio,need_config) ) {
   if ( driver_oss_config_device(vio->inst) == -1 ) {
+   ROAR_DBG("driver_oss_read(vio=%p, buf=%p, count=%llu) = -1", vio, buf, (long long unsigned int)count);
    return -1;
   }
  }
 
+ ROAR_DBG("driver_oss_read(vio=%p, buf=%p, count=%llu) = ?", vio, buf, (long long unsigned int)count);
+
  return read(_get(vio,fh), buf, count);
 }

roard/include/streams.h

@@ -154 +154 @@
 
 int streams_is_ready     (int id);
+int streams_is_new       (int id);
 
 int streams_set_primary  (int id, int prim);

roard/streams.c

@@ -760 +760 @@
 }
 
+int streams_is_new       (int id) {
+ _CHECK_SID(id);
+
+ return g_streams[id]->ready;
+}
+
 int streams_set_primary (int id, int prim) {
  _CHECK_SID(id);

roard/waveform.c

@@ -68 +68 @@
   len = g_input_buffer_len;
   if ( stream_shift_out_buffer(streams_recsource_id, g_input_buffer, &len) == -1 ) {
-   ROAR_WARN("waveform_update_mixer(void): can not read record buffer.");
+   ROAR_DBG("waveform_update_mixer(void): streams_is_new(%i) = %i", streams_recsource_id, streams_is_new(streams_recsource_id));
+   if ( streams_is_new(streams_recsource_id) ) {
+    ROAR_DBG("waveform_update_mixer(void): can not read record buffer: stream %i is still marked new.", streams_recsource_id);
+   } else {
+    ROAR_WARN("waveform_update_mixer(void): can not read record buffer.");
+   }
    memset(g_input_buffer, 0, g_input_buffer_len);
   } else {