Ogg: do not display x,x if we have both methods for TrackTotal

0f433ffd · Jean-Baptiste Kempf · d76e3ea6 · 0f433ffd
Commit 0f433ffd authored Jun 27, 2012 by Jean-Baptiste Kempf
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

modules/demux/vorbis.h modules/demux/vorbis.h +4 -2

No files found.
--- a/modules/demux/vorbis.h
+++ b/modules/demux/vorbis.h
@@ -152,8 +152,10 @@ static inline void vorbis_ParseComment( vlc_meta_t **pp_meta, const uint8_t *p_d
        IF_EXTRACT("TITLE=", Title )
        else IF_EXTRACT("ALBUM=", Album )
        else IF_EXTRACT("TRACKNUMBER=", TrackNumber )
-        else IF_EXTRACT("TRACKTOTAL=", TrackTotal )
-        else IF_EXTRACT("TOTALTRACKS=", TrackTotal )
+        else if( !hasTrackTotal )
+            IF_EXTRACT("TRACKTOTAL=", TrackTotal )
+        else if( !hasTrackTotal )
+            IF_EXTRACT("TOTALTRACKS=", TrackTotal )
        else IF_EXTRACT("ARTIST=", Artist )
        else IF_EXTRACT("COPYRIGHT=", Copyright )
        else IF_EXTRACT("ORGANIZATION=", Publisher )