Browse Source

Change logging statements for pulseaudio plugin

This removes some useless and annoying logging and on the other
hand bumps the prio on more important ones.
fryshorts 11 years ago
parent
commit
ad9d15c838
2 changed files with 15 additions and 20 deletions
  1. 14 11
      plugins/linux-pulseaudio/pulse-input.c
  2. 1 9
      plugins/linux-pulseaudio/pulse-wrapper.c

+ 14 - 11
plugins/linux-pulseaudio/pulse-input.c

@@ -112,16 +112,14 @@ static void pulse_stream_read(pa_stream *p, size_t nbytes, void *userdata)
 		goto exit;
 		goto exit;
 
 
 	if (!frames) {
 	if (!frames) {
-		blog(LOG_DEBUG,
-			"pulse-input: Got audio hole of %u bytes",
+		blog(LOG_ERROR, "pulse-input: Got audio hole of %u bytes",
 			(unsigned int) bytes);
 			(unsigned int) bytes);
 		pa_stream_drop(data->stream);
 		pa_stream_drop(data->stream);
 		goto exit;
 		goto exit;
 	}
 	}
 
 
 	if (pa_stream_get_time(data->stream, &pa_time) < 0) {
 	if (pa_stream_get_time(data->stream, &pa_time) < 0) {
-		blog(LOG_ERROR,
-			"pulse-input: Failed to get timing info !");
+		blog(LOG_ERROR, "pulse-input: Failed to get timing info !");
 		pa_stream_drop(data->stream);
 		pa_stream_drop(data->stream);
 		goto exit;
 		goto exit;
 	}
 	}
@@ -153,14 +151,19 @@ static void pulse_server_info(pa_context *c, const pa_server_info *i,
 	UNUSED_PARAMETER(c);
 	UNUSED_PARAMETER(c);
 	PULSE_DATA(userdata);
 	PULSE_DATA(userdata);
 
 
+	blog(LOG_INFO, "pulse-input: Server name: '%s %s'",
+		i->server_name, i->server_version);
+
 	data->format          = i->sample_spec.format;
 	data->format          = i->sample_spec.format;
 	data->samples_per_sec = i->sample_spec.rate;
 	data->samples_per_sec = i->sample_spec.rate;
 	data->channels        = i->sample_spec.channels;
 	data->channels        = i->sample_spec.channels;
 
 
-	blog(LOG_DEBUG, "pulse-input: Default format: %s, %u Hz, %u channels",
+	blog(LOG_INFO, "pulse-input: "
+		"Audio format: %s, %u Hz, %u channels with %s timestamps",
 		pa_sample_format_to_string(i->sample_spec.format),
 		pa_sample_format_to_string(i->sample_spec.format),
 		i->sample_spec.rate,
 		i->sample_spec.rate,
-		i->sample_spec.channels);
+		i->sample_spec.channels,
+		(data->ostime) ? "OS" : "PA");
 
 
 	pulse_signal(0);
 	pulse_signal(0);
 }
 }
@@ -186,8 +189,6 @@ static int_fast32_t pulse_start_recording(struct pulse_data *data)
 	}
 	}
 
 
 	data->bytes_per_frame = pa_frame_size(&spec);
 	data->bytes_per_frame = pa_frame_size(&spec);
-	blog(LOG_DEBUG, "pulse-input: %u bytes per frame",
-	     (unsigned int) data->bytes_per_frame);
 
 
 	data->stream = pulse_stream_new(obs_source_getname(data->source),
 	data->stream = pulse_stream_new(obs_source_getname(data->source),
 		&spec, NULL);
 		&spec, NULL);
@@ -223,7 +224,8 @@ static int_fast32_t pulse_start_recording(struct pulse_data *data)
 		return -1;
 		return -1;
 	}
 	}
 
 
-	blog(LOG_DEBUG, "pulse-input: Recording started");
+	blog(LOG_INFO, "pulse-input: Started recording from '%s'",
+		data->device);
 	return 0;
 	return 0;
 }
 }
 
 
@@ -239,6 +241,9 @@ static void pulse_stop_recording(struct pulse_data *data)
 		data->stream = NULL;
 		data->stream = NULL;
 		pulse_unlock();
 		pulse_unlock();
 	}
 	}
+
+	blog(LOG_INFO, "pulse-input: Stopped recording from '%s'",
+		data->device);
 }
 }
 
 
 /**
 /**
@@ -396,8 +401,6 @@ static void pulse_destroy(void *vptr)
 	if (data->device)
 	if (data->device)
 		bfree(data->device);
 		bfree(data->device);
 	bfree(data);
 	bfree(data);
-
-	blog(LOG_DEBUG, "pulse-input: Input destroyed");
 }
 }
 
 
 /**
 /**

+ 1 - 9
plugins/linux-pulseaudio/pulse-wrapper.c

@@ -41,8 +41,6 @@ static void pulse_context_state_changed(pa_context *c, void *userdata)
 	UNUSED_PARAMETER(userdata);
 	UNUSED_PARAMETER(userdata);
 	UNUSED_PARAMETER(c);
 	UNUSED_PARAMETER(c);
 
 
-	blog(LOG_DEBUG, "pulse: context state changed");
-
 	pulse_signal(0);
 	pulse_signal(0);
 }
 }
 
 
@@ -111,8 +109,6 @@ int_fast32_t pulse_init()
 	}
 	}
 
 
 	pulse_refs++;
 	pulse_refs++;
-	blog(LOG_DEBUG, "pulse: Reference count increased to %"PRIuFAST32,
-	     pulse_refs);
 
 
 	pthread_mutex_unlock(&pulse_mutex);
 	pthread_mutex_unlock(&pulse_mutex);
 
 
@@ -123,11 +119,7 @@ void pulse_unref()
 {
 {
 	pthread_mutex_lock(&pulse_mutex);
 	pthread_mutex_lock(&pulse_mutex);
 
 
-	pulse_refs--;
-	blog(LOG_DEBUG, "pulse: Reference count decreased to %"PRIuFAST32,
-	     pulse_refs);
-
-	if (pulse_refs == 0) {
+	if (--pulse_refs == 0) {
 		pulse_lock();
 		pulse_lock();
 		if (pulse_context != NULL) {
 		if (pulse_context != NULL) {
 			pa_context_disconnect(pulse_context);
 			pa_context_disconnect(pulse_context);