Changeset 1897:1c278dd589fe in roaraudio for roarclients/roarmon.c

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

File:

• roarclients/roarmon.c (modified) (2 diffs)

roarclients/roarmon.c

@@ -81 +81 @@
    channels = 2;
   } else if ( !strcmp(k, "--codec") ) {
-   codec = roar_str2codec(argv[++i]);
+   if ( (codec = roar_str2codec(argv[++i])) == -1 ) {
+    fprintf(stderr, "Error: Unknown codec: %s\n", argv[i]);
+    return 1;
+   }
 
   } else if ( !strcmp(k, "--wave") ) {
@@ -87 +90 @@
   } else if ( !strcmp(k, "--midi") ) {
    dir   = ROAR_DIR_MIDI_OUT;
+   if ( codec == ROAR_CODEC_DEFAULT )
+    codec = ROAR_CODEC_MIDI;
   } else if ( !strcmp(k, "--light") ) {
    dir   = ROAR_DIR_LIGHT_OUT;
+   if ( codec == ROAR_CODEC_DEFAULT )
+    codec = ROAR_CODEC_DMX512;
   } else if ( !strcmp(k, "--thru") ) {
    dir   = ROAR_DIR_THRU;