Changeset 1897:1c278dd589fe in roaraudio


Ignore:
Timestamp:
05/25/09 09:32:06 (15 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

set codec to DMX512/MIDI in case of light or midi subsystem is requested and codec was not set. also test if codec gets set via --codec if it was found

Location:
roarclients
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • roarclients/roarcat.c

    r1808 r1897  
    7777   channels = 1; 
    7878  } else if ( !strcmp(k, "--codec") ) { 
    79    codec = roar_str2codec(argv[++i]); 
     79   if ( (codec = roar_str2codec(argv[++i])) == -1 ) { 
     80    fprintf(stderr, "Error: Unknown codec: %s\n", argv[i]); 
     81    return 1; 
     82   } 
    8083 
    8184  } else if ( !strcmp(k, "--wave") ) { 
     
    8386  } else if ( !strcmp(k, "--midi") ) { 
    8487   dir   = ROAR_DIR_MIDI_IN; 
     88   if ( codec == ROAR_CODEC_DEFAULT ) 
     89    codec = ROAR_CODEC_MIDI; 
    8590  } else if ( !strcmp(k, "--light") ) { 
    8691   dir   = ROAR_DIR_LIGHT_IN; 
     92   if ( codec == ROAR_CODEC_DEFAULT ) 
     93    codec = ROAR_CODEC_DMX512; 
    8794 
    8895  } else if ( !strcmp(k, "--help") || !strcmp(k, "-h") ) { 
  • roarclients/roarmon.c

    r1814 r1897  
    8181   channels = 2; 
    8282  } else if ( !strcmp(k, "--codec") ) { 
    83    codec = roar_str2codec(argv[++i]); 
     83   if ( (codec = roar_str2codec(argv[++i])) == -1 ) { 
     84    fprintf(stderr, "Error: Unknown codec: %s\n", argv[i]); 
     85    return 1; 
     86   } 
    8487 
    8588  } else if ( !strcmp(k, "--wave") ) { 
     
    8790  } else if ( !strcmp(k, "--midi") ) { 
    8891   dir   = ROAR_DIR_MIDI_OUT; 
     92   if ( codec == ROAR_CODEC_DEFAULT ) 
     93    codec = ROAR_CODEC_MIDI; 
    8994  } else if ( !strcmp(k, "--light") ) { 
    9095   dir   = ROAR_DIR_LIGHT_OUT; 
     96   if ( codec == ROAR_CODEC_DEFAULT ) 
     97    codec = ROAR_CODEC_DMX512; 
    9198  } else if ( !strcmp(k, "--thru") ) { 
    9299   dir   = ROAR_DIR_THRU; 
Note: See TracChangeset for help on using the changeset viewer.