Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
d8db46ed
Commit
d8db46ed
authored
Feb 17, 2009
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
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.
parent
c4d69f0a
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
22 additions
and
9 deletions
+22
-9
faad_plugin.c
src/decoder/faad_plugin.c
+2
-2
mad_plugin.c
src/decoder/mad_plugin.c
+5
-3
mikmod_plugin.c
src/decoder/mikmod_plugin.c
+4
-1
mp4ff_plugin.c
src/decoder/mp4ff_plugin.c
+4
-1
mpcdec_plugin.c
src/decoder/mpcdec_plugin.c
+4
-2
vorbis_plugin.c
src/decoder/vorbis_plugin.c
+3
-0
No files found.
src/decoder/faad_plugin.c
View file @
d8db46ed
...
...
@@ -27,7 +27,7 @@
#include <glib.h>
#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 */
struct
faad_buffer
{
...
...
@@ -402,7 +402,7 @@ aac_stream_decode(struct decoder *mpd_decoder, struct input_stream *is)
};
if
(
!
audio_format_valid
(
&
audio_format
))
{
g_warning
(
"
aac:
invalid audio format
\n
"
);
g_warning
(
"invalid audio format
\n
"
);
break
;
}
...
...
src/decoder/mad_plugin.c
View file @
d8db46ed
...
...
@@ -32,6 +32,9 @@
#include <id3tag.h>
#endif
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "mad"
#define FRAMES_CUSHION 2000
#define READ_BUFFER_SIZE 40960
...
...
@@ -378,7 +381,7 @@ static void mp3_parse_id3(struct mp3_data *data, size_t tagsize,
}
if
(
count
!=
tagsize
)
{
g_debug
(
"
mp3_decode: error parsing ID3 tag
\n
"
);
g_debug
(
"
error parsing ID3 tag
"
);
g_free
(
allocated
);
return
;
}
...
...
@@ -1195,8 +1198,7 @@ static struct tag *mp3_tag_dup(const char *file)
total_time
=
mp3_total_file_time
(
file
);
if
(
total_time
<
0
)
{
g_debug
(
"mp3_tag_dup: Failed to get total song time from: %s
\n
"
,
file
);
g_debug
(
"Failed to get total song time from: %s"
,
file
);
return
NULL
;
}
...
...
src/decoder/mikmod_plugin.c
View file @
d8db46ed
...
...
@@ -21,6 +21,9 @@
#include <glib.h>
#include <mikmod.h>
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "mikmod"
/* this is largely copied from alsaplayer */
#define MIKMOD_FRAME_SIZE 4096
...
...
@@ -204,7 +207,7 @@ static struct tag *modTagDup(const char *file)
g_free
(
path2
);
if
(
moduleHandle
==
NULL
)
{
g_debug
(
"
modTagDup: Failed to open file: %s
\n
"
,
file
);
g_debug
(
"
Failed to open file: %s
"
,
file
);
return
NULL
;
}
...
...
src/decoder/mp4ff_plugin.c
View file @
d8db46ed
...
...
@@ -27,6 +27,9 @@
#include <stdlib.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 */
struct
mp4_context
{
...
...
@@ -340,7 +343,7 @@ mp4_load_tag(const char *file)
int
i
;
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
;
}
...
...
src/decoder/mpcdec_plugin.c
View file @
d8db46ed
...
...
@@ -23,6 +23,9 @@
#include <glib.h>
#include <unistd.h>
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "mpcdec"
typedef
struct
_MpcCallbackData
{
struct
input_stream
*
inStream
;
struct
decoder
*
decoder
;
...
...
@@ -253,8 +256,7 @@ static struct tag *mpcTagDup(const char *file)
struct
tag
*
tag
;
if
(
total_time
<
0
)
{
g_debug
(
"mpcTagDup: Failed to get Songlength of file: %s
\n
"
,
file
);
g_debug
(
"Failed to get duration of file: %s"
,
file
);
return
NULL
;
}
...
...
src/decoder/vorbis_plugin.c
View file @
d8db46ed
...
...
@@ -44,6 +44,9 @@
#include <stdlib.h>
#include <unistd.h>
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "vorbis"
#if G_BYTE_ORDER == G_BIG_ENDIAN
#define OGG_DECODE_USE_BIGENDIAN 1
#else
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment