partly revert [23991]. vlc:skip ain't supported, and that

[vlc] / modules / demux / flac.c

diff --git a/modules/demux/flac.c b/modules/demux/flac.c
index 0943d70532827a417bf92cc75c7ef5e3b38eb549..10637978c47f8256cd2f2263be72b392298d47d3 100644 (file)
--- a/modules/demux/flac.c
+++ b/modules/demux/flac.c
@@ -63,6 +63,7 @@ struct demux_sys_t
 
     /* Packetizer */
     decoder_t *p_packetizer;
+
     vlc_meta_t *p_meta;
     audio_replay_gain_t replay_gain;
 
@@ -93,7 +94,6 @@ struct demux_sys_t
 static int Open( vlc_object_t * p_this )
 {
     demux_t     *p_demux = (demux_t*)p_this;
-    module_t    *p_id3;
     demux_sys_t *p_sys;
     const byte_t *p_peek;
     uint8_t     *p_streaminfo;
@@ -154,36 +154,6 @@ static int Open( vlc_object_t * p_this )
         return VLC_EGENERIC;
     }
 
-    /* Parse possible id3 header */
-    p_demux->p_private = malloc( sizeof( demux_meta_t ) );
-    if( !p_demux->p_private )
-        return VLC_ENOMEM;
-    if( ( p_id3 = module_Need( p_demux, "meta reader", NULL, 0 ) ) )
-    {
-        demux_meta_t *p_demux_meta = (demux_meta_t *)p_demux->p_private;
-        vlc_meta_t *p_meta = p_demux_meta->p_meta;
-
-        if( !p_sys->p_meta )
-        {
-            p_sys->p_meta = p_meta;
-        }
-        else if( p_meta )
-        {
-            vlc_meta_Merge( p_sys->p_meta, p_meta );
-            vlc_meta_Delete( p_meta );
-        }
-        p_demux->p_private = NULL;
-        module_Unneed( p_demux, p_id3 );
-        int i;
-        for( i = 0; i < p_demux_meta->i_attachments; i++ )
-            TAB_APPEND_CAST( (input_attachment_t**),
-                    p_sys->i_attachments, p_sys->attachments,
-                    p_demux_meta->attachments[p_demux_meta->i_attachments] );
-
-        TAB_CLEAN( p_demux_meta->i_attachments, p_demux_meta->attachments );
-    }
-    free( p_demux->p_private );
-
     if( p_sys->i_cover_idx < p_sys->i_attachments )
     {
         char psz_url[128];
@@ -206,6 +176,10 @@ static void Close( vlc_object_t * p_this )
     demux_sys_t *p_sys = p_demux->p_sys;
 
     TAB_CLEAN( p_sys->i_seekpoint, p_sys->seekpoint );
+
+    int i;
+    for( i = 0; i < p_sys->i_attachments; i++ )
+        free( p_sys->attachments[i] );
     TAB_CLEAN( p_sys->i_attachments, p_sys->attachments);
 
     /* Unneed module */
@@ -369,6 +343,12 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
             vlc_meta_Merge( p_meta, p_demux->p_sys->p_meta );
         return VLC_SUCCESS;
     }
+    else if( i_query == DEMUX_HAS_UNSUPPORTED_META )
+    {
+        vlc_bool_t *pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
+        *pb_bool = VLC_TRUE;
+        return VLC_SUCCESS;
+    }
     else if( i_query == DEMUX_GET_LENGTH )
     {
         int64_t *pi64 = (int64_t*)va_arg( args, int64_t * );
@@ -656,7 +636,6 @@ static void ParseComment( demux_t *p_demux, const uint8_t *p_data, int i_data )
         {
             /* generic (PERFORMER/LICENSE/ORGANIZATION/LOCATION/CONTACT/ISRC,
              * undocumented tags and replay gain ) */
-            audio_replay_gain_t *r = &p_sys->replay_gain;
             char *p = strchr( psz, '=' );
             *p++ = '\0';
             vlc_meta_AddExtra( p_sys->p_meta, psz, p );