From ac32d6f03bd54b5a87ceb36b48832501c034ff51 Mon Sep 17 00:00:00 2001 From: "Alfred E. Heggestad" Date: Sat, 12 Apr 2014 21:19:28 +0200 Subject: modules: use new logging functions --- modules/amr/amr.c | 9 +-------- modules/evdev/evdev.c | 25 ++++++------------------- modules/evdev/print.c | 13 ++++--------- modules/g722/g722.c | 13 +------------ modules/gst/gst.c | 40 ++++++++++++++++------------------------ modules/opensles/player.c | 7 +------ modules/opensles/recorder.c | 19 +++++-------------- modules/quicktime/quicktime.c | 5 ----- modules/winwave/play.c | 12 ++++-------- modules/winwave/src.c | 11 +++-------- modules/winwave/winwave.c | 5 ----- 11 files changed, 41 insertions(+), 118 deletions(-) diff --git a/modules/amr/amr.c b/modules/amr/amr.c index 3b29788..1e698d1 100644 --- a/modules/amr/amr.c +++ b/modules/amr/amr.c @@ -19,11 +19,6 @@ #include -#define DEBUG_MODULE "amr" -#define DEBUG_LEVEL 5 -#include - - #ifdef VO_AMRWBENC_ENC_IF_H #define IF2E_IF_encode E_IF_encode #define IF2D_IF_decode D_IF_decode @@ -215,10 +210,8 @@ static int encode_wb(struct auenc_state *st, uint8_t *buf, size_t *len, return ENOMEM; n = IF2E_IF_encode(st->enc, 8, sampv, buf, 0); - if (n <= 0) { - DEBUG_WARNING("encode error: %d\n", n); + if (n <= 0) return EPROTO; - } *len = n; diff --git a/modules/evdev/evdev.c b/modules/evdev/evdev.c index e54ba6b..ba924f4 100644 --- a/modules/evdev/evdev.c +++ b/modules/evdev/evdev.c @@ -14,11 +14,6 @@ #include "print.h" -#define DEBUG_MODULE "evdev" -#define DEBUG_LEVEL 5 -#include - - /* Note: * * KEY_NUMERIC_xyz added in linux kernel 2.6.28 @@ -186,29 +181,21 @@ static void evdev_fd_handler(int flags, void *arg) /* This might happen if you unplug a USB device */ if (flags & FD_EXCEPT) { - DEBUG_WARNING("fd handler: FD_EXCEPT - device unplugged?\n"); + warning("evdev: fd handler: FD_EXCEPT - device unplugged?\n"); evdev_close(st); return; } - if (FD_READ != flags) { - DEBUG_WARNING("fd_handler: unexpected flags 0x%02x\n", flags); - return; - } - n = read(st->fd, evv, sizeof(evv)); if (n < (int) sizeof(struct input_event)) { - DEBUG_WARNING("event: short read (%m)\n", errno); + warning("evdev: event: short read (%m)\n", errno); return; } for (i = 0; i < (int) (n / sizeof(struct input_event)); i++) { const struct input_event *ev = &evv[i]; - DEBUG_INFO("Event: type %u, code %u, value %d\n", - ev->type, ev->code, ev->value); - if (EV_KEY != ev->type) continue; @@ -220,8 +207,8 @@ static void evdev_fd_handler(int flags, void *arg) if (1 == ev->value) { const int ascii = code2ascii(modifier, ev->code); if (-1 == ascii) { - DEBUG_WARNING("unhandled key code %u\n", - ev->code); + warning("evdev: unhandled key code %u\n", + ev->code); } else reportkey(st, ascii); @@ -259,7 +246,7 @@ static int evdev_alloc(struct ui_st **stp, struct ui_prm *prm, /* grab the event device to prevent it from propagating its events to the regular keyboard driver */ if (-1 == ioctl(st->fd, EVIOCGRAB, (void *)1)) { - DEBUG_WARNING("ioctl EVIOCGRAB on %s (%m)\n", dev, errno); + warning("evdev: ioctl EVIOCGRAB on %s (%m)\n", dev, errno); } #endif @@ -296,7 +283,7 @@ static int buzz(const struct ui_st *st, int value) n = write(st->fd, &ev, sizeof(ev)); if (n < 0) { - DEBUG_WARNING("output: write fd=%d (%m)\n", st->fd, errno); + warning("evdev: output: write fd=%d (%m)\n", st->fd, errno); } return errno; diff --git a/modules/evdev/print.c b/modules/evdev/print.c index 3e2b762..4c6cc77 100644 --- a/modules/evdev/print.c +++ b/modules/evdev/print.c @@ -10,16 +10,11 @@ #include #include #include -#include -#include +#include +#include #include "print.h" -#define DEBUG_MODULE "evdev" -#define DEBUG_LEVEL 5 -#include - - #define test_bit(bit, array) (array[bit/8] & (1<<(bit%8))) @@ -36,7 +31,7 @@ void print_name(int fd) perror("evdev ioctl"); } - DEBUG_NOTICE("evdev device name: %s\n", name); + info("evdev: device name: %s\n", name); } @@ -52,7 +47,7 @@ void print_events(int fd) memset(evtype_bitmask, 0, sizeof(evtype_bitmask)); if (ioctl(fd, EVIOCGBIT(0, EV_MAX), evtype_bitmask) < 0) { - DEBUG_WARNING("evdev ioctl EVIOCGBIT (%m)\n", errno); + warning("evdev: ioctl EVIOCGBIT (%m)\n", errno); return; } diff --git a/modules/g722/g722.c b/modules/g722/g722.c index 5e07e3a..e68b7bd 100644 --- a/modules/g722/g722.c +++ b/modules/g722/g722.c @@ -12,11 +12,6 @@ #include -#define DEBUG_MODULE "g722" -#define DEBUG_LEVEL 5 -#include - - /* http://www.soft-switch.org/spandsp-modules.html */ @@ -76,7 +71,6 @@ static int encode_update(struct auenc_state **aesp, return ENOMEM; if (!g722_encode_init(&st->enc, G722_BITRATE_64k, 0)) { - DEBUG_WARNING("g722_encode_init failed\n"); err = EPROTO; goto out; } @@ -109,7 +103,6 @@ static int decode_update(struct audec_state **adsp, return ENOMEM; if (!g722_decode_init(&st->dec, G722_BITRATE_64k, 0)) { - DEBUG_WARNING("g722_decode_init failed\n"); err = EPROTO; goto out; } @@ -131,11 +124,9 @@ static int encode(struct auenc_state *st, uint8_t *buf, size_t *len, n = g722_encode(&st->enc, buf, sampv, (int)sampc); if (n <= 0) { - DEBUG_WARNING("g722_encode: len=%d\n", n); return EPROTO; } else if (n > (int)*len) { - DEBUG_WARNING("encode: wrote %d > %d buf\n", n, *len); return EOVERFLOW; } @@ -154,10 +145,8 @@ static int decode(struct audec_state *st, int16_t *sampv, size_t *sampc, return EINVAL; n = g722_decode(&st->dec, sampv, buf, (int)len); - if (n < 0) { - DEBUG_WARNING("g722_decode: n=%d\n", n); + if (n < 0) return EPROTO; - } *sampc = n; diff --git a/modules/gst/gst.c b/modules/gst/gst.c index aefd9de..301fe93 100644 --- a/modules/gst/gst.c +++ b/modules/gst/gst.c @@ -15,11 +15,6 @@ #include "gst.h" -#define DEBUG_MODULE "gst" -#define DEBUG_LEVEL 5 -#include - - /** * Defines the Gstreamer state * @@ -62,7 +57,6 @@ static void *thread(void *arg) struct ausrc_st *st = arg; /* Now set to playing and iterate. */ - DEBUG_NOTICE("Setting pipeline to PLAYING\n"); gst_element_set_state(st->pipeline, GST_STATE_PLAYING); while (st->run) { @@ -87,8 +81,6 @@ static gboolean bus_watch_handler(GstBus *bus, GstMessage *msg, gpointer data) switch (GST_MESSAGE_TYPE(msg)) { case GST_MESSAGE_EOS: - DEBUG_NOTICE("End-of-stream\n"); - /* XXX decrementing repeat count? */ /* Re-start stream */ @@ -104,9 +96,9 @@ static gboolean bus_watch_handler(GstBus *bus, GstMessage *msg, gpointer data) case GST_MESSAGE_ERROR: gst_message_parse_error(msg, &err, &d); - DEBUG_WARNING("Error: %d(%m) message=%s\n", err->code, - err->code, err->message); - DEBUG_WARNING("Debug: %s\n", d); + warning("gst: Error: %d(%m) message=%s\n", err->code, + err->code, err->message); + warning("gst: Debug: %s\n", d); g_free(d); @@ -124,7 +116,7 @@ static gboolean bus_watch_handler(GstBus *bus, GstMessage *msg, gpointer data) gst_message_parse_tag(msg, &tag_list); if (gst_tag_list_get_string(tag_list, GST_TAG_TITLE, &title)) { - DEBUG_NOTICE("Title: %s\n", title); + info("gst: title: %s\n", title); g_free(title); } break; @@ -151,18 +143,18 @@ static void format_check(struct ausrc_st *st, GstStructure *s) gst_structure_get_boolean(s, "signed", &sign); if ((int)st->prm.srate != rate) { - DEBUG_WARNING("expected %u Hz (got %u Hz)\n", st->prm.srate, - rate); + warning("gst: expected %u Hz (got %u Hz)\n", st->prm.srate, + rate); } if (st->prm.ch != channels) { - DEBUG_WARNING("expected %d channels (got %d)\n", - st->prm.ch, channels); + warning("gst: expected %d channels (got %d)\n", + st->prm.ch, channels); } if (16 != width) { - DEBUG_WARNING("expected 16-bit width (got %d)\n", width); + warning("gst: expected 16-bit width (got %d)\n", width); } if (!sign) { - DEBUG_WARNING("expected signed 16-bit format\n"); + warning("gst: expected signed 16-bit format\n"); } } @@ -196,7 +188,7 @@ static void packet_handler(struct ausrc_st *st, GstBuffer *buffer) err = aubuf_write(st->aubuf, GST_BUFFER_DATA(buffer), GST_BUFFER_SIZE(buffer)); if (err) { - DEBUG_WARNING("aubuf_write: %m\n", err); + warning("gst: aubuf_write: %m\n", err); } /* Empty buffer now */ @@ -275,7 +267,7 @@ static int gst_setup(struct ausrc_st *st) st->pipeline = gst_pipeline_new("pipeline"); if (!st->pipeline) { - DEBUG_WARNING("failed to create pipeline element\n"); + warning("gst: failed to create pipeline element\n"); return ENOMEM; } @@ -283,7 +275,7 @@ static int gst_setup(struct ausrc_st *st) st->source = gst_element_factory_make("playbin", "source"); if (!st->source) { - DEBUG_WARNING("failed to create playbin source element\n"); + warning("gst: failed to create playbin source element\n"); return ENOMEM; } @@ -293,7 +285,7 @@ static int gst_setup(struct ausrc_st *st) st->capsfilt = gst_element_factory_make("capsfilter", NULL); if (!st->capsfilt) { - DEBUG_WARNING("failed to create capsfilter element\n"); + warning("gst: failed to create capsfilter element\n"); return ENOMEM; } @@ -301,7 +293,7 @@ static int gst_setup(struct ausrc_st *st) st->sink = gst_element_factory_make("fakesink", "sink"); if (!st->sink) { - DEBUG_WARNING("failed to create sink element\n"); + warning("gst: failed to create sink element\n"); return ENOMEM; } @@ -422,7 +414,7 @@ static int mod_gst_init(void) s = gst_version_string(); - DEBUG_NOTICE("init: %s\n", s); + info("gst: init: %s\n", s); g_free(s); diff --git a/modules/opensles/player.c b/modules/opensles/player.c index b9c9b68..c899750 100644 --- a/modules/opensles/player.c +++ b/modules/opensles/player.c @@ -10,11 +10,6 @@ #include "opensles.h" -#define DEBUG_MODULE "opensles/player" -#define DEBUG_LEVEL 5 -#include - - struct auplay_st { struct auplay *ap; /* inheritance */ int16_t *sampv; @@ -99,7 +94,7 @@ static int createPlayer(struct auplay_st *st, struct auplay_prm *prm) &audioSrc, &audioSnk, ARRAY_SIZE(ids), ids, req); if (SL_RESULT_SUCCESS != r) { - DEBUG_WARNING("CreateAudioPlayer error: r = %d\n", r); + warning("opensles: CreateAudioPlayer error: r = %d\n", r); return ENODEV; } diff --git a/modules/opensles/recorder.c b/modules/opensles/recorder.c index 4e1e6c7..6706428 100644 --- a/modules/opensles/recorder.c +++ b/modules/opensles/recorder.c @@ -11,11 +11,6 @@ #include "opensles.h" -#define DEBUG_MODULE "opensles/recorder" -#define DEBUG_LEVEL 5 -#include - - struct ausrc_st { struct ausrc *as; /* inheritance */ int16_t *sampv; @@ -74,7 +69,7 @@ static void *record_thread(void *arg) st->sampv, st->sampc * 2); if (r != SL_RESULT_SUCCESS) { - DEBUG_WARNING("Enqueue: r = %d\n", r); + warning("opensles: Enqueue: r = %d\n", r); } ts += st->ptime; @@ -120,15 +115,13 @@ static int createAudioRecorder(struct ausrc_st *st, struct ausrc_prm *prm) &audioSrc, &audioSnk, 1, id, req); if (SL_RESULT_SUCCESS != r) { - DEBUG_WARNING("CreateAudioRecorder failed: r = %d\n", r); + warning("opensles: CreateAudioRecorder failed: r = %d\n", r); return ENODEV; } r = (*st->recObject)->Realize(st->recObject, SL_BOOLEAN_FALSE); - if (SL_RESULT_SUCCESS != r) { - DEBUG_WARNING("recorder: Realize r = %d\n", r); + if (SL_RESULT_SUCCESS != r) return ENODEV; - } r = (*st->recObject)->GetInterface(st->recObject, SL_IID_RECORD, &st->recRecord); @@ -206,14 +199,12 @@ int opensles_recorder_alloc(struct ausrc_st **stp, struct ausrc *as, } err = createAudioRecorder(st, prm); - if (err) { - DEBUG_WARNING("failed to create recorder\n"); + if (err) goto out; - } err = startRecording(st); if (err) { - DEBUG_WARNING("failed to start recorder\n"); + warning("opensles: failed to start recorder\n"); goto out; } diff --git a/modules/quicktime/quicktime.c b/modules/quicktime/quicktime.c index ad746a0..85d47eb 100644 --- a/modules/quicktime/quicktime.c +++ b/modules/quicktime/quicktime.c @@ -11,11 +11,6 @@ #include -#define DEBUG_MODULE "quicktime" -#define DEBUG_LEVEL 5 -#include - - struct vidsrc_st { struct vidsrc *vs; /* inheritance */ pthread_t thread; diff --git a/modules/winwave/play.c b/modules/winwave/play.c index 29568ba..fb99a44 100644 --- a/modules/winwave/play.c +++ b/modules/winwave/play.c @@ -11,11 +11,6 @@ #include "winwave.h" -#define DEBUG_MODULE "winwave" -#define DEBUG_LEVEL 5 -#include - - #define WRITE_BUFFERS 4 #define INC_WPOS(a) ((a) = (((a) + 1) % WRITE_BUFFERS)) @@ -88,7 +83,8 @@ static int dsp_write(struct auplay_st *st) res = waveOutWrite(st->waveout, wh, sizeof(*wh)); if (res != MMSYSERR_NOERROR) - DEBUG_WARNING("dsp_write: waveOutWrite: failed: %08x\n", res); + warning("winwave: dsp_write: waveOutWrite: failed: %08x\n", + res); else st->inuse++; @@ -165,7 +161,7 @@ static int write_stream_open(struct auplay_st *st, (DWORD_PTR) st, CALLBACK_FUNCTION | WAVE_FORMAT_DIRECT); if (res != MMSYSERR_NOERROR) { - DEBUG_WARNING("waveOutOpen: failed %d\n", res); + warning("winwave: waveOutOpen: failed %d\n", res); return EINVAL; } waveOutClose(st->waveout); @@ -174,7 +170,7 @@ static int write_stream_open(struct auplay_st *st, (DWORD_PTR) st, CALLBACK_FUNCTION | WAVE_FORMAT_DIRECT); if (res != MMSYSERR_NOERROR) { - DEBUG_WARNING("waveOutOpen: failed %d\n", res); + warning("winwave: waveOutOpen: failed %d\n", res); return EINVAL; } diff --git a/modules/winwave/src.c b/modules/winwave/src.c index 9d23c1e..39abfed 100644 --- a/modules/winwave/src.c +++ b/modules/winwave/src.c @@ -11,11 +11,6 @@ #include "winwave.h" -#define DEBUG_MODULE "winwave" -#define DEBUG_LEVEL 5 -#include - - #define READ_BUFFERS 4 #define INC_RPOS(a) ((a) = (((a) + 1) % READ_BUFFERS)) @@ -68,8 +63,8 @@ static int add_wave_in(struct ausrc_st *st) waveInPrepareHeader(st->wavein, wh, sizeof(*wh)); res = waveInAddBuffer(st->wavein, wh, sizeof(*wh)); if (res != MMSYSERR_NOERROR) { - DEBUG_WARNING("add_wave_in: waveInAddBuffer fail: %08x\n", - res); + warning("winwave: add_wave_in: waveInAddBuffer fail: %08x\n", + res); return ENOMEM; } @@ -156,7 +151,7 @@ static int read_stream_open(struct ausrc_st *st, const struct ausrc_prm *prm) (DWORD_PTR) st, CALLBACK_FUNCTION | WAVE_FORMAT_DIRECT); if (res != MMSYSERR_NOERROR) { - DEBUG_WARNING("waveInOpen: failed %d\n", err); + warning("winwave: waveInOpen: failed %d\n", err); return EINVAL; } diff --git a/modules/winwave/winwave.c b/modules/winwave/winwave.c index 141fbfc..279c73b 100644 --- a/modules/winwave/winwave.c +++ b/modules/winwave/winwave.c @@ -11,11 +11,6 @@ #include "winwave.h" -#define DEBUG_MODULE "winwave" -#define DEBUG_LEVEL 5 -#include - - static struct ausrc *ausrc; static struct auplay *auplay; -- cgit v1.2.3