Changeset 6a42724746cf15ac038540451a04f62bca3b5629

Timestamp:

20/11/06 05:49:59 (2 years ago)

Author:

Rafaël Carré <funman@videolan.org>

git-committer:

Rafaël Carré <funman@videolan.org> 1163998199 +0000

git-parent:

[a743fab8519640d289eddf2bf3c5df932d5ba24a]

git-author:

Rafaël Carré <funman@videolan.org> 1163998199 +0000

Message:

Ignore empty vorbis comments (closes #704)
Comment unusued artist & album musicbrainz ids

Files:

• include/vlc_meta.h (modified) (5 diffs)
• modules/codec/vorbis.c (modified) (1 diff)
• modules/meta_engine/id3tag.c (modified) (2 diffs)

include/vlc_meta.h

@@ -73 +73 @@
-    char *psz_arturl;
-    char *psz_trackid;
+#if 0 //not used
-    char *psz_artistid;
-    char *psz_albumid;
+#endif
-
-    int i_status;
@@ -105 +107 @@
-#define vlc_meta_SetArtURL( meta, b ) vlc_meta_Set( meta, arturl, b );
-#define vlc_meta_SetTrackID( meta, b ) vlc_meta_Set( meta, trackid, b );
+#if 0 //not used
-#define vlc_meta_SetArtistID( meta, b ) vlc_meta_Set( meta, artistid, b );
-#define vlc_meta_SetAlbumID( meta, b ) vlc_meta_Set( meta, albumid, b );
+#endif
-
-
@@ -130 +134 @@
-    m->psz_arturl = NULL;
-    m->psz_trackid = NULL;
+#if 0 //not used
-    m->psz_artistid = NULL;
-    m->psz_albumid = NULL;
+#endif
-    m->i_status = 0;
-    return m;
@@ -154 +160 @@
-    free( m->psz_encodedby );
-    free( m->psz_trackid );
+#if 0 //not used
-    free( m->psz_artistid );
-    free( m->psz_albumid );
+#endif
-    free( m->psz_arturl );
-
@@ -185 +193 @@
-    COPY_FIELD( encodedby );
-    COPY_FIELD( trackid );
+#if 0 //not used
-    COPY_FIELD( artistid );
-    COPY_FIELD( albumid );
+#endif
-    COPY_FIELD( arturl );
-}

modules/codec/vorbis.c

@@ -627 +627 @@
-            if( !strcasecmp( psz_name, "artist" ) )
-            {
-
-
-
-
+
+
+
+
+
+
+
-                                        "%s", psz_value );
+                }
-            }
-            else if( !strcasecmp( psz_name, "title" ) )
-            {
-
+
+
+
-                                    psz_value );
-
+
+
-            }
-            else if( !strcasecmp( psz_name, "album" ) )
-            {
-
+
+
+
-                                    psz_value );
+                }
-            }
-            else if( !strcasecmp( psz_name, "musicbrainz_trackid" ) )
-            {
-
+
+
+
-                                    psz_value );
+                }
-            }
+#if 0 //not used
-            else if( !strcasecmp( psz_name, "musicbrainz_artistid" ) )
-            {
-
+
+
+
-                                    psz_value );
+                }
-            }
-            else if( !strcasecmp( psz_name, "musicbrainz_albumid" ) )
-            {
-
+
+
+
-                                    psz_value );
+                }
-            }
+#endif
-        }
-        /* FIXME */

modules/meta_engine/id3tag.c

@@ -92 +92 @@
-        i++;
-    }
-
+
-    i = 0;
-
@@ -119 +119 @@
-        i++;
-    }
-
+
-    i = 0;
-