Changeset 5162:85c55ccd12a9 in roaraudio

Timestamp:

10/16/11 20:12:40 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

fixed some compiler warnings

Location:

roard

Files:

• clients.c (modified) (1 diff)
• codecfilter_flac.c (modified) (3 diffs)
• driver_dstr.c (modified) (1 diff)
• driver_esd.c (modified) (1 diff)
• driver_raw.c (modified) (1 diff)
• driver_roar.c (modified) (1 diff)
• hwmixer_dstr.c (modified) (3 diffs)
• include/meta.h (modified) (1 diff)
• meta.c (modified) (3 diffs)
• midi.c (modified) (5 diffs)
• output.c (modified) (1 diff)
• sample.c (modified) (2 diffs)
• sources.c (modified) (2 diffs)

roard/clients.c

@@ -570 +570 @@
     event = ROAR_NOTIFY_CMD2EVENT(m.cmd);
 
-    roar_debug_message_print(&m);
-
     oldcmd = m.cmd;
 

roard/codecfilter_flac.c

@@ -147 +147 @@
     continue;
 
-   stream_meta_add(ROAR_STREAM(self->ss)->id, type, "", value);
+   if ( stream_meta_add(ROAR_STREAM(self->ss)->id, type, "", value) == -1 ) {
+    ROAR_WARN("cf_flac_cb_metadata(..., client_data=%p{ROAR_STREAM(.ss)->id=%i}): Can not add meta data: %s",
+              ROAR_STREAM(self->ss)->id, roar_error2str(roar_error));
+   }
 
     if ( strcmp(keycopy, "REPLAYGAIN_TRACK_PEAK") == 0 ) {
@@ -252 +255 @@
   stats.bytes = 0;
  } else {
-  roar_buffer_ring_stats(self->decoder.written, &stats);
+  if ( roar_buffer_ring_stats(self->decoder.written, &stats) == -1 )
+   return -1;
  }
 
@@ -275 +279 @@
    stats.bytes = 0;
   } else {
-   roar_buffer_ring_stats(self->decoder.written, &stats);
+   if ( roar_buffer_ring_stats(self->decoder.written, &stats) == -1 )
+    return -1;
   }
  }

roard/driver_dstr.c

@@ -49 +49 @@
 
  if ( sstream != NULL )
-  roar_vio_ctl(inst, ROAR_VIO_CTL_SET_SSTREAM, sstream);
+  _LIBROAR_IGNORE_RET(roar_vio_ctl(inst, ROAR_VIO_CTL_SET_SSTREAM, sstream));
 
  return 0;

roard/driver_esd.c

@@ -54 +54 @@
  fh = esd_play_stream_fallback(format, info->rate, device, name);
 
- roar_vio_set_fh(inst, fh);
 
  // test for error.
  if ( fh == -1 )
   return -1;
+
+ roar_vio_open_fh_socket(inst, fh);
 
  roar_vio_shutdown(inst, ROAR_VIO_SHUTDOWN_READ);

roard/driver_raw.c

@@ -36 +36 @@
 
  if ( fh == -1 ) {
-  if ( (fh = open(device, O_CREAT|O_TRUNC|O_WRONLY, 0644)) == -1 ) {
+  if ( roar_vio_open_file(inst, device, O_CREAT|O_TRUNC|O_WRONLY, 0644) == -1 )
    return -1;
-  }
+ } else {
+  if ( roar_vio_open_fh(inst, fh) == -1 )
+   return -1;
  }
-
- roar_vio_set_fh(inst, fh);
 
  return 0;

roard/driver_roar.c

