Преглед изворни кода

playlist: fix displaying of subtitle Metadata

Pierre SAGASPE пре 9 година
родитељ
комит
89d055fe07
2 измењених фајлова са 15 додато и 12 уклоњено
  1. 12 11
      Sources/VLCPlaylistCollectionViewCell.m
  2. 3 1
      Sources/VLCPlaylistTableViewCell.m

+ 12 - 11
Sources/VLCPlaylistCollectionViewCell.m

@@ -468,7 +468,7 @@
             }
         }
 
-        if ((trackCount > 0) && (spuTracks.count > 0)) {
+        if ((trackCount > 0) || (spuTracks.count > 0)) {
             if (mediaInfo.length > 0)
                 [mediaInfo appendString:@"\n\n"];
 
@@ -477,19 +477,20 @@
             else
                 [mediaInfo appendString:@"1 subtitles track"];
 
+            if (spuTracks.count > 0) {
+                [mediaInfo appendString:@" ("];
+                for (NSUInteger x = 0; x < trackCount; x++) {
+                    NSString *language = [spuTracks[x] valueForKey:@"language"];
 
-            [mediaInfo appendString:@" ("];
-            for (NSUInteger x = 0; x < trackCount; x++) {
-                NSString *language = [spuTracks[x] valueForKey:@"language"];
-
-                if (language) {
-                    if (x != 0)
-                        [mediaInfo appendFormat:@", %@", [language uppercaseString]];
-                    else
-                        [mediaInfo appendString:[language uppercaseString]];
+                    if (language) {
+                        if (x != 0)
+                            [mediaInfo appendFormat:@", %@", [language uppercaseString]];
+                        else
+                            [mediaInfo appendString:[language uppercaseString]];
+                    }
                 }
+                [mediaInfo appendString:@")"];
             }
-            [mediaInfo appendString:@")"];
         }
 
         self.metaDataLabel.text = mediaInfo;

+ 3 - 1
Sources/VLCPlaylistTableViewCell.m

@@ -453,7 +453,7 @@
             }
         }
 
-        if ((trackCount > 0) && (spuTracks.count > 0)) {
+        if ((trackCount > 0) || (spuTracks.count > 0)) {
             if (mediaInfo.length > 0)
                 [mediaInfo appendString:@"\n\n"];
 
@@ -462,6 +462,7 @@
             else
                 [mediaInfo appendString:@"1 subtitles track"];
             
+            if (spuTracks.count > 0) {
                 [mediaInfo appendString:@" ("];
                 for (NSUInteger x = 0; x < trackCount; x++) {
                     NSString *language = [spuTracks[x] valueForKey:@"language"];
@@ -475,6 +476,7 @@
                 }
                 [mediaInfo appendString:@")"];
             }
+        }
 
         self.metaDataLabel.text = mediaInfo;
         [self.metaDataLabel sizeToFit];