Changeset 5249:26fb6a2e20fc in roaraudio for roarclients/roardtmf.c

Timestamp:

11/13/11 15:01:24 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

fixed warnings

File:

• roarclients/roardtmf.c (modified) (4 diffs)

roarclients/roardtmf.c

@@ -76 +76 @@
 }
 
-int calc (int16_t * samples, size_t len, int rate, char c) {
+int calc_break (int16_t * samples, size_t len, int rate, char c) {
+ (void)rate, (void)c;
+ memset(samples, 0, len);
+ return 0;
+}
+
+int calc_tone (int16_t * samples, size_t len, int rate, char c) {
  struct tone * ct = NULL;
  int i;
@@ -128 +134 @@
  size_t len;
  char   c;
+ int err;
 
  for (i = 1; i < argc; i++) {
@@ -162 +169 @@
   return 4;
 
- if ( (vss = roar_vs_new_playback(server, name, rate, 1, ROAR_CODEC_DEFAULT, 16, NULL)) == NULL ) {
-  fprintf(stderr, "Error: can not start playback\n");
+ if ( (vss = roar_vs_new_playback(server, name, rate, 1, ROAR_CODEC_DEFAULT, 16, &err)) == NULL ) {
+  fprintf(stderr, "Error: can not start playback: %s\n", roar_vs_strerr(err));
   roar_mm_free(buf);
   return 1;
@@ -171 +178 @@
   tones++;
 
-  if ( c == ' ' || c == '+' || c == '.' || c == '_' )
+  if ( c == '+' || c == '.' || c == '_' )
    continue;
 
-  if ( calc(buf, len, rate, c) == -1 ) {
+  if ( c == ' ' ) {
+   calc_break(buf, len, rate, c);
+  } else {
+   if ( calc_tone(buf, len, rate, c) == -1 ) {
+    roar_mm_free(buf);
+    return 5;
+   }
+  }
+  if ( roar_vs_write(vss, buf, len, &err) != (ssize_t)len ) {
+   fprintf(stderr, "Error: can not write data: %s\n", roar_vs_strerr(err));
    roar_mm_free(buf);
    return 5;
   }
-  roar_vs_write(vss, buf, len, NULL);
  }