aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/audio.c37
-rw-r--r--src/output_api.h1
-rw-r--r--src/output_init.c31
-rw-r--r--src/output_thread.c8
4 files changed, 39 insertions, 38 deletions
diff --git a/src/audio.c b/src/audio.c
index 5fb8ab0b9..c95b7f7d5 100644
--- a/src/audio.c
+++ b/src/audio.c
@@ -21,7 +21,6 @@
#include "output_api.h"
#include "output_control.h"
#include "output_internal.h"
-#include "log.h"
#include "path.h"
#include "client.h"
#include "idle.h"
@@ -73,21 +72,21 @@ void initAudioDriver(void)
if (!audio_output_init(output, param)) {
if (param)
{
- FATAL("problems configuring output device "
- "defined at line %i\n", param->line);
+ g_error("problems configuring output device "
+ "defined at line %i\n", param->line);
}
else
{
- FATAL("No audio_output specified and unable to "
- "detect a default audio output device\n");
+ g_error("No audio_output specified and unable to "
+ "detect a default audio output device\n");
}
}
/* require output names to be unique: */
for (j = 0; j < i; j++) {
if (!strcmp(output->name, audioOutputArray[j].name)) {
- FATAL("output devices with identical "
- "names: %s\n", output->name);
+ g_error("output devices with identical "
+ "names: %s\n", output->name);
}
}
}
@@ -109,8 +108,8 @@ void initAudioConfig(void)
return;
if (0 != parseAudioConfig(&configured_audio_format, param->value)) {
- FATAL("error parsing \"%s\" at line %i\n",
- CONF_AUDIO_OUTPUT_FORMAT, param->line);
+ g_error("error parsing \"%s\" at line %i\n",
+ CONF_AUDIO_OUTPUT_FORMAT, param->line);
}
}
@@ -123,34 +122,34 @@ int parseAudioConfig(struct audio_format *audioFormat, char *conf)
audioFormat->sample_rate = strtol(conf, &test, 10);
if (*test != ':') {
- ERROR("error parsing audio output format: %s\n", conf);
+ g_warning("error parsing audio output format: %s\n", conf);
return -1;
}
if (audioFormat->sample_rate <= 0) {
- ERROR("sample rate %u is not >= 0\n",
- audioFormat->sample_rate);
+ g_warning("sample rate %u is not >= 0\n",
+ audioFormat->sample_rate);
return -1;
}
audioFormat->bits = (uint8_t)strtoul(test + 1, &test, 10);
if (*test != ':') {
- ERROR("error parsing audio output format: %s\n", conf);
+ g_warning("error parsing audio output format: %s\n", conf);
return -1;
}
if (audioFormat->bits != 16 && audioFormat->bits != 24 &&
audioFormat->bits != 8) {
- ERROR("bits %u can not be used for audio output\n",
- audioFormat->bits);
+ g_warning("bits %u can not be used for audio output\n",
+ audioFormat->bits);
return -1;
}
audioFormat->channels = (uint8_t)strtoul(test + 1, &test, 10);
if (*test != '\0') {
- ERROR("error parsing audio output format: %s\n", conf);
+ g_warning("error parsing audio output format: %s\n", conf);
return -1;
}
@@ -159,8 +158,8 @@ int parseAudioConfig(struct audio_format *audioFormat, char *conf)
case 2:
break;
default:
- ERROR("channels %i can not be used for audio output\n",
- (int)audioFormat->channels);
+ g_warning("channels %u can not be used for audio output\n",
+ audioFormat->channels);
return -1;
}
@@ -418,7 +417,7 @@ void readAudioDevicesState(FILE *fp)
continue;
errline:
/* nonfatal */
- ERROR("invalid line in state_file: %s\n", buffer);
+ g_warning("invalid line in state_file: %s\n", buffer);
}
}
diff --git a/src/output_api.h b/src/output_api.h
index 9d4df7f37..7cefea77e 100644
--- a/src/output_api.h
+++ b/src/output_api.h
@@ -24,7 +24,6 @@
#include "audio_format.h"
#include "tag.h"
#include "conf.h"
-#include "log.h"
#include <stdbool.h>
diff --git a/src/output_init.c b/src/output_init.c
index 89853ff9e..bdd2b1eb6 100644
--- a/src/output_init.c
+++ b/src/output_init.c
@@ -20,9 +20,10 @@
#include "output_api.h"
#include "output_internal.h"
#include "output_list.h"
-#include "log.h"
#include "audio.h"
+#include <glib.h>
+
#define AUDIO_OUTPUT_TYPE "type"
#define AUDIO_OUTPUT_NAME "name"
#define AUDIO_OUTPUT_FORMAT "format"
@@ -30,9 +31,9 @@
#define getBlockParam(name, str, force) { \
bp = getBlockParam(param, name); \
if(force && bp == NULL) { \
- FATAL("couldn't find parameter \"%s\" in audio output " \
- "definition beginning at %i\n", \
- name, param->line); \
+ g_error("couldn't find parameter \"%s\" in audio output " \
+ "definition beginning at %i\n", \
+ name, param->line); \
} \
if(bp) str = bp->value; \
}
@@ -53,30 +54,30 @@ int audio_output_init(struct audio_output *ao, ConfigParam * param)
plugin = audio_output_plugin_get(type);
if (plugin == NULL) {
- FATAL("couldn't find audio output plugin for type "
- "\"%s\" at line %i\n", type, param->line);
+ g_error("couldn't find audio output plugin for type "
+ "\"%s\" at line %i\n", type, param->line);
}
} else {
unsigned i;
- WARNING("No \"%s\" defined in config file\n",
- CONF_AUDIO_OUTPUT);
- WARNING("Attempt to detect audio output device\n");
+ g_warning("No \"%s\" defined in config file\n",
+ CONF_AUDIO_OUTPUT);
+ g_warning("Attempt to detect audio output device\n");
audio_output_plugins_for_each(plugin, i) {
if (plugin->test_default_device) {
- WARNING("Attempting to detect a %s audio "
- "device\n", plugin->name);
+ g_warning("Attempting to detect a %s audio "
+ "device\n", plugin->name);
if (plugin->test_default_device()) {
- WARNING("Successfully detected a %s "
- "audio device\n", plugin->name);
+ g_warning("Successfully detected a %s "
+ "audio device\n", plugin->name);
break;
}
}
}
if (plugin == NULL) {
- WARNING("Unable to detect an audio device\n");
+ g_warning("Unable to detect an audio device\n");
return 0;
}
@@ -96,7 +97,7 @@ int audio_output_init(struct audio_output *ao, ConfigParam * param)
if (format) {
if (0 != parseAudioConfig(&ao->reqAudioFormat, format)) {
- FATAL("error parsing format at line %i\n", bp->line);
+ g_error("error parsing format at line %i\n", bp->line);
}
} else
audio_format_clear(&ao->reqAudioFormat);
diff --git a/src/output_thread.c b/src/output_thread.c
index 45acdd55f..b65a601a3 100644
--- a/src/output_thread.c
+++ b/src/output_thread.c
@@ -19,9 +19,11 @@
#include "output_thread.h"
#include "output_api.h"
#include "output_internal.h"
-#include "utils.h"
+#include <glib.h>
#include <assert.h>
+#include <stdlib.h>
+#include <errno.h>
enum {
/** after a failure, wait this number of seconds before
@@ -46,7 +48,7 @@ static void convertAudioFormat(struct audio_output *audioOutput,
if (size > audioOutput->convBufferLen) {
if (audioOutput->convBuffer != NULL)
free(audioOutput->convBuffer);
- audioOutput->convBuffer = xmalloc(size);
+ audioOutput->convBuffer = g_malloc(size);
audioOutput->convBufferLen = size;
}
@@ -164,5 +166,5 @@ void audio_output_thread_start(struct audio_output *ao)
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
if (pthread_create(&ao->thread, &attr, audio_output_task, ao))
- FATAL("Failed to spawn output task: %s\n", strerror(errno));
+ g_error("Failed to spawn output task: %s\n", strerror(errno));
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 01:44:51 +0000