added auto pulseaudio source mode

setting source to 'auto' (also the default pulse source now)
automatically finds the monitor interface of the defualt sink
this will in most cases be most usefull
people who has manualy specified the old default value: 'defualt'
will now get an error message.

Author: karlstav

cava.c

@@ -75,7 +75,7 @@ double smoothDef[64] = {0.8, 0.8, 1, 1, 0.8, 0.8, 1, 0.8, 0.8, 1, 1, 0.8,
 double *smooth = smoothDef;
 int smcount = 64;
 struct audio_data audio;
-int im = 1;
+int im = 0;
 int om = 1;
 int mode = 1;
 int col = 6;
@@ -211,7 +211,7 @@ FILE *fp;
 	}
 	if (strcmp(inputMethod, "pulse") == 0) {
 		im = 3;
-		audio.source = (char *)iniparser_getstring(ini, "input:source", NULL);
+		audio.source = (char *)iniparser_getstring(ini, "input:source", "auto");
 	}
 
 }
@@ -234,6 +234,9 @@ void validate_config()
 	}
 	if (strcmp(inputMethod, "pulse") == 0) {
 		im = 3;
+		#ifdef PULSE
+			if (strcmp(audio.source, "auto") == 0) getPulseDefaultSink((void*)&audio);
+                #endif
 		#ifndef PULSE
 		        fprintf(stderr,
                                 "cava was built without pulseaudio support, install pulseaudio dev files and run make clean && ./configure && make again\n");
@@ -242,21 +245,28 @@ 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",
+			"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",
+                        "input method '%s' is not supported, supported methods are: 'fifo'\n",
                                                 inputMethod);
 		#endif
 		exit(EXIT_FAILURE);
 	}
 
 	// validate: output method
