* Protect input item's meta through setters and getters. That allows tracking of...

[vlc] / modules / codec / vorbis.c

diff --git a/modules/codec/vorbis.c b/modules/codec/vorbis.c
index 5dbdfb25895b2133823db3aed3e903e73de0bcc7..c41d27a513592d877497ab75f8cab0447f52e34e 100644 (file)
--- a/modules/codec/vorbis.c
+++ b/modules/codec/vorbis.c
@@ -106,7 +106,7 @@ static int pi_channels_maps[7] =
 
 /* recommended vorbis channel order for 6 channels */
 static const uint32_t pi_6channels_in[] =
-{ AOUT_CHAN_LEFT, AOUT_CHAN_CENTER, AOUT_CHAN_RIGHT,  
+{ AOUT_CHAN_LEFT, AOUT_CHAN_CENTER, AOUT_CHAN_RIGHT,
   AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT,AOUT_CHAN_LFE,0 };
 
 /* recommended vorbis channel order for 4 channels */
@@ -192,7 +192,7 @@ vlc_module_begin();
     set_description( _("Vorbis audio encoder") );
     set_capability( "encoder", 100 );
 #if defined(HAVE_VORBIS_VORBISENC_H)
-       set_callbacks( OpenEncoder, CloseEncoder );
+    set_callbacks( OpenEncoder, CloseEncoder );
 #endif
 
     add_integer( ENC_CFG_PREFIX "quality", 0, NULL, ENC_QUALITY_TEXT,
@@ -639,8 +639,7 @@ static void ParseVorbisComments( decoder_t *p_dec )
             {
                 if( psz_value && ( *psz_value != '\0' ) )
                 {
-                    vlc_meta_SetArtist( p_item->p_meta,
-                                        psz_value );
+                    input_item_SetArtist( p_item, psz_value );
                     input_ItemAddInfo( p_item,
                                         _(VLC_META_INFO_CAT),
                                         _(VLC_META_ARTIST),
@@ -651,8 +650,7 @@ static void ParseVorbisComments( decoder_t *p_dec )
             {
                 if( psz_value && ( *psz_value != '\0' ) )
                 {
-                    vlc_meta_SetTitle( p_item->p_meta,
-                                    psz_value );
+                    input_item_SetTitle( p_item, psz_value );
                     p_item->psz_name = strdup( psz_value );
                 }
             }
@@ -660,16 +658,14 @@ static void ParseVorbisComments( decoder_t *p_dec )
             {
                 if( psz_value && ( *psz_value != '\0' ) )
                 {
-                    vlc_meta_SetAlbum( p_item->p_meta,
-                                    psz_value );
+                    input_item_SetAlbum( p_item, psz_value );
                 }
             }
             else if( !strcasecmp( psz_name, "musicbrainz_trackid" ) )
             {
                 if( psz_value && ( *psz_value != '\0' ) )
                 {
-                    vlc_meta_SetTrackID( p_item->p_meta,
-                                    psz_value );
+                    input_item_SetTrackID( p_item, psz_value );
                 }
             }
             else if( !strcasecmp( psz_name, "REPLAYGAIN_TRACK_GAIN" ) ||
@@ -708,16 +704,14 @@ static void ParseVorbisComments( decoder_t *p_dec )
             {
                 if( psz_value && ( *psz_value != '\0' ) )
                 {
-                    vlc_meta_SetArtistID( p_item->p_meta,
-                                    psz_value );
+                    vlc_meta_SetArtistID( p_item, psz_value );
                 }
             }
             else if( !strcasecmp( psz_name, "musicbrainz_albumid" ) )
             {
                 if( psz_value && ( *psz_value != '\0' ) )
                 {
-                    vlc_meta_SetAlbumID( p_item->p_meta,
-                                    psz_value );
+                    input_item_SetAlbumID( p_item, psz_value );
                 }
             }
 #endif