Browse Source

replace occurencies of the pattern if (objects.count > 0) object = objects[0]; with object=objects.firstObject;

Tobias Conradi 10 years ago
parent
commit
fd48bd5313
1 changed files with 4 additions and 7 deletions
  1. 4 7
      Sources/VLCMovieViewController.m

+ 4 - 7
Sources/VLCMovieViewController.m

@@ -186,8 +186,7 @@ typedef NS_ENUM(NSInteger, VLCPanType) {
         return mediaFile;
         return mediaFile;
     } else if (self.mediaList) {
     } else if (self.mediaList) {
         NSArray *results = [MLFile fileForURL:_mediaPlayer.media.url.absoluteString];
         NSArray *results = [MLFile fileForURL:_mediaPlayer.media.url.absoluteString];
-        if (results.count > 0)
-            return results[0];
+        return results.firstObject;
     }
     }
 
 
     return nil;
     return nil;
@@ -783,8 +782,7 @@ typedef NS_ENUM(NSInteger, VLCPanType) {
             [request setSortDescriptors:@[descriptor]];
             [request setSortDescriptors:@[descriptor]];
 
 
             NSArray *matches = [moc executeFetchRequest:request error:nil];
             NSArray *matches = [moc executeFetchRequest:request error:nil];
-            if (matches.count > 0)
-                matchedFile = matches[0];
+            matchedFile = matches.firstObject;
         }
         }
     }
     }
     if (matchedFile.lastPosition)
     if (matchedFile.lastPosition)
@@ -907,7 +905,7 @@ typedef NS_ENUM(NSInteger, VLCPanType) {
     } else {
     } else {
         NSArray *files = [MLFile fileForURL:[[_mediaPlayer.media url] absoluteString]];
         NSArray *files = [MLFile fileForURL:[[_mediaPlayer.media url] absoluteString]];
         if (files.count > 0) {
         if (files.count > 0) {
-            MLFile *fileFromList = files[0];
+            MLFile *fileFromList = files.firstObject;
             fileFromList.lastPosition = @([_mediaPlayer position]);
             fileFromList.lastPosition = @([_mediaPlayer position]);
             fileFromList.lastAudioTrack = @(_mediaPlayer.currentAudioTrackIndex);
             fileFromList.lastAudioTrack = @(_mediaPlayer.currentAudioTrackIndex);
             fileFromList.lastSubtitleTrack = @(_mediaPlayer.currentVideoSubTitleIndex);
             fileFromList.lastSubtitleTrack = @(_mediaPlayer.currentVideoSubTitleIndex);
@@ -2229,8 +2227,7 @@ static inline NSArray * RemoteCommandCenterCommandsToHandle(MPRemoteCommandCente
         item = self.fileFromMediaLibrary;
         item = self.fileFromMediaLibrary;
     else if (self.mediaList) {
     else if (self.mediaList) {
         NSArray *matches = [MLFile fileForURL:[_mediaPlayer.media.url absoluteString]];
         NSArray *matches = [MLFile fileForURL:[_mediaPlayer.media.url absoluteString]];
-        if (matches.count > 0)
-            item = matches[0];
+        item = matches.firstObject;
     }
     }
 
 
     if (item) {
     if (item) {