Move the meta readers to the correct folder, and use them for all parsing

diff --git a/configure.ac b/configure.ac
index 7efb4a4cea3f31aa754770b1544ac3d6da36181c..d2a2506abf273a1e6b689572c675c13eedfc47ec 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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

diff --git a/modules/demux/flac.c b/modules/demux/flac.c
index ef8907475e00df08e692439e4de0860002bb667e..da31744b5da7bbeb213a2a35bd0b58b3dfe645e8 100644 (file)
--- a/modules/demux/flac.c
+++ b/modules/demux/flac.c
@@ -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;

diff --git a/modules/demux/mpc.c b/modules/demux/mpc.c
index 4a4caab9a755d5cef76f08dff79f4ca3b2852e86..a904b712fd2990b7fc11cee3d84f49af19545777 100644 (file)
--- a/modules/demux/mpc.c
+++ b/modules/demux/mpc.c
@@ -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;

diff --git a/modules/demux/mpeg/mpga.c b/modules/demux/mpeg/mpga.c
index 3b629a19a8014c98ac62ac1481a81f937e643011..a5692bfb0481d2e0dc81f196287f489b77e7eb94 100644 (file)
--- a/modules/demux/mpeg/mpga.c
+++ b/modules/demux/mpeg/mpga.c
@@ -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;

diff --git a/modules/demux/util/Modules.am b/modules/demux/util/Modules.am
deleted file mode 100644 (file)
index aed4a4b..0000000
--- a/modules/demux/util/Modules.am
+++ /dev/null
@@ -1,6 +0,0 @@
-SOURCES_id3tag = \
-       id3tag.c \
-       id3genres.h \
-       $(NULL)
-
-

diff --git a/modules/meta_engine/Modules.am b/modules/meta_engine/Modules.am
index 24002f927cf0a099459bad950dc0722d355e24f4..09011735f7fe2a7f99b39ec4a126051599070062 100644 (file)
--- a/modules/meta_engine/Modules.am
+++ b/modules/meta_engine/Modules.am
@@ -1,3 +1,5 @@
 SOURCES_musicbrainz = musicbrainz.c
 SOURCES_dummy = dummy.c
 SOURCES_folder = folder.c
+SOURCES_taglib = taglib.cpp
+SOURCES_id3tag = id3tag.c id3genres.h $(NULL)

diff --git a/modules/demux/util/id3genres.h b/modules/meta_engine/id3genres.h
similarity index 100%
rename from modules/demux/util/id3genres.h
rename to modules/meta_engine/id3genres.h

diff --git a/modules/demux/util/id3tag.c b/modules/meta_engine/id3tag.c
similarity index 99%
rename from modules/demux/util/id3tag.c
rename to modules/meta_engine/id3tag.c
index 01bb6fa4b1ec0505ca0baba20227fd35435b7944..9e11ddd8c1737064b110b9a9276db4c694ef323a 100644 (file)
--- a/modules/demux/util/id3tag.c
+++ b/modules/meta_engine/id3tag.c
@@ -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();
 

diff --git a/modules/misc/taglib.cpp b/modules/meta_engine/taglib.cpp
similarity index 96%
rename from modules/misc/taglib.cpp
rename to modules/meta_engine/taglib.cpp
index 75bd4416e7cbebe220d62fa49892449bcff8f684..58a26c4bd2493612ff7008ecf8d22492e557e865 100644 (file)
--- a/modules/misc/taglib.cpp
+++ b/modules/meta_engine/taglib.cpp
@@ -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 )