cleanup for switching between inputs

emmettbutler · May 17, 2013 · b4cccb9 · b4cccb9
1 parent 60ccf66
commit b4cccb9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Visualizer.cpp b/Visualizer.cpp
@@ -19,7 +19,7 @@
 extern Packet *sharedBuffer;
 extern bool finished;
 const char simpleArgs[] = {'c', 't', 'm', 'h'};
-const char compoundArgs[] = {'w', 's', 'r'};
+const char compoundArgs[] = {'f', 'w', 's', 'r'};
 ArgMapper mapper;
 
 void printUsage(const char *name){
@@ -80,7 +80,8 @@ int main(int argc, char *argv[]){
 
     processArgs(argc, argv);
 
-    if (!startAudio(stream, argv[1], mapper.getCompoundArg('w').c_str())){
+    if (!startAudio(stream, mapper.getCompoundArg('f').c_str(),
+                    mapper.getCompoundArg('w').c_str())){
         exit(1);
     }
 

diff --git a/audio_helper.cpp b/audio_helper.cpp
@@ -105,11 +105,12 @@ bool printError(PaError error, string msg){
 //open and start the audio stream - takes stream, callback function, and userdata
 bool startAudio(PaStream *stream, const char* filename, const char* windowname){
 
-    InputSource inputSource = filename == NULL ? Mic : File;
+    InputSource inputSource = strcasecmp(filename, "") == 0 ? Mic : File;
     int samplerate = SAMPLE_RATE; //default if no file specified
 
     //open file if we're not using Mic
     if (inputSource == File){
+        printf("Reading from file %s\n", filename);
         if ((sf.file = sf_open(filename, SFM_READ, &sf.info) ) == NULL) {
             printf("Error opening file '%s' (see manual for accepted formats)\n", filename);
             return false;
@@ -120,6 +121,8 @@ bool startAudio(PaStream *stream, const char* filename, const char* windowname){
             return false;
         }
         samplerate = sf.info.samplerate;
+    } else {
+        printf("Reading from default input\n");
     }
 
     //port audio init stuff