Browse Source

restore b134b45e2 lost in merge conflcit

Felix Paul Kühne 10 years ago
parent
commit
ea74e651ea
1 changed files with 4 additions and 7 deletions
  1. 4 7
      Sources/VLCPlaybackController.m

+ 4 - 7
Sources/VLCPlaybackController.m

@@ -288,8 +288,7 @@
             [request setSortDescriptors:@[descriptor]];
 
             NSArray *matches = [moc executeFetchRequest:request error:nil];
-            if (matches.count > 0)
-                matchedFile = matches[0];
+            matchedFile = matches.firstObject;
         }
     }
     if (matchedFile.lastPosition)
@@ -402,7 +401,7 @@
     } else {
         NSArray *files = [MLFile fileForURL:[[_mediaPlayer.media url] absoluteString]];
         if (files.count > 0) {
-            MLFile *fileFromList = files[0];
+            MLFile *fileFromList = files.firstObject;
             fileFromList.lastPosition = @([_mediaPlayer position]);
             fileFromList.lastAudioTrack = @(_mediaPlayer.currentAudioTrackIndex);
             fileFromList.lastSubtitleTrack = @(_mediaPlayer.currentVideoSubTitleIndex);
@@ -707,8 +706,7 @@
         return mediaFile;
     } else if (self.mediaList) {
         NSArray *results = [MLFile fileForURL:_mediaPlayer.media.url.absoluteString];
-        if (results.count > 0)
-            return results[0];
+        return results.firstObject;
     }
 
     return nil;
@@ -735,8 +733,7 @@
         item = self.fileFromMediaLibrary;
     else if (self.mediaList) {
         NSArray *matches = [MLFile fileForURL:[_mediaPlayer.media.url absoluteString]];
-        if (matches.count > 0)
-            item = matches[0];
+        item = matches.firstObject
     }
 
     if (item) {