Changed vlc_meta_SetTracknum to *Num for consistency.

diff --git a/include/vlc_meta.h b/include/vlc_meta.h
index 124b8ec1ac4c86b113e0637ffa4fb3c96b4c5cb9..e5b11b89d3dc285769769d641aa4416da1086b5a 100644 (file)
--- a/include/vlc_meta.h
+++ b/include/vlc_meta.h
@@ -80,7 +80,7 @@ struct vlc_meta_t
 #define vlc_meta_SetGenre( meta, b )       vlc_meta_Set( meta, vlc_meta_Genre, b )
 #define vlc_meta_SetCopyright( meta, b )   vlc_meta_Set( meta, vlc_meta_Copyright, b )
 #define vlc_meta_SetAlbum( meta, b )       vlc_meta_Set( meta, vlc_meta_Album, b )
-#define vlc_meta_SetTracknum( meta, b )    vlc_meta_Set( meta, vlc_meta_TrackNumber, b )
+#define vlc_meta_SetTrackNum( meta, b )    vlc_meta_Set( meta, vlc_meta_TrackNumber, b )
 #define vlc_meta_SetDescription( meta, b ) vlc_meta_Set( meta, vlc_meta_Description, b )
 #define vlc_meta_SetRating( meta, b )      vlc_meta_Set( meta, vlc_meta_Rating, b )
 #define vlc_meta_SetDate( meta, b )        vlc_meta_Set( meta, vlc_meta_Date, b )

diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index 1bab7f484bc65904251954eb25eb6b8f603170a0..de0b001740b8ad848238cf5a7f614ac1a3efd004 100644 (file)
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -903,7 +903,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
                     break;
 
                 case FOURCC_0xa9trk: /* Track */
-                    SET( vlc_meta_SetTracknum );
+                    SET( vlc_meta_SetTrackNum );
                     break;
 
                 case FOURCC_0xa9cmt: /* Commment */

diff --git a/modules/meta_engine/id3tag.c b/modules/meta_engine/id3tag.c
index fd0210160c1bf8b94d8b82011aa5524a45926cd6..78a85cebc18066b33083ffb1271a84ddfe87659e 100644 (file)
--- a/modules/meta_engine/id3tag.c
+++ b/modules/meta_engine/id3tag.c
@@ -215,7 +215,7 @@ static void ParseID3Tag( demux_t *p_demux, const uint8_t *p_data, int i_size )
             }
             else if( DESCR_IS( "Track number/position in set" ) )
             {
-                vlc_meta_SetTracknum( p_meta, psz_temp );
+                vlc_meta_SetTrackNum( p_meta, psz_temp );
             }
             else if( DESCR_IS( "Album/movie/show title" ) )
             {
@@ -345,7 +345,7 @@ static void ParseAPEvXTag( demux_t *p_demux, const uint8_t *p_data, int i_data )
                 char *p = strchr( psz_value, '/' );
                 if( p )
                     *p++ = '\0';
-                vlc_meta_SetTracknum( p_meta, psz_value );
+                vlc_meta_SetTrackNum( p_meta, psz_value );
             }
             else  if( IS( "Comment" ) )
                 vlc_meta_SetDescription( p_meta, psz_value );