Changeset 4885:01d694a7fdf7 in roaraudio for roarclients/roarshout.c

Timestamp:

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

Author:

phi

Branch:

default

Phase:

public

Message:

Some cleanup of roarclients to fix ckport warnings

File:

• roarclients/roarshout.c (modified) (3 diffs)

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);