Changeset 5950:7fe8f5df7a83 in roaraudio for roarclients/roarphone.c

Timestamp:

10/20/13 13:52:15 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

code cleanup and again a patch for checking commandlion parameters

File:

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

roarclients/roarphone.c

@@ -432 +432 @@
 
   if ( strcmp(k, "--server") == 0 ) {
+   ROAR_CKHAVEARGS(1);
    server = argv[++i];
   } else if ( strcmp(k, "--jumbo-mtu") == 0 ) {
+   ROAR_CKHAVEARGS(1);
    g_conf.jumbo_mtu = atoi(argv[++i]);
   } else if ( strcmp(k, "--io-flush") == 0 ) {
+   ROAR_CKHAVEARGS(1);
    g_conf.ioflush_interval = atoi(argv[++i]);
   } else if ( strcmp(k, "--rate") == 0 || strcmp(k, "-R") == 0 ) {
+   ROAR_CKHAVEARGS(1);
    info.rate = roar_str2rate(argv[++i]);
   } else if ( strcmp(k, "--bits") == 0 || strcmp(k, "-B") == 0 ) {
+   ROAR_CKHAVEARGS(1);
    info.bits = roar_str2bits(argv[++i]);
   } else if ( strcmp(k, "--channels") == 0 || strcmp(k, "--chans") == 0 || strcmp(k, "-C") == 0 ) {
+   ROAR_CKHAVEARGS(1);
    info.channels = roar_str2channels(argv[++i]);
   } else if ( !strcmp(k, "--aiprofile") ) {
+   ROAR_CKHAVEARGS(1);
    if ( roar_profile2info(&info, argv[++i]) == -1 ) {
     fprintf(stderr, "Error: Can not load audio profile: %s: %s\n", argv[i], roar_error2str(roar_error));
@@ -466 +473 @@
 
   } else if ( strcmp(k, "--codec") == 0 || strcmp(k, "-E") == 0 ) {
+   ROAR_CKHAVEARGS(1);
    info.codec = roar_str2codec(argv[++i]);
 
   } else if ( strcmp(k, "--driver") == 0 ) {
+   ROAR_CKHAVEARGS(1);
    driver = argv[++i];
   } else if ( strcmp(k, "--device") == 0 ) {
+   ROAR_CKHAVEARGS(1);
    device = argv[++i];
   } else if ( strcmp(k, "--antiecho") == 0 ) {
+   ROAR_CKHAVEARGS(1);
    k = argv[++i];
    if ( !strcmp(k, "none") ) {
@@ -487 +498 @@
    }
   } else if ( strcmp(k, "--threshold") == 0 ) {
+   ROAR_CKHAVEARGS(1);
    g_conf.dtx_threshold = atol(argv[++i]);
 
@@ -497 +509 @@
   // META DATA:
   } else if ( strcmp(k, "--m-rn") == 0 ) {
+   ROAR_CKHAVEARGS(1);
    g_meta.rn = argv[++i];
   } else if ( strcmp(k, "--m-nick") == 0 ) {
+   ROAR_CKHAVEARGS(1);
    g_meta.nick = argv[++i];
   } else if ( strcmp(k, "--m-email") == 0 ) {
+   ROAR_CKHAVEARGS(1);
    g_meta.email = argv[++i];
   } else if ( strcmp(k, "--m-hp") == 0 ) {
+   ROAR_CKHAVEARGS(1);
    g_meta.hp = argv[++i];
   } else if ( strcmp(k, "--m-thumbn") == 0 ) {
+   ROAR_CKHAVEARGS(1);
    g_meta.thumbnail = argv[++i];
   } else if ( strcmp(k, "--m-loc") == 0 ) {
+   ROAR_CKHAVEARGS(1);
    g_meta.loc = argv[++i];
   } else if ( strcmp(k, "--m-org") == 0 ) {
+   ROAR_CKHAVEARGS(1);
    g_meta.org = argv[++i];