Changeset 4885:01d694a7fdf7 in roaraudio

Timestamp:

04/28/11 17:28:25 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Some cleanup of roarclients to fix ckport warnings

Files:

• ChangeLog (modified) (1 diff)
• roarclients/roar-config.c (modified) (2 diffs)
• roarclients/roarclientpass.c (modified) (2 diffs)
• roarclients/roarctl.c (modified) (1 diff)
• roarclients/roarinterconnect.c (modified) (1 diff)
• roarclients/roarmon.c (modified) (1 diff)
• roarclients/roarmonhttp.c (modified) (1 diff)
• roarclients/roarshout.c (modified) (3 diffs)
• roarclients/roarsin.c (modified) (3 diffs)

ChangeLog

@@ -4 +4 @@
         * Added functions to access symbolic names for audio info parameters (Closes: #51)
         * added VIOs and DSTR elements: full:
+        * Some cleanup of roarclients to fix ckport warnings.
 
 v. 0.4beta5 - Tue Apr 26 2011 08:42 CEST

roarclients/roar-config.c

@@ -68 +68 @@
 }
 
+#define _strcat(buf, n) strncat(buf, n, sizeof(buf)-1-strlen(buf))
+
 int main (int argc, char * argv[]) {
  enum { NORMAL, PC } mode = NORMAL;
@@ -121 +123 @@
     if ( cflags || libs ) {
      if ( cflags )
-      strcat(buf, flags_ptr->cflags);
+      _strcat(buf, flags_ptr->cflags);
 
      if ( libs )
-      strcat(buf, flags_ptr->libs);
+      _strcat(buf, flags_ptr->libs);
 
      puts(buf);

roarclients/roarclientpass.c

@@ -22 +22 @@
  *  Boston, MA 02110-1301, USA.
  *
+ */
+
+/* ckport options:
+ * ckport: ignore: ^roar_socket_open$ -- Used to get a clientfh.
  */
 
@@ -123 +127 @@
   roar_debug_set_stderr_mode(ROAR_DEBUG_MODE_SYSLOG);
 #else
-  roar_debug_set_stderr_fh(-1);
+  roar_debug_set_stderr_vio(roar_stderr);
 #endif
  } else {
-  roar_debug_set_stderr_fh(ROAR_STDERR);
+  roar_debug_set_stderr_vio(roar_stderr);
  }
 

roarclients/roarctl.c

@@ -22 +22 @@
  *  Boston, MA 02110-1301, USA.
  *
+ */
+
+/* ckport options:
+ * ckport: ignore: ^roar_req$ -- Used within ping command.
  */
 

roarclients/roarinterconnect.c

@@ -22 +22 @@
  *  Boston, MA 02110-1301, USA.
  *
+ */
+
+/* ckport options:
+ * ckport: ignore: ^roar_cdriver_oss$     -- For OSS streams
+ * ckport: ignore: ^roar_simple_stream$   -- For RoarAudio streams
+ * ckport: ignore: ^roar_socket_connect$  -- For PulseAudio Simple streams
  */
 

roarclients/roarmon.c

@@ -205 +205 @@
 
  if ( prethru ) {
-  if ( roar_stream_set_flags(&con, &s, ROAR_FLAG_PRETHRU, 0) == -1 ) {
+  if ( roar_stream_set_flags2(&con, &s, ROAR_FLAG_PRETHRU, ROAR_SET_FLAG) == -1 ) {
    fprintf(stderr, "Error: can not set prethru flag on stream\n");
    roar_disconnect(&con);

roarclients/roarmonhttp.c

@@ -347 +347 @@
 
  if ( sflags != ROAR_FLAG_NONE ) {
-  if ( roar_stream_set_flags(&con, &s, sflags, 0) == -1 ) {
+  if ( roar_stream_set_flags2(&con, &s, sflags, ROAR_SET_FLAG) == -1 ) {
    roar_disconnect(&con);
    return 14;

roarclients/roarshout.c

@@ -105 +105 @@
  char * s_url    = NULL;
  int    s_public = 0;
- int    fh;
+ roar_vs_t * vss;
+ int    err;
+ ssize_t ret;
  int    i;
  char buf[BUFSIZE];
@@ -252 +254 @@
   shout_set_url(shout, s_url);
 
- if ( (fh = roar_simple_monitor(rate, channels, bits, codec, server, "roarshout")) == -1 ) {
-  fprintf(stderr, "Error: can not start monitoring\n");
+ if ( (vss = roar_vs_new_simple(server, "roarshout", rate, channels, codec, bits, ROAR_DIR_MONITOR, &err)) == NULL ) {
+  fprintf(stderr, "Error: can not start monitoring: %s\n", roar_vs_strerr(err));
   return 1;
  }
@@ -262 +264 @@
  }
 
- while((i = read(fh, buf, BUFSIZE)))
+ while((ret = roar_vs_read(vss, buf, BUFSIZE, NULL)))
   if (shout_send(shout, (unsigned char*)buf, i) != SHOUTERR_SUCCESS)
    break;
 
- roar_simple_close(fh);
+ roar_vs_close(vss, ROAR_VS_TRUE, NULL);
 
  shout_sync(shout);

roarclients/roarsin.c

@@ -82 +82 @@
  float length = 5; /* 5 sec */
  float step;       /* how much time per sample we have to encode ... */
- int fh;
+ roar_vs_t * vss;
+ int err;
  int i;
  int16_t out[1024];
@@ -109 +110 @@
  step   = M_PI*2*freq/rate;
 
- if ( (fh = roar_simple_play(rate, channels, bits, codec, NULL, "sine gen")) == -1 ) {
-  fprintf(stderr, "Error: can not open playback!\n");
+ if ( (vss = roar_vs_new_playback(NULL, "sine gen", rate, channels, codec, bits, &err)) == NULL ) {
+  fprintf(stderr, "Error: can not open playback: %s\n", roar_vs_strerr(err));
   exit(1);
  }
@@ -119 +120 @@
    t += step;
   }
-  write(fh, out, 2048);
+  roar_vs_write(vss, out, 2048, NULL);
  }
 
- roar_simple_close(fh);
+ roar_vs_close(vss, ROAR_VS_FALSE, NULL);
 
  return 0;