@@ -48 +48 @@
  if ( roar_vio_simple_stream(inst, info->rate, info->channels, info->bits, info->codec, device, dir, "roard") == -1 ) {
   if ( streams_get_flag(ROAR_STREAM(sstream)->id, ROAR_FLAG_AUTOCONF) ) {
-   roar_profile2info(info, "default");
+   if ( roar_profile2info(info, "default") == -1 )
+    return -1;
+
    if ( roar_vio_simple_stream(inst, info->rate, info->channels, info->bits, info->codec, device, dir, "roard") == -1 ) {
     return -1;

roard/hwmixer_dstr.c

@@ -27 +27 @@
 
 #ifndef ROAR_WITHOUT_DCOMP_MIXER
+
+/*
+ * This driver ignores errors on seeks:
+ * The writes ensure that if the seek back to begin of file
+ * does not work the records keep seperate and parsable.
+ * So it basically enters some kind of streaming mode.
+ */
 
 //#define TEST_HWMIXER_SUBSTREAMS
@@ -63 +70 @@
 
  roar_vio_printf(vio, "No data yet.\n");
- roar_vio_lseek(vio, 0, SEEK_SET);
+ _LIBROAR_IGNORE_RET(roar_vio_lseek(vio, 0, SEEK_SET));
  roar_vio_sync(vio);
 
@@ -113 +120 @@
  }
 
- roar_vio_lseek(vio, 0, SEEK_SET);
+ _LIBROAR_IGNORE_RET(roar_vio_lseek(vio, 0, SEEK_SET));
  roar_vio_sync(vio);
  return 0;

roard/include/meta.h

@@ -30 +30 @@
 
 #ifdef ROAR_SUPPORT_META
-int stream_meta_set     (int id, int type, char * name, char * val);
-int stream_meta_add     (int id, int type, char * name, char * val);
-int stream_meta_get     (int id, int type, char * name, char * val, size_t len);
+int stream_meta_set     (int id, int type, const char * name, const char * val);
+int stream_meta_add     (int id, int type, const char * name, const char * val);
+int stream_meta_get     (int id, int type, const char * name, char * val, size_t len);
 int stream_meta_list    (int id, int * types, size_t len);
 int stream_meta_clear   (int id);

roard/meta.c

@@ -28 +28 @@
 #ifdef ROAR_SUPPORT_META
 
-int stream_meta_set   (int id, int type, char * name, char * val) {
+int stream_meta_set   (int id, int type, const char * name, const char * val) {
  int i;
  struct roar_stream_server * s = g_streams[id];
@@ -48 +48 @@
 }
 
-int stream_meta_add   (int id, int type, char * name, char * val) {
+int stream_meta_add   (int id, int type, const char * name, const char * val) {
  int i;
  char * c;
@@ -85 +85 @@
 }
 
-int stream_meta_get   (int id, int type, char * name, char * val, size_t len) {
+int stream_meta_get   (int id, int type, const char * name, char * val, size_t len) {
  int i, vallen;
  struct roar_stream_server * s = g_streams[id];

roard/midi.c

@@ -158 +158 @@
 
  if ( roar_buffer_new_data(&b, MIDI_READ_SIZE, &buf) == -1 ) {
-  ROAR_ERR("midi_check_stream(*): Can not alloc buffer space!");
-  ROAR_DBG("midi_check_stream(*) = -1");
+  ROAR_ERR("midi_check_stream(id=%i): Can not alloc buffer space!", id);
+  ROAR_DBG("midi_check_stream(id=%i) = -1", id);
   return -1;
  }
@@ -169 +169 @@
  }
 
- roar_buffer_set_len(b, len);
+ if ( roar_buffer_set_len(b, len) == -1 ) {
+  ROAR_WARN("midi_check_stream(id=%i): Can not set buffer size. BAD.", id);
+  roar_buffer_free(b);
+  streams_delete(id);
+  return -1;
+ }
 
  if ( stream_add_buffer(id, b) == -1 ) {
@@ -348 +353 @@
   }
 
-  roar_buffer_next(&(ss->buffer));
+  if ( roar_buffer_next(&(ss->buffer)) == -1 ) {
+   ROAR_WARN("midi_conv_midi2mes(id=%i): Can not move to next buffer segment. BAD.", id);
+   break;
+  }
  }
 
@@ -672 +680 @@
 
 int midi_add_buf       (int id, struct roar_buffer * buf) {
+#ifdef DEBUG
  struct midi_message * mes;
  void * bufdata;
+#endif
 
  if ( id == -1 || buf == NULL )
   return -1;
 
+#ifdef DEBUG
  if ( roar_buffer_get_data(buf, &bufdata) == -1 )
   return -1;
@@ -688 +699 @@
  ROAR_DBG("midi_add_buf(*): flags=0x%.2X", mes->flags);
  ROAR_DBG("midi_add_buf(*): kk=0x%.2X, vv=0x%.2X", mes->kk, mes->vv);
+#endif
 
  if ( g_midi_mess.buf == NULL ) {
   g_midi_mess.buf = buf;
  } else {
-  roar_buffer_add(g_midi_mess.buf, buf);
+  if ( roar_buffer_add(g_midi_mess.buf, buf) == -1 ) {
+   ROAR_DBG("midi_add_buf(*) = -1");
+   return -1;
+  }
  }
 

roard/output.c

@@ -454 +454 @@
  }
 
- roar_vio_ctl(&(ss->vio), ROAR_VIO_CTL_SET_SSTREAMID, &stream); // ignore errors here
- roar_vio_ctl(&(ss->vio), ROAR_VIO_CTL_SET_SSTREAM,   s); // ignore errors here
+ _LIBROAR_IGNORE_RET(roar_vio_ctl(&(ss->vio), ROAR_VIO_CTL_SET_SSTREAMID, &stream)); // ignore errors here
+ _LIBROAR_IGNORE_RET(roar_vio_ctl(&(ss->vio), ROAR_VIO_CTL_SET_SSTREAM,   s)); // ignore errors here
 
  if ( blocks != -1 )

roard/sample.c

@@ -100 +100 @@
  struct roar_buffer * new;
  struct roar_sample * c = g_samples[id];
+ int save_err;
 
  if ( c == NULL )
@@ -110 +111 @@
   c->data = new;
  } else {
-  roar_buffer_add(c->data, new);
+  if ( roar_buffer_add(c->data, new) == -1 ) {
+   save_err = roar_error;
+   roar_buffer_free(new);
+   roar_err_set(save_err);
+   return -1;
+  }
  }
 

roard/sources.c

@@ -233 +233 @@
  }
 
- roar_vio_ctl(&(ss->vio), ROAR_VIO_CTL_SET_SSTREAMID, &stream); // ignore errors here
- roar_vio_ctl(&(ss->vio), ROAR_VIO_CTL_SET_SSTREAM,   s); // ignore errors here
+ _LIBROAR_IGNORE_RET(roar_vio_ctl(&(ss->vio), ROAR_VIO_CTL_SET_SSTREAMID, &stream)); // ignore errors here
+ _LIBROAR_IGNORE_RET(roar_vio_ctl(&(ss->vio), ROAR_VIO_CTL_SET_SSTREAM,   s)); // ignore errors here
 
  if ( f_sync ) {
@@ -251 +251 @@
  struct roar_stream_server * ss;
 
- if ( fh > -1 )
-  return streams_set_fh(stream, fh);
-
  streams_get(stream, &ss);
 
- if ( roar_vio_open_file(&(ss->vio), device, O_RDONLY, 0644) == -1 )
-  return -1;
+ if ( fh > -1 ) {
+  if ( roar_vio_open_fh(&(ss->vio), fh) == -1 )
+   return -1;
+ } else {
+  if ( roar_vio_open_file(&(ss->vio), device, O_RDONLY, 0644) == -1 )
+   return -1;
+ }
 
  return streams_set_fh(stream, -2);