Skip to content

Commit ae718ca

Browse files
wutschelwutschel
committed
Directly call playerAction:params:
1 parent ad3eafb commit ae718ca

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
@@ -456,10 +456,6 @@ - (void)audioStreamActionSheet {
456456
}];
457457
}
458458

459-
- (void)playbackAction:(NSString*)action params:(NSDictionary*)parameters {
460-
[self playerAction:action params:parameters];
461-
}
462-
463459
- (void)simpleAction:(NSString*)action params:(NSDictionary*)params xbmcHttp:(NSString*)command {
464460
[self simpleAction:action params:params completion:^(NSString *methodName, NSInteger callId, id methodResult, DSJSONRPCError *methodError, NSError *error) {
465461
// Backwards compatibility for Kodi "Eden" which supports xbmchttp but not JSON API for some commands
@@ -493,7 +489,7 @@ - (void)showActionAudiostreams:(NSArray*)sheetActions {
493489
if (![audiostreamsDictionary[@"audiostreams"][i] isEqual:audiostreamsDictionary[@"currentaudiostream"]]) {
494490
id audiostreamIndex = audiostreamsDictionary[@"audiostreams"][i][@"index"];
495491
if (audiostreamIndex) {
496-
[self playbackAction:@"Player.SetAudioStream" params:@{@"stream": audiostreamIndex}];
492+
[self playerAction:@"Player.SetAudioStream" params:@{@"stream": audiostreamIndex}];
497493
[self showSubInfo:actiontitle color:SUCCESS_MESSAGE_COLOR];
498494
}
499495
}
@@ -523,7 +519,7 @@ - (void)showActionSubtitles:(NSArray*)sheetActions {
523519

524520
UIAlertAction *action_disable = [UIAlertAction actionWithTitle:LOCALIZED_STR(@"Disable subtitles") style:UIAlertActionStyleDestructive handler:^(UIAlertAction *action) {
525521
[self showSubInfo:LOCALIZED_STR(@"Subtitles disabled") color:SUCCESS_MESSAGE_COLOR];
526-
[self playbackAction:@"Player.SetSubtitle" params:@{@"subtitle": @"off"}];
522+
[self playerAction:@"Player.SetSubtitle" params:@{@"subtitle": @"off"}];
527523
}];
528524
if ([subsDictionary[@"subtitleenabled"] boolValue]) {
529525
[alertCtrl addAction:action_disable];
@@ -538,8 +534,8 @@ - (void)showActionSubtitles:(NSArray*)sheetActions {
538534
![subsDictionary[@"subtitleenabled"] boolValue]) {
539535
id subsIndex = subsDictionary[@"subtitles"][i][@"index"];
540536
if (subsIndex) {
541-
[self playbackAction:@"Player.SetSubtitle" params:@{@"subtitle": subsIndex}];
542-
[self playbackAction:@"Player.SetSubtitle" params:@{@"subtitle": @"on"}];
537+
[self playerAction:@"Player.SetSubtitle" params:@{@"subtitle": subsIndex}];
538+
[self playerAction:@"Player.SetSubtitle" params:@{@"subtitle": @"on"}];
543539
[self showSubInfo:actiontitle color:SUCCESS_MESSAGE_COLOR];
544540
}
545541
}
@@ -705,62 +701,62 @@ - (void)processButtonPress:(NSInteger)buttonTag {
705701
case TAG_BUTTON_SEEK_BACKWARD:
706702
action = @"Player.Seek";
707703
params = [Utilities buildPlayerSeekStepParams:@"smallbackward"];
708-
[self playbackAction:action params:params];
704+
[self playerAction:action params:params];
709705
break;
710706

711707
case TAG_BUTTON_SEEK_BACKWARD_BIG:
712708
action = @"Player.Seek";
713709
params = [Utilities buildPlayerSeekStepParams:@"bigbackward"];
714-
[self playbackAction:action params:params];
710+
[self playerAction:action params:params];
715711
break;
716712

717713
case TAG_BUTTON_PLAY_PAUSE:
718714
action = @"Player.PlayPause";
719715
params = nil;
720-
[self playbackAction:action params:nil];
716+
[self playerAction:action params:nil];
721717
break;
722718

723719
case TAG_BUTTON_SEEK_FORWARD:
724720
action = @"Player.Seek";
725721
params = [Utilities buildPlayerSeekStepParams:@"smallforward"];
726-
[self playbackAction:action params:params];
722+
[self playerAction:action params:params];
727723
break;
728724

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

735731
case TAG_BUTTON_PREVIOUS:
736732
if (AppDelegate.instance.serverVersion > 11) {
737733
action = @"Player.GoTo";
738734
params = @{@"to": @"previous"};
739-
[self playbackAction:action params:params];
735+
[self playerAction:action params:params];
740736
}
741737
else {
742738
action = @"Player.GoPrevious";
743739
params = nil;
744-
[self playbackAction:action params:nil];
740+
[self playerAction:action params:nil];
745741
}
746742
break;
747743

748744
case TAG_BUTTON_STOP:
749745
action = @"Player.Stop";
750746
params = nil;
751-
[self playbackAction:action params:nil];
747+
[self playerAction:action params:nil];
752748
break;
753749

754750
case TAG_BUTTON_NEXT:
755751
if (AppDelegate.instance.serverVersion > 11) {
756752
action = @"Player.GoTo";
757753
params = @{@"to": @"next"};
758-
[self playbackAction:action params:params];
754+
[self playerAction:action params:params];
759755
}
760756
else {
761757
action = @"Player.GoNext";
762758
params = nil;
763-
[self playbackAction:action params:nil];
759+
[self playerAction:action params:nil];
764760
}
765761
break;
766762

@@ -855,11 +851,11 @@ - (void)processButtonLongPress:(NSInteger)buttonTag {
855851
break;
856852

857853
case TAG_BUTTON_SEEK_BACKWARD: // DECREASE PLAYBACK SPEED
858-
[self playbackAction:@"Player.SetSpeed" params:@{@"speed": @"decrement"}];
854+
[self playerAction:@"Player.SetSpeed" params:@{@"speed": @"decrement"}];
859855
break;
860856

861857
case TAG_BUTTON_SEEK_FORWARD: // INCREASE PLAYBACK SPEED
862-
[self playbackAction:@"Player.SetSpeed" params:@{@"speed": @"increment"}];
858+
[self playerAction:@"Player.SetSpeed" params:@{@"speed": @"increment"}];
863859
break;
864860

865861
case TAG_BUTTON_INFO: // CODEC INFO

0 commit comments

Comments
 (0)