Changeset 5950:7fe8f5df7a83 in roaraudio for roarclients/roarmonhttp.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/roarmonhttp.c (modified) (2 diffs)

roarclients/roarmonhttp.c

@@ -268 +268 @@
 #endif
   } else if ( !strcmp(k, "--server") ) {
+   ROAR_CKHAVEARGS(1);
    roar_libroar_set_server(argv[++i]);
   } else if ( !strcmp(k, "--codec") || !strcmp(k, "-E") ) {
+   ROAR_CKHAVEARGS(1);
    info.codec = roar_str2codec(argv[++i]);
   } else if ( !strcmp(k, "--rate") || !strcmp(k, "-r") || !strcmp(k, "-R") ) {
+   ROAR_CKHAVEARGS(1);
    info.rate = roar_str2rate(argv[++i]);
   } else if ( !strcmp(k, "--bits") || !strcmp(k, "-B") ) {
+   ROAR_CKHAVEARGS(1);
    info.bits = roar_str2bits(argv[++i]);
   } else if ( !strcmp(k, "--channels") || !strcmp(k, "--chans") || !strcmp(k, "-C") ) {
+   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));
@@ -283 +289 @@
    }
   } else if ( !strcmp(k, "--rel-id") ) {
+   ROAR_CKHAVEARGS(1);
    rel_id = atoi(argv[++i]);
   } else if ( !strcmp(k, "--help") && !strcmp(k, "-h") ) {