From 17bcb6d827afce3f44d74cb1b5bfd56c4c456703 Mon Sep 17 00:00:00 2001
From: karlstav <karl@stavestrand.no>
Date: Wed, 10 Jun 2015 21:43:05 +0200
Subject: [PATCH] fix path optarg

---
 cava.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/cava.c b/cava.c
index 5ec7924..6c67dea 100644
--- a/cava.c
+++ b/cava.c
@@ -133,6 +133,8 @@ Options:\n\
 
 	setlocale(LC_ALL, "");
 
+		
+
 
 	for (i = 0; i < M; i++)audio.audio_out[i] = 0;
 
@@ -147,14 +149,17 @@ Options:\n\
   // general: handle command-line arguments
 	while ((c = getopt (argc, argv, "p:i:b:d:s:f:c:C:hSv")) != -1)
 		switch (c) {
-			case 'p': // argument: fifo path
-				audio.source = optarg;
-				break;
 			case 'i': // argument: input method
 				im = 0;
 				inputMethod = optarg;
-				if (strcmp(inputMethod, "alsa") == 0) im = 1;
-				if (strcmp(inputMethod, "fifo") == 0) im = 2;
+				if (strcmp(inputMethod, "alsa") == 0) {
+					im = 1;
+					audio.source =	"/tmp/mpd.fifo";
+				}
+				if (strcmp(inputMethod, "fifo") == 0) {
+					im = 2;
+					audio.source = "hw:1,1";
+				}
 				if (im == 0) {	
 					fprintf(stderr,
 						"input method %s is not supported, supported methods are: 'alsa' and 'fifo'\n",
@@ -162,6 +167,9 @@ Options:\n\
 					exit(EXIT_FAILURE);
 				}
 				break;
+			case 'p': // argument: fifo path
+				audio.source = optarg;
+				break;
 			case 'o': // argument: output method
 				om = 0;
 				outputMethod = optarg;
@@ -246,7 +254,6 @@ Options:\n\
 
 	// input: wait for the input to be ready
 	if (im == 1) {
-		audio.source = "hw:1,1";
 		thr_id = pthread_create(&p_thread, NULL, input_alsa,
 		                        (void *)&audio); //starting alsamusic listener
 		while (audio.format == -1 || audio.rate == 0) {
@@ -270,7 +277,6 @@ Options:\n\
 	}
 
 	if (im == 2) {
-		audio.source =	"/tmp/mpd.fifo";
 		thr_id = pthread_create(&p_thread, NULL, input_fifo,
 		                        (void*)&audio); //starting fifomusic listener
 		audio.rate = 44100;