-	if (strcmp(outputMethod, "ncurses") == 0) { 
+	if (strcmp(outputMethod, "ncurses") == 0) {
 		om = 1;
 		#ifndef NCURSES
 			fprintf(stderr,
@@ -392,7 +402,7 @@ static bool directory_exists(const char * path) {
 
 #endif
 
-int * separate_freq_bands(fftw_complex out[M / 2 + 1][2], int bars, int lcf[200], int hcf[200], float k[200], int channel) { 
+int * separate_freq_bands(fftw_complex out[M / 2 + 1][2], int bars, int lcf[200], int hcf[200], float k[200], int channel) {
 	int o,i;
 	float peak[201];
 	static int fl[200];
@@ -475,7 +485,7 @@ int main(int argc, char **argv)
 
 	// general: define variables
 	pthread_t  p_thread;
-	int        thr_id GCC_UNUSED;
+	int thr_id GCC_UNUSED;
 	int modes = 3; // amount of smoothing modes
 	float fc[200];
 	float fre[200];

example_files/config

@@ -37,11 +37,11 @@
 # method of capturing audio, supported input methods are: 'pulse', 'alsa' or 'fifo'.
 # Defaults to 'alsa'
 #
-# for pulseaudio 'source' wil be the source. Default: 'NULL', which uses system default source
-# all pulseaudio sinks(outputs) have 'monitor' sources(inputs) associated with them
-# but the default, might be your microphone, try the command 'pacmd list-sources' to find the right one
-# you can change source here to the name of your prefered device, or cahnge your default pulseaudio source by running
-# 'pacmd set-default-source NAME|#N'
+# All input methods uses the same config variable 'source' 
+# to define where it should get the audio.
+#
+# for pulseaudio 'source' wil be the source. Default: 'auto', which uses the monitor source of the default sink
+# (all pulseaudio sinks(outputs) have 'monitor' sources(inputs) associated with them)
 # 
 # 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' 
@@ -52,7 +52,7 @@
 ; source = /tmp/mpd.fifo
 
 ; method = pulse
-; source = NULL
+; source = auto
 
 
 

input/fifo.c

@@ -4,7 +4,7 @@ struct audio_data {
         int audio_out_l[2048];
         int format;
         unsigned int rate ;
-        char *source; //alsa device, fifo path or pulse source
+        char *source ; //alsa device, fifo path or pulse source
         int im; //input mode alsa, fifo or pulse
         int channels;
 	int terminate; // shared variable used to terminate audio thread

input/pulse.c

@@ -4,15 +4,97 @@
 #include <errno.h>
 #include <pulse/simple.h>
 #include <pulse/error.h>
+#include <pulse/pulseaudio.h>
 #define BUFSIZE 1024
 
+void getPulseDefaultSink(void* data) {
+
+        struct audio_data *audio = (struct audio_data *)data;
+	pa_mainloop_api *mainloop_api;
+	pa_context *pulseaudio_context;
+	pa_mainloop *m_pulseaudio_mainloop;
+	int ret;
+
+
+	void cb(__attribute__((unused)) pa_context *pulseaudio_context,const pa_server_info *i,__attribute__((unused)) void *userdata){
+
+		//getting default sink name
+		audio->source = malloc(sizeof(char) * 1024);
+		strcpy(audio->source,i->default_sink_name);
+
+		//appending .monitor suufix
+		audio->source = strcat(audio->source, ".monitor");
+
+		//quiting mainloop
+		pa_mainloop_quit(m_pulseaudio_mainloop, 0);
+	}
+
+
+	void pulseaudio_context_state_callback(__attribute__((unused)) pa_context *c,
+                                                      void *userdata) {
+
+		//make sure loop is ready	
+		switch (pa_context_get_state(pulseaudio_context))
+		{
+		case PA_CONTEXT_UNCONNECTED:
+		//printf("UNCONNECTED\n");
+		break;
+		case PA_CONTEXT_CONNECTING:
+		//printf("CONNECTING\n");
+		break;
+		case PA_CONTEXT_AUTHORIZING:
+		//printf("AUTHORIZING\n");
+		break;
+		case PA_CONTEXT_SETTING_NAME:
+		//printf("ETTING_NAM\n");
+		break;
+		case PA_CONTEXT_READY://extract default sink name
+		//printf("READY\n");
+		pa_operation_unref(pa_context_get_server_info(
+		pulseaudio_context, cb, userdata));
+		break;
+		case PA_CONTEXT_FAILED:
+		//printf("FAILED\n");
+		break;
+		case PA_CONTEXT_TERMINATED:
+		//printf("TERMINATED\n");
+		break;	  
+		}
+	}
+
+
+
+	// Create a mainloop API and connection to the default server
+	m_pulseaudio_mainloop = pa_mainloop_new();
+
+	mainloop_api = pa_mainloop_get_api(m_pulseaudio_mainloop);
+	pulseaudio_context = pa_context_new(mainloop_api, "cava device list");
+
+	// This function connects to the pulse server
+	pa_context_connect(pulseaudio_context, NULL, PA_CONTEXT_NOFLAGS,
+			       NULL);
+
+
+	//This function defines a callback so the server will tell us its state.
+	pa_context_set_state_callback(pulseaudio_context,
+			                  pulseaudio_context_state_callback,
+			                  NULL);
+
+	//starting a mainloop to get default sink
+	if (pa_mainloop_run(m_pulseaudio_mainloop, &ret) < 0)
+	{
+	printf("Could not open pulseaudio mainloop to "
+			                  "find default device name: %d",
+		   ret);
+	}
+
+}
+
 void* input_pulse(void* data)
 {
 
         struct audio_data *audio = (struct audio_data *)data;
-        
         int i, n;
-
 	int16_t buf[BUFSIZE / 2];
 
 	/* The sample type to use */
@@ -29,8 +111,7 @@ void* input_pulse(void* data)
 	pa_simple *s = NULL;	
 	int error;
 
-	/* Create the recording stream   */
-	if (!(s = pa_simple_new(NULL, "cava", PA_STREAM_RECORD, audio-> source, "audio for cava", &ss, NULL, &pb, &error))) {
+	if (!(s = pa_simple_new(NULL, "cava", PA_STREAM_RECORD, audio->source, "audio for cava", &ss, NULL, &pb, &error))) {
 		fprintf(stderr, __FILE__": Could not open pulseaudio source: %s, %s. To find a list of your pulseaudio sources run 'pacmd list-sources'\n",audio->source, pa_strerror(error));
 		exit(EXIT_FAILURE);
 	}

input/pulse.h

@@ -1,4 +1,5 @@
 //header file for pulse, part of cava.
 
 void* input_pulse(void* data);
+void getPulseDefaultSink();