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

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

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;

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;

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;

modules/demux/util/Modules.am

-SOURCES_id3tag = \
-	id3tag.c \
-	id3genres.h \
-	$(NULL)
-
-

modules/meta_engine/Modules.am

 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/id3tag.c → 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();
 

modules/misc/taglib.cpp → 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 )