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

roarclients/roarcatplay.c

@@ -64 +64 @@
 
   if ( strcmp(k, "--server") == 0 || strcmp(k, "-s") == 0 ) {
+   ROAR_CKHAVEARGS(1);
    server = argv[++i];
   } else if ( strcmp(k, "--simple") == 0 ) {
@@ -70 +71 @@
    verbose++;
   } else if ( strcmp(k, "-n") == 0 ) {
+   ROAR_CKHAVEARGS(1);
+   i++;
    roar_debug_option_obsolete(argv[0], "-n", NULL, "Will ignore it for now.");
   } else if ( !strcmp(k, "--rate") || !strcmp(k, "-R") ) {
+   ROAR_CKHAVEARGS(1);
    info.rate = roar_str2rate(argv[++i]);
    auinfo_changed = 1;
   } else if ( !strcmp(k, "--bits") || !strcmp(k, "-B") ) {
+   ROAR_CKHAVEARGS(1);
    info.bits = roar_str2bits(argv[++i]);
    auinfo_changed = 1;
   } else if ( !strcmp(k, "--channels") || !strcmp(k, "--chans") || !strcmp(k, "-C") ) {
+   ROAR_CKHAVEARGS(1);
    info.channels = roar_str2channels(argv[++i]);
    auinfo_changed = 1;
   } else if ( !strcmp(k, "--codec") || !strcmp(k, "-E") ) {
+   ROAR_CKHAVEARGS(1);
    info.codec = roar_str2codec(argv[++i]);
    auinfo_changed = 1;
   } 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));