Play next/prev media via key binding.

bbirec · May 7, 2016 · 7be6d74 · 7be6d74
1 parent 992ef92
commit 7be6d74
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 7 deletions.
diff --git a/PeerPlayer/AppDelegate.h b/PeerPlayer/AppDelegate.h
@@ -38,5 +38,12 @@
 -(void) playTorrent:(NSString*)url;
 -(IBAction) openTorrentFile:(id)sender;
 -(IBAction) stopCurrentVideo:(id)sender;
+
+
+-(BOOL) hasPrev;
+-(BOOL) hasNext;
+-(void) playPrev;
+-(void) playNext;
+
 @end
 
diff --git a/PeerPlayer/AppDelegate.m b/PeerPlayer/AppDelegate.m
@@ -65,6 +65,29 @@ -(void) loadSubtitle:(File*) file {
     [dataTask resume];
 }
 
+-(BOOL) hasPrev {
+    return [self.playlist getPrevMedia:self.selectedMedia] != nil;
+}
+
+-(BOOL) hasNext {
+    return [self.playlist getNextMedia:self.selectedMedia] != nil;
+}
+
+
+-(void) playPrev {
+    File* next = [self.playlist getPrevMedia:self.selectedMedia];
+    if(next != nil) {
+        [self playFile:next];
+    }
+}
+
+-(void) playNext {
+    File* next = [self.playlist getNextMedia:self.selectedMedia];
+    if(next != nil) {
+        [self playFile:next];
+    }
+}
+
 #pragma Menu
 
 -(void) updateMenu {
@@ -141,7 +164,7 @@ -(void) torrentReady:(NSDictionary*)data {
     [self updateMenu];
 
     // Start the first media in the playlist.
-    File* f = [self.playlist getNextMedia:nil];
+    File* f = [self.playlist getFirstMedia];
     if(f != nil) {
         [self playFile:f];
     }
@@ -180,10 +203,7 @@ -(void) playEnded:(PlayEndReason)reason {
     NSLog(@"Play ended : %ld", reason);
     if(reason == kPlayEndEOF) {
         // Play the next media automatically.
-        File* next = [self.playlist getNextMedia:self.selectedMedia];
-        if(next != nil) {
-            [self playFile:next];
-        }
+        [self playNext];
     }
 }
 

diff --git a/PeerPlayer/Playlist.h b/PeerPlayer/Playlist.h
@@ -25,6 +25,8 @@
 @property (strong) NSArray<File*>* mediaFiles;
 @property (strong) NSArray<File*>* subFiles;
 
+-(File*) getFirstMedia;
+-(File*) getPrevMedia:(File*) currentFile;
 -(File*) getNextMedia:(File*) currentFile;
 -(File*) getSubtitleForMedia:(File*) mediaFile;
 

diff --git a/PeerPlayer/Playlist.m b/PeerPlayer/Playlist.m
@@ -61,17 +61,45 @@ +(Playlist*) playListFromFiles:(NSArray<File*>*) files {
     return instance;
 }
 
+-(File*) getFirstMedia {
+    return [self.mediaFiles firstObject];
+}
+
+-(File*) getPrevMedia:(File*) currentFile {
+    if(currentFile == nil) {
+        return [self.mediaFiles firstObject];
+    }
+    else {
+        NSUInteger idx = [self.mediaFiles indexOfObject:currentFile];
+        if(idx == NSNotFound) {
+            return nil;
+        }
+        else if(idx == 0) {
+            return nil;
+        }
+        else {
+            return [self.mediaFiles objectAtIndex:idx-1];
+        }
+    }
+}
+
 -(File*) getNextMedia:(File*) currentFile {
     // Return the first file
     if(currentFile == nil) {
         return [self.mediaFiles firstObject];
     }
 
     NSUInteger idx = [self.mediaFiles indexOfObject:currentFile];
-    if(idx + 1 < [self.mediaFiles count]) {
+    if(idx == NSNotFound) {
+        return nil;
+    }
+    else if(idx + 1 == [self.mediaFiles count]) {
+        return nil;
+
+    }
+    else {
         return [self.mediaFiles objectAtIndex:idx+1];
     }
-    return nil;
 }
 
 -(File*) getSubtitleForMedia:(File*) mediaFile {

diff --git a/PeerPlayer/RootView.m b/PeerPlayer/RootView.m
@@ -8,6 +8,7 @@
 
 #import "RootView.h"
 #import "MpvController.h"
+#import "AppDelegate.h"
 
 @implementation RootView
 
@@ -28,6 +29,7 @@ -(void) awakeFromNib {
 -(void) keyDown:(NSEvent *)event
 {
     NSLog(@"keydown: %@", event);
+    AppDelegate* delegate = [[NSApplication sharedApplication] delegate];
 
     switch(event.keyCode) {
         // Space
@@ -39,6 +41,9 @@ -(void) keyDown:(NSEvent *)event
             if([event modifierFlags] & NSShiftKeyMask) {
                 [[MpvController getInstance] seek:-10];
             }
+            else if([event modifierFlags] & NSCommandKeyMask) {
+                [delegate playPrev];
+            }
             else {
                 [[MpvController getInstance] seek:-1];
             }
@@ -48,6 +53,9 @@ -(void) keyDown:(NSEvent *)event
             if([event modifierFlags] & NSShiftKeyMask) {
                 [[MpvController getInstance] seek:10];
             }
+            else if([event modifierFlags] & NSCommandKeyMask) {
+                [delegate playNext];
+            }
             else {
                 [[MpvController getInstance] seek:1];
             }