decoders: added and fixed GLib log domains
Fixed the log domains of the renamed decoders. Added G_LOG_DOMAIN macros in decoders which don't have one already.
This commit is contained in:
parent
c4d69f0ae1
commit
d8db46edfa
@ -27,7 +27,7 @@
|
|||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
|
|
||||||
#undef G_LOG_DOMAIN
|
#undef G_LOG_DOMAIN
|
||||||
#define G_LOG_DOMAIN "aac"
|
#define G_LOG_DOMAIN "faad"
|
||||||
|
|
||||||
/* all code here is either based on or copied from FAAD2's frontend code */
|
/* all code here is either based on or copied from FAAD2's frontend code */
|
||||||
struct faad_buffer {
|
struct faad_buffer {
|
||||||
@ -402,7 +402,7 @@ aac_stream_decode(struct decoder *mpd_decoder, struct input_stream *is)
|
|||||||
};
|
};
|
||||||
|
|
||||||
if (!audio_format_valid(&audio_format)) {
|
if (!audio_format_valid(&audio_format)) {
|
||||||
g_warning("aac: invalid audio format\n");
|
g_warning("invalid audio format\n");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -32,6 +32,9 @@
|
|||||||
#include <id3tag.h>
|
#include <id3tag.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#undef G_LOG_DOMAIN
|
||||||
|
#define G_LOG_DOMAIN "mad"
|
||||||
|
|
||||||
#define FRAMES_CUSHION 2000
|
#define FRAMES_CUSHION 2000
|
||||||
|
|
||||||
#define READ_BUFFER_SIZE 40960
|
#define READ_BUFFER_SIZE 40960
|
||||||
@ -378,7 +381,7 @@ static void mp3_parse_id3(struct mp3_data *data, size_t tagsize,
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (count != tagsize) {
|
if (count != tagsize) {
|
||||||
g_debug("mp3_decode: error parsing ID3 tag\n");
|
g_debug("error parsing ID3 tag");
|
||||||
g_free(allocated);
|
g_free(allocated);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -1195,8 +1198,7 @@ static struct tag *mp3_tag_dup(const char *file)
|
|||||||
|
|
||||||
total_time = mp3_total_file_time(file);
|
total_time = mp3_total_file_time(file);
|
||||||
if (total_time < 0) {
|
if (total_time < 0) {
|
||||||
g_debug("mp3_tag_dup: Failed to get total song time from: %s\n",
|
g_debug("Failed to get total song time from: %s", file);
|
||||||
file);
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -21,6 +21,9 @@
|
|||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
#include <mikmod.h>
|
#include <mikmod.h>
|
||||||
|
|
||||||
|
#undef G_LOG_DOMAIN
|
||||||
|
#define G_LOG_DOMAIN "mikmod"
|
||||||
|
|
||||||
/* this is largely copied from alsaplayer */
|
/* this is largely copied from alsaplayer */
|
||||||
|
|
||||||
#define MIKMOD_FRAME_SIZE 4096
|
#define MIKMOD_FRAME_SIZE 4096
|
||||||
@ -204,7 +207,7 @@ static struct tag *modTagDup(const char *file)
|
|||||||
g_free(path2);
|
g_free(path2);
|
||||||
|
|
||||||
if (moduleHandle == NULL) {
|
if (moduleHandle == NULL) {
|
||||||
g_debug("modTagDup: Failed to open file: %s\n", file);
|
g_debug("Failed to open file: %s", file);
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -27,6 +27,9 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
|
#undef G_LOG_DOMAIN
|
||||||
|
#define G_LOG_DOMAIN "mp4ff"
|
||||||
|
|
||||||
/* all code here is either based on or copied from FAAD2's frontend code */
|
/* all code here is either based on or copied from FAAD2's frontend code */
|
||||||
|
|
||||||
struct mp4_context {
|
struct mp4_context {
|
||||||
@ -340,7 +343,7 @@ mp4_load_tag(const char *file)
|
|||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (!input_stream_open(&input_stream, file)) {
|
if (!input_stream_open(&input_stream, file)) {
|
||||||
g_warning("mp4_load_tag: Failed to open file: %s\n", file);
|
g_warning("Failed to open file: %s", file);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -23,6 +23,9 @@
|
|||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
|
#undef G_LOG_DOMAIN
|
||||||
|
#define G_LOG_DOMAIN "mpcdec"
|
||||||
|
|
||||||
typedef struct _MpcCallbackData {
|
typedef struct _MpcCallbackData {
|
||||||
struct input_stream *inStream;
|
struct input_stream *inStream;
|
||||||
struct decoder *decoder;
|
struct decoder *decoder;
|
||||||
@ -253,8 +256,7 @@ static struct tag *mpcTagDup(const char *file)
|
|||||||
struct tag *tag;
|
struct tag *tag;
|
||||||
|
|
||||||
if (total_time < 0) {
|
if (total_time < 0) {
|
||||||
g_debug("mpcTagDup: Failed to get Songlength of file: %s\n",
|
g_debug("Failed to get duration of file: %s", file);
|
||||||
file);
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -44,6 +44,9 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
|
#undef G_LOG_DOMAIN
|
||||||
|
#define G_LOG_DOMAIN "vorbis"
|
||||||
|
|
||||||
#if G_BYTE_ORDER == G_BIG_ENDIAN
|
#if G_BYTE_ORDER == G_BIG_ENDIAN
|
||||||
#define OGG_DECODE_USE_BIGENDIAN 1
|
#define OGG_DECODE_USE_BIGENDIAN 1
|
||||||
#else
|
#else
|
||||||
|
Loading…
Reference in New Issue
Block a user