Commit 9bd1fc99 authored by Carola's avatar Carola
Browse files

VLCplaybackController: rename backward and forward to next and previous

parent 8cdc43db
Pipeline #226 passed with stage
in 0 seconds
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
- (void)previousAction:(id)sender - (void)previousAction:(id)sender
{ {
[[VLCPlaybackController sharedInstance] backward]; [[VLCPlaybackController sharedInstance] previous];
} }
- (void)playPauseAction:(id)sender - (void)playPauseAction:(id)sender
...@@ -177,7 +177,7 @@ ...@@ -177,7 +177,7 @@
- (void)nextAction:(id)sender - (void)nextAction:(id)sender
{ {
[[VLCPlaybackController sharedInstance] forward]; [[VLCPlaybackController sharedInstance] next];
} }
- (void)pushFullPlaybackView:(id)sender - (void)pushFullPlaybackView:(id)sender
......
...@@ -1022,14 +1022,13 @@ currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom ...@@ -1022,14 +1022,13 @@ currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom
- (IBAction)forward:(id)sender - (IBAction)forward:(id)sender
{ {
LOCKCHECK; LOCKCHECK;
[_vpc forward]; [_vpc next];
} }
- (IBAction)backward:(id)sender - (IBAction)backward:(id)sender
{ {
LOCKCHECK; LOCKCHECK;
[_vpc previous];
[_vpc backward];
} }
- (IBAction)switchTrack:(id)sender - (IBAction)switchTrack:(id)sender
......
...@@ -79,8 +79,8 @@ currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom ...@@ -79,8 +79,8 @@ currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom
- (void)startPlayback; - (void)startPlayback;
- (void)stopPlayback; - (void)stopPlayback;
- (void)playPause; - (void)playPause;
- (void)forward; - (void)next;
- (void)backward; - (void)previous;
- (void)switchAspectRatio; - (void)switchAspectRatio;
- (BOOL)updateViewpoint:(CGFloat)yaw pitch:(CGFloat)pitch roll:(CGFloat)roll fov:(CGFloat)fov absolute:(BOOL)absolute; - (BOOL)updateViewpoint:(CGFloat)yaw pitch:(CGFloat)pitch roll:(CGFloat)roll fov:(CGFloat)fov absolute:(BOOL)absolute;
- (NSInteger)currentMediaProjection; - (NSInteger)currentMediaProjection;
......
...@@ -540,7 +540,7 @@ VLCMediaDelegate, VLCRemoteControlServiceDelegate> ...@@ -540,7 +540,7 @@ VLCMediaDelegate, VLCRemoteControlServiceDelegate>
} }
} }
- (void)forward - (void)next
{ {
NSInteger mediaListCount = _mediaList.count; NSInteger mediaListCount = _mediaList.count;
...@@ -578,7 +578,7 @@ VLCMediaDelegate, VLCRemoteControlServiceDelegate> ...@@ -578,7 +578,7 @@ VLCMediaDelegate, VLCRemoteControlServiceDelegate>
} }
} }
- (void)backward - (void)previous
{ {
if (_mediaList.count > 1) { if (_mediaList.count > 1) {
[_listPlayer previous]; [_listPlayer previous];
......
...@@ -98,9 +98,9 @@ static VLCWatchCommunication *_singeltonInstance = nil; ...@@ -98,9 +98,9 @@ static VLCWatchCommunication *_singeltonInstance = nil;
[[VLCPlaybackController sharedInstance] playPause]; [[VLCPlaybackController sharedInstance] playPause];
responseDict = @{@"playing": @([VLCPlaybackController sharedInstance].isPlaying)}; responseDict = @{@"playing": @([VLCPlaybackController sharedInstance].isPlaying)};
} else if ([name isEqualToString:VLCWatchMessageNameSkipForward]) { } else if ([name isEqualToString:VLCWatchMessageNameSkipForward]) {
[[VLCPlaybackController sharedInstance] forward]; [[VLCPlaybackController sharedInstance] next];
} else if ([name isEqualToString:VLCWatchMessageNameSkipBackward]) { } else if ([name isEqualToString:VLCWatchMessageNameSkipBackward]) {
[[VLCPlaybackController sharedInstance] backward]; [[VLCPlaybackController sharedInstance] previous];
} else if ([name isEqualToString:VLCWatchMessageNamePlayFile]) { } else if ([name isEqualToString:VLCWatchMessageNamePlayFile]) {
[self playFileFromWatch:message]; [self playFileFromWatch:message];
} else if ([name isEqualToString:VLCWatchMessageNameSetVolume]) { } else if ([name isEqualToString:VLCWatchMessageNameSetVolume]) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment