Skip to content

Commit 1e693eb

Browse files
wutschelwutschel
committed
Directly call playerAction:params:
1 parent 8e36d8a commit 1e693eb

File tree

2 files changed

+28
-36
lines changed

2 files changed

+28
-36
lines changed

‎XBMC Remote/NowPlaying.m‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1110,10 +1110,6 @@ - (void)clearPlaylist:(int)playlistID {
11101110
}];
11111111
}
11121112

1113-
- (void)playbackAction:(NSString*)action params:(NSDictionary*)parameters {
1114-
[self playerAction:action params:parameters playerid:currentPlayerID];
1115-
}
1116-
11171113
- (void)updatePartyModePlaylist {
11181114
lastSelected = SELECTED_NONE;
11191115
storeSelection = nil;
@@ -1533,39 +1529,39 @@ - (IBAction)startVibrate:(id)sender {
15331529
if (AppDelegate.instance.serverVersion > 11) {
15341530
action = @"Player.GoTo";
15351531
params = @{@"to": @"previous"};
1536-
[self playbackAction:action params:params];
1532+
[self playerAction:action params:params];
15371533
}
15381534
else {
15391535
action = @"Player.GoPrevious";
15401536
params = nil;
1541-
[self playbackAction:action params:nil];
1537+
[self playerAction:action params:nil];
15421538
}
15431539
ProgressSlider.value = 0;
15441540
break;
15451541

15461542
case TAG_ID_PLAYPAUSE:
15471543
action = @"Player.PlayPause";
15481544
params = nil;
1549-
[self playbackAction:action params:nil];
1545+
[self playerAction:action params:nil];
15501546
break;
15511547

15521548
case TAG_ID_STOP:
15531549
action = @"Player.Stop";
15541550
params = nil;
1555-
[self playbackAction:action params:nil];
1551+
[self playerAction:action params:nil];
15561552
storeSelection = nil;
15571553
break;
15581554

15591555
case TAG_ID_NEXT:
15601556
if (AppDelegate.instance.serverVersion > 11) {
15611557
action = @"Player.GoTo";
15621558
params = @{@"to": @"next"};
1563-
[self playbackAction:action params:params];
1559+
[self playerAction:action params:params];
15641560
}
15651561
else {
15661562
action = @"Player.GoNext";
15671563
params = nil;
1568-
[self playbackAction:action params:nil];
1564+
[self playerAction:action params:nil];
15691565
}
15701566
break;
15711567

@@ -1581,13 +1577,13 @@ - (IBAction)startVibrate:(id)sender {
15811577
case TAG_SEEK_BACKWARD:
15821578
action = @"Player.Seek";
15831579
params = [Utilities buildPlayerSeekStepParams:@"smallbackward"];
1584-
[self playbackAction:action params:params];
1580+
[self playerAction:action params:params];
15851581
break;
15861582

15871583
case TAG_SEEK_FORWARD:
15881584
action = @"Player.Seek";
15891585
params = [Utilities buildPlayerSeekStepParams:@"smallforward"];
1590-
[self playbackAction:action params:params];
1586+
[self playerAction:action params:params];
15911587
break;
15921588

15931589
default:
@@ -1672,10 +1668,10 @@ - (IBAction)changeRepeat:(id)sender {
16721668

16731669
// Send the command to Kodi
16741670
if (AppDelegate.instance.serverVersion > 11) {
1675-
[self playbackAction:@"Player.SetRepeat" params:@{@"playerid": @(currentPlayerID), @"repeat": @"cycle"}];
1671+
[self playerAction:@"Player.SetRepeat" params:@{@"playerid": @(currentPlayerID), @"repeat": @"cycle"}];
16761672
}
16771673
else {
1678-
[self playbackAction:@"Player.Repeat" params:@{@"playerid": @(currentPlayerID), @"state": newRepeatStatus}];
1674+
[self playerAction:@"Player.Repeat" params:@{@"playerid": @(currentPlayerID), @"state": newRepeatStatus}];
16791675
}
16801676

16811677
// Update the button status
@@ -1825,11 +1821,11 @@ - (IBAction)handleButtonLongPress:(UILongPressGestureRecognizer*)gestureRecogniz
18251821
if (gestureRecognizer.state == UIGestureRecognizerStateBegan) {
18261822
switch (gestureRecognizer.view.tag) {
18271823
case TAG_SEEK_BACKWARD:// BACKWARD BUTTON - DECREASE PLAYBACK SPEED
1828-
[self playbackAction:@"Player.SetSpeed" params:@{@"speed": @"decrement"}];
1824+
[self playerAction:@"Player.SetSpeed" params:@{@"speed": @"decrement"}];
18291825
break;
18301826

18311827
case TAG_SEEK_FORWARD:// FORWARD BUTTON - INCREASE PLAYBACK SPEED
1832-
[self playbackAction:@"Player.SetSpeed" params:@{@"speed": @"increment"}];
1828+
[self playerAction:@"Player.SetSpeed" params:@{@"speed": @"increment"}];
18331829
break;
18341830

18351831
case TAG_ID_EDIT:// EDIT TABLE

‎XBMC Remote/RemoteController.m‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -474,10 +474,6 @@ - (void)audioStreamActionSheet {
474474
}];
475475
}
476476

477-
- (void)playbackAction:(NSString*)action params:(NSDictionary*)parameters {
478-
[self playerAction:action params:parameters];
479-
}
480-
481477
- (void)simpleAction:(NSString*)action params:(NSDictionary*)params xbmcHttp:(NSString*)command {
482478
[self simpleAction:action params:params completion:^(NSString *methodName, NSInteger callId, id methodResult, DSJSONRPCError *methodError, NSError *error) {
483479
// Backwards compatibility for Kodi "Eden" which supports xbmchttp but not JSON API for some commands
@@ -511,7 +507,7 @@ - (void)showActionAudiostreams:(NSArray*)sheetActions {
511507
if (![audiostreamsDictionary[@"audiostreams"][i] isEqual:audiostreamsDictionary[@"currentaudiostream"]]) {
512508
id audiostreamIndex = audiostreamsDictionary[@"audiostreams"][i][@"index"];
513509
if (audiostreamIndex) {
514-
[self playbackAction:@"Player.SetAudioStream" params:@{@"stream": audiostreamIndex}];
510+
[self playerAction:@"Player.SetAudioStream" params:@{@"stream": audiostreamIndex}];
515511
[self showSubInfo:actiontitle color:SUCCESS_MESSAGE_COLOR];
516512
}
517513
}
@@ -541,7 +537,7 @@ - (void)showActionSubtitles:(NSArray*)sheetActions {
541537

542538
UIAlertAction *action_disable = [UIAlertAction actionWithTitle:LOCALIZED_STR(@"Disable subtitles") style:UIAlertActionStyleDestructive handler:^(UIAlertAction *action) {
543539
[self showSubInfo:LOCALIZED_STR(@"Subtitles disabled") color:SUCCESS_MESSAGE_COLOR];
544-
[self playbackAction:@"Player.SetSubtitle" params:@{@"subtitle": @"off"}];
540+
[self playerAction:@"Player.SetSubtitle" params:@{@"subtitle": @"off"}];
545541
}];
546542
if ([subsDictionary[@"subtitleenabled"] boolValue]) {
547543
[alertCtrl addAction:action_disable];
@@ -556,8 +552,8 @@ - (void)showActionSubtitles:(NSArray*)sheetActions {
556552
![subsDictionary[@"subtitleenabled"] boolValue]) {
557553
id subsIndex = subsDictionary[@"subtitles"][i][@"index"];
558554
if (subsIndex) {
559-
[self playbackAction:@"Player.SetSubtitle" params:@{@"subtitle": subsIndex}];
560-
[self playbackAction:@"Player.SetSubtitle" params:@{@"subtitle": @"on"}];
555+
[self playerAction:@"Player.SetSubtitle" params:@{@"subtitle": subsIndex}];
556+
[self playerAction:@"Player.SetSubtitle" params:@{@"subtitle": @"on"}];
561557
[self showSubInfo:actiontitle color:SUCCESS_MESSAGE_COLOR];
562558
}
563559
}
@@ -723,62 +719,62 @@ - (void)processButtonPress:(NSInteger)buttonTag {
723719
case TAG_BUTTON_SEEK_BACKWARD:
724720
action = @"Player.Seek";
725721
params = [Utilities buildPlayerSeekStepParams:@"smallbackward"];
726-
[self playbackAction:action params:params];
722+
[self playerAction:action params:params];
727723
break;
728724

729725
case TAG_BUTTON_SEEK_BACKWARD_BIG:
730726
action = @"Player.Seek";
731727
params = [Utilities buildPlayerSeekStepParams:@"bigbackward"];
732-
[self playbackAction:action params:params];
728+
[self playerAction:action params:params];
733729
break;
734730

735731
case TAG_BUTTON_PLAY_PAUSE:
736732
action = @"Player.PlayPause";
737733
params = nil;
738-
[self playbackAction:action params:nil];
734+
[self playerAction:action params:nil];
739735
break;
740736

741737
case TAG_BUTTON_SEEK_FORWARD:
742738
action = @"Player.Seek";
743739
params = [Utilities buildPlayerSeekStepParams:@"smallforward"];
744-
[self playbackAction:action params:params];
740+
[self playerAction:action params:params];
745741
break;
746742

747743
case TAG_BUTTON_SEEK_FORWARD_BIG:
748744
action = @"Player.Seek";
749745
params = [Utilities buildPlayerSeekStepParams:@"bigforward"];
750-
[self playbackAction:action params:params];
746+
[self playerAction:action params:params];
751747
break;
752748

753749
case TAG_BUTTON_PREVIOUS:
754750
if (AppDelegate.instance.serverVersion > 11) {
755751
action = @"Player.GoTo";
756752
params = @{@"to": @"previous"};
757-
[self playbackAction:action params:params];
753+
[self playerAction:action params:params];
758754
}
759755
else {
760756
action = @"Player.GoPrevious";
761757
params = nil;
762-
[self playbackAction:action params:nil];
758+
[self playerAction:action params:nil];
763759
}
764760
break;
765761

766762
case TAG_BUTTON_STOP:
767763
action = @"Player.Stop";
768764
params = nil;
769-
[self playbackAction:action params:nil];
765+
[self playerAction:action params:nil];
770766
break;
771767

772768
case TAG_BUTTON_NEXT:
773769
if (AppDelegate.instance.serverVersion > 11) {
774770
action = @"Player.GoTo";
775771
params = @{@"to": @"next"};
776-
[self playbackAction:action params:params];
772+
[self playerAction:action params:params];
777773
}
778774
else {
779775
action = @"Player.GoNext";
780776
params = nil;
781-
[self playbackAction:action params:nil];
777+
[self playerAction:action params:nil];
782778
}
783779
break;
784780

@@ -873,11 +869,11 @@ - (void)processButtonLongPress:(NSInteger)buttonTag {
873869
break;
874870

875871
case TAG_BUTTON_SEEK_BACKWARD: // DECREASE PLAYBACK SPEED
876-
[self playbackAction:@"Player.SetSpeed" params:@{@"speed": @"decrement"}];
872+
[self playerAction:@"Player.SetSpeed" params:@{@"speed": @"decrement"}];
877873
break;
878874

879875
case TAG_BUTTON_SEEK_FORWARD: // INCREASE PLAYBACK SPEED
880-
[self playbackAction:@"Player.SetSpeed" params:@{@"speed": @"increment"}];
876+
[self playerAction:@"Player.SetSpeed" params:@{@"speed": @"increment"}];
881877
break;
882878

883879
case TAG_BUTTON_INFO: // CODEC INFO

0 commit comments

Comments
 (0)