Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
b45afc21
Commit
b45afc21
authored
Sep 24, 2006
by
zorglub
Browse files
Move the meta readers to the correct folder, and use them for all parsing
parent
cf0bb5cf
Changes
9
Hide whitespace changes
Inline
Side-by-side
configure.ac
View file @
b45afc21
...
...
@@ -5662,7 +5662,6 @@ AC_CONFIG_FILES([
modules/demux/mp4/Makefile
modules/demux/mpeg/Makefile
modules/demux/playlist/Makefile
modules/demux/util/Makefile
modules/gui/Makefile
modules/gui/beos/Makefile
modules/gui/pda/Makefile
...
...
modules/demux/flac.c
View file @
b45afc21
...
...
@@ -137,7 +137,7 @@ static int Open( vlc_object_t * p_this )
p_sys
->
p_es
=
es_out_Add
(
p_demux
->
out
,
&
fmt
);
/* Parse possible id3 header */
if
(
(
p_id3
=
module_Need
(
p_demux
,
"
id3
"
,
NULL
,
0
)
)
)
if
(
(
p_id3
=
module_Need
(
p_demux
,
"
meta reader
"
,
NULL
,
0
)
)
)
{
p_sys
->
p_meta
=
(
vlc_meta_t
*
)
p_demux
->
p_private
;
p_demux
->
p_private
=
NULL
;
...
...
modules/demux/mpc.c
View file @
b45afc21
...
...
@@ -226,7 +226,7 @@ static int Open( vlc_object_t * p_this )
/* Parse possible id3 header */
if
(
(
p_id3
=
module_Need
(
p_demux
,
"
id3
"
,
NULL
,
0
)
)
)
if
(
(
p_id3
=
module_Need
(
p_demux
,
"
meta reader
"
,
NULL
,
0
)
)
)
{
p_sys
->
p_meta
=
(
vlc_meta_t
*
)
p_demux
->
p_private
;
p_demux
->
p_private
=
NULL
;
...
...
modules/demux/mpeg/mpga.c
View file @
b45afc21
...
...
@@ -262,7 +262,7 @@ static int Open( vlc_object_t * p_this )
p_sys
->
p_block_out
=
p_block_out
;
/* Parse possible id3 header */
if
(
(
p_id3
=
module_Need
(
p_demux
,
"
id3
"
,
NULL
,
0
)
)
)
if
(
(
p_id3
=
module_Need
(
p_demux
,
"
meta reader
"
,
NULL
,
0
)
)
)
{
p_sys
->
meta
=
(
vlc_meta_t
*
)
p_demux
->
p_private
;
p_demux
->
p_private
=
NULL
;
...
...
modules/demux/util/Modules.am
deleted
100644 → 0
View file @
cf0bb5cf
SOURCES_id3tag = \
id3tag.c \
id3genres.h \
$(NULL)
modules/meta_engine/Modules.am
View file @
b45afc21
SOURCES_musicbrainz = musicbrainz.c
SOURCES_dummy = dummy.c
SOURCES_folder = folder.c
SOURCES_taglib = taglib.cpp
SOURCES_id3tag = id3tag.c id3genres.h $(NULL)
modules/
demux/util
/id3genres.h
→
modules/
meta_engine
/id3genres.h
View file @
b45afc21
File moved
modules/
demux/util
/id3tag.c
→
modules/
meta_engine
/id3tag.c
View file @
b45afc21
...
...
@@ -48,7 +48,7 @@ static int ParseID3Tags ( vlc_object_t * );
*****************************************************************************/
vlc_module_begin
();
set_description
(
_
(
"ID3 tags parser"
)
);
set_capability
(
"
id3
"
,
70
);
set_capability
(
"
meta reader
"
,
70
);
set_callbacks
(
ParseID3Tags
,
NULL
);
vlc_module_end
();
...
...
modules/m
isc
/taglib.cpp
→
modules/m
eta_engine
/taglib.cpp
View file @
b45afc21
...
...
@@ -33,12 +33,11 @@ vlc_module_begin();
set_capability
(
"meta reader"
,
1000
);
set_callbacks
(
ReadMeta
,
NULL
);
vlc_module_end
();
static
int
ReadMeta
(
vlc_object_t
*
p_this
)
{
demux_t
*
p_demux
=
(
demux_t
*
)
p_this
;
fprintf
(
stderr
,
"Demuxing with %s
\n
"
,
p_demux
->
psz_access
);
if
(
!
strncmp
(
p_demux
->
psz_access
,
"file"
,
4
)
)
{
if
(
!
p_demux
->
p_private
)
...
...
Write
Preview
Supports
Markdown
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