ready for 0.4.1

Author: karlstav

README.md

@@ -1,7 +1,7 @@
-C.A.V.A. 
+C.A.V.A. (M.P.)
 ====================
 
-**C**onsole-based **A**udio **V**isualizer for **A**LSA (now also with MPD and Pulseaudio support!)
+**C**onsole-based **A**udio **V**isualizer for **A**LSA (**M**PD and **P**ulseaudio)
 
 by [Karl Stavestrand](mailto:[email protected])
 
@@ -141,7 +141,7 @@ All distro specific instalations sources might be out of date.
 Capturing audio
 ---------------
 
-### From Pulseaudio monitor source (New, easy and experimental!)
+### From Pulseaudio monitor source (Easy, default if supported)
 
 First make sure you have installed pulseaudio dev files and that cava has been built with pulseaudio support (it should be automatically if the dev files are found).
 
@@ -152,7 +152,7 @@ If you're lucky all you have to do is to uncomment this line in the config file
 If nothing happens you might have to use a different source then the default. The default might also be your microphone. Look at the config file for help. 
 
 
-### From ALSA-loopback device
+### From ALSA-loopback device (Tricky)
 
 If you want to capture audio straight fom the output (not just mic or line-in), you must create an ALSA loopback interface, then output the audio simultaneously to both the loopback and your normal interface.
 
@@ -311,3 +311,14 @@ By default a configuration file is located in `$XDG_CONFIG_HOME/cava/config` or
     5=0.5
 
 ![3_139](https://cloud.githubusercontent.com/assets/6376571/8670181/9db0ef50-29e8-11e5-81bc-3e2bb9892da0.png)
+
+Thanks
+------
+
+Contributors:
+* [Karl Stavestrand](mailto:[email protected]) - creator
+* [CelestialWalrus](https://github.com/CelestialWalrus)
+* [anko](https://github.com/anko)
+* [livibetter](https://github.com/livibetter)
+
+Also thanks to [dpayne](https://github.com/dpayne/) for figuring out how to find the pulseaudio default sink name.

cava.c

@@ -84,6 +84,7 @@ int bars = 25;
 int autobars = 1;
 int stereo = -1;
 int M = 2048;
+char supportedInput[255] = "'fifo'";
 
 
 
@@ -157,13 +158,22 @@ FILE *fp;
 	// config: parse ini
 	dictionary* ini = iniparser_load(configPath);
 
+	//setting fifo to defaualt if no other input modes supported
+	inputMethod = (char *)iniparser_getstring(ini, "input:method", "fifo"); 
+
+	//setting alsa to defaualt if supported
 	#ifdef ALSA
-		inputMethod = (char *)iniparser_getstring(ini, "input:method", "alsa");
+		strcat(supportedInput,", 'alsa'");
+		inputMethod = (char *)iniparser_getstring(ini, "input:method", "alsa"); 
 	#endif
-	#ifndef ALSA
-		inputMethod = (char *)iniparser_getstring(ini, "input:method", "fifo");
+
+	//setting pulse to defaualt if supported
+	#ifdef PULSE
+		strcat(supportedInput,", 'pulse'");
+		inputMethod = (char *)iniparser_getstring(ini, "input:method", "pulse");
 	#endif
 
+
 	#ifdef NCURSES
 		outputMethod = (char *)iniparser_getstring(ini, "output:method", "ncurses");
 	#endif
@@ -245,23 +255,9 @@ void validate_config()
 
 	}
 	if (im == 0) {
-		#ifdef PULSE
 		fprintf(stderr,
-			"input method '%s' is not supported, supported methods are: 'pulse', 'alsa' and 'fifo'\n",
-						inputMethod);
-		#endif
-		#ifndef PULSE
-		#ifdef ALSA
-		fprintf(stderr,
-			"input method '%s' is not supported, supported methods are: 'alsa' and 'fifo'\n",
-						inputMethod);
-		#endif
-		#endif
-		#ifndef ALSA
-		fprintf(stderr,
-                        "input method '%s' is not supported, supported methods are: 'fifo'\n",
-                                                inputMethod);
-		#endif
+			"input method '%s' is not supported, supported methods are: %s\n",
+						inputMethod, supportedInput);
 		exit(EXIT_FAILURE);
 	}
 

changelog

@@ -1,3 +1,15 @@
+2016-02-10 - 0.4.1
+
+new features:
+- added auto pulseaudio source mode 
+- pulsaudio is now default
+- cava is now cavamp
+- pushing 'r' now reloads audio
+- Added console title
+
+bugfixes:
+- Error on Raspbian at run-time when running from installed path
+
 2015-11-22 - 0.4.0
 
 - added pulseadio support

example_files/config

@@ -34,8 +34,8 @@
 
 [input]
 
-# method of capturing audio, supported input methods are: 'pulse', 'alsa' or 'fifo'.
-# Defaults to 'alsa'
+# method of capturing audio, possible methods are: 'pulse', 'alsa' or 'fifo'.
+# Defaults to 'pulse', 'alsa' or 'fifo', in that order, dependent on what support cava was built with
 #
 # All input methods uses the same config variable 'source' 
 # to define where it should get the audio.
@@ -45,16 +45,15 @@
 # 
 # for alsa 'source' will be the capture device. Default: 'hw:Loopback,1'
 # for fifo 'source' will be the path to fifo-file. Default: '/tmp/mpd.fifo' 
+; method = pulse
+; source = auto
+
 ; method = alsa  
 ; source = hw:Loopback,1 
 
 ; method = fifo
 ; source = /tmp/mpd.fifo
 
-; method = pulse
-; source = auto
-
-
 
 
 [output]