Skip to content

Commit dda517a

Browse files
wutschelwutschel
committed
Directly call playerAction:params:
1 parent 01abfd7 commit dda517a

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
@@ -1111,10 +1111,6 @@ - (void)clearPlaylist:(int)playlistID {
11111111
}];
11121112
}
11131113

1114-
- (void)playbackAction:(NSString*)action params:(NSDictionary*)parameters {
1115-
[self playerAction:action params:parameters playerid:currentPlayerID];
1116-
}
1117-
11181114
- (void)updatePartyModePlaylist {
11191115
lastSelected = SELECTED_NONE;
11201116
storeSelection = nil;
@@ -1534,39 +1530,39 @@ - (IBAction)startVibrate:(id)sender {
15341530
if (AppDelegate.instance.serverVersion > 11) {
15351531
action = @"Player.GoTo";
15361532
params = @{@"to": @"previous"};
1537-
[self playbackAction:action params:params];
1533+
[self playerAction:action params:params];
15381534
}
15391535
else {
15401536
action = @"Player.GoPrevious";
15411537
params = nil;
1542-
[self playbackAction:action params:nil];
1538+
[self playerAction:action params:nil];
15431539
}
15441540
ProgressSlider.value = 0;
15451541
break;
15461542

15471543
case TAG_ID_PLAYPAUSE:
15481544
action = @"Player.PlayPause";
15491545
params = nil;
1550-
[self playbackAction:action params:nil];
1546+
[self playerAction:action params:nil];
15511547
break;
15521548

15531549
case TAG_ID_STOP:
15541550
action = @"Player.Stop";
15551551
params = nil;
1556-
[self playbackAction:action params:nil];
1552+
[self playerAction:action params:nil];
15571553
storeSelection = nil;
15581554
break;
15591555

15601556
case TAG_ID_NEXT:
15611557
if (AppDelegate.instance.serverVersion > 11) {
15621558
action = @"Player.GoTo";
15631559
params = @{@"to": @"next"};
1564-
[self playbackAction:action params:params];
1560+
[self playerAction:action params:params];
15651561
}
15661562
else {
15671563
action = @"Player.GoNext";
15681564
params = nil;
1569-
[self playbackAction:action params:nil];
1565+
[self playerAction:action params:nil];
15701566
}
15711567
break;
15721568

@@ -1582,13 +1578,13 @@ - (IBAction)startVibrate:(id)sender {
15821578
case TAG_SEEK_BACKWARD:
15831579
action = @"Player.Seek";
15841580
params = [Utilities buildPlayerSeekStepParams:@"smallbackward"];
1585-
[self playbackAction:action params:params];
1581+
[self playerAction:action params:params];
15861582
break;
15871583

15881584
case TAG_SEEK_FORWARD:
15891585
action = @"Player.Seek";
15901586
params = [Utilities buildPlayerSeekStepParams:@"smallforward"];
1591-
[self playbackAction:action params:params];
1587+
[self playerAction:action params:params];
15921588
break;
15931589

15941590
default:
@@ -1673,10 +1669,10 @@ - (IBAction)changeRepeat:(id)sender {
16731669

16741670
// Send the command to Kodi
16751671
if (AppDelegate.instance.serverVersion > 11) {
1676-
[self playbackAction:@"Player.SetRepeat" params:@{@"playerid": @(currentPlayerID), @"repeat": @"cycle"}];
1672+
[self playerAction:@"Player.SetRepeat" params:@{@"playerid": @(currentPlayerID), @"repeat": @"cycle"}];
16771673
}
16781674
else {
1679-
[self playbackAction:@"Player.Repeat" params:@{@"playerid": @(currentPlayerID), @"state": newRepeatStatus}];
1675+
[self playerAction:@"Player.Repeat" params:@{@"playerid": @(currentPlayerID), @"state": newRepeatStatus}];
16801676
}
16811677

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

18321828
case TAG_SEEK_FORWARD:// FORWARD BUTTON - INCREASE PLAYBACK SPEED
1833-
[self playbackAction:@"Player.SetSpeed" params:@{@"speed": @"increment"}];
1829+
[self playerAction:@"Player.SetSpeed" params:@{@"speed": @"increment"}];
18341830
break;
18351831

18361832
case TAG_ID_EDIT:// EDIT TABLE

‎XBMC Remote/RemoteController.m‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -460,10 +460,6 @@ - (void)audioStreamActionSheet {
460460
}];
461461
}
462462

463-
- (void)playbackAction:(NSString*)action params:(NSDictionary*)parameters {
464-
[self playerAction:action params:parameters];
465-
}
466-
467463
- (void)simpleAction:(NSString*)action params:(NSDictionary*)params xbmcHttp:(NSString*)command {
468464
[self simpleAction:action params:params completion:^(NSString *methodName, NSInteger callId, id methodResult, DSJSONRPCError *methodError, NSError *error) {
469465
// Backwards compatibility for Kodi "Eden" which supports xbmchttp but not JSON API for some commands
@@ -497,7 +493,7 @@ - (void)showActionAudiostreams:(NSArray*)sheetActions {
497493
if (![audiostreamsDictionary[@"audiostreams"][i] isEqual:audiostreamsDictionary[@"currentaudiostream"]]) {
498494
id audiostreamIndex = audiostreamsDictionary[@"audiostreams"][i][@"index"];
499495
if (audiostreamIndex) {
500-
[self playbackAction:@"Player.SetAudioStream" params:@{@"stream": audiostreamIndex}];
496+
[self playerAction:@"Player.SetAudioStream" params:@{@"stream": audiostreamIndex}];
501497
[self showSubInfo:actiontitle color:SUCCESS_MESSAGE_COLOR];
502498
}
503499
}
@@ -527,7 +523,7 @@ - (void)showActionSubtitles:(NSArray*)sheetActions {
527523

528524
UIAlertAction *action_disable = [UIAlertAction actionWithTitle:LOCALIZED_STR(@"Disable subtitles") style:UIAlertActionStyleDestructive handler:^(UIAlertAction *action) {
529525
[self showSubInfo:LOCALIZED_STR(@"Subtitles disabled") color:SUCCESS_MESSAGE_COLOR];
530-
[self playbackAction:@"Player.SetSubtitle" params:@{@"subtitle": @"off"}];
526+
[self playerAction:@"Player.SetSubtitle" params:@{@"subtitle": @"off"}];
531527
}];
532528
if ([subsDictionary[@"subtitleenabled"] boolValue]) {
533529
[alertCtrl addAction:action_disable];
@@ -542,8 +538,8 @@ - (void)showActionSubtitles:(NSArray*)sheetActions {
542538
![subsDictionary[@"subtitleenabled"] boolValue]) {
543539
id subsIndex = subsDictionary[@"subtitles"][i][@"index"];
544540
if (subsIndex) {
545-
[self playbackAction:@"Player.SetSubtitle" params:@{@"subtitle": subsIndex}];
546-
[self playbackAction:@"Player.SetSubtitle" params:@{@"subtitle": @"on"}];
541+
[self playerAction:@"Player.SetSubtitle" params:@{@"subtitle": subsIndex}];
542+
[self playerAction:@"Player.SetSubtitle" params:@{@"subtitle": @"on"}];
547543
[self showSubInfo:actiontitle color:SUCCESS_MESSAGE_COLOR];
548544
}
549545
}
@@ -709,62 +705,62 @@ - (void)processButtonPress:(NSInteger)buttonTag {
709705
case TAG_BUTTON_SEEK_BACKWARD:
710706
action = @"Player.Seek";
711707
params = [Utilities buildPlayerSeekStepParams:@"smallbackward"];
712-
[self playbackAction:action params:params];
708+
[self playerAction:action params:params];
713709
break;
714710

715711
case TAG_BUTTON_SEEK_BACKWARD_BIG:
716712
action = @"Player.Seek";
717713
params = [Utilities buildPlayerSeekStepParams:@"bigbackward"];
718-
[self playbackAction:action params:params];
714+
[self playerAction:action params:params];
719715
break;
720716

721717
case TAG_BUTTON_PLAY_PAUSE:
722718
action = @"Player.PlayPause";
723719
params = nil;
724-
[self playbackAction:action params:nil];
720+
[self playerAction:action params:nil];
725721
break;
726722

727723
case TAG_BUTTON_SEEK_FORWARD:
728724
action = @"Player.Seek";
729725
params = [Utilities buildPlayerSeekStepParams:@"smallforward"];
730-
[self playbackAction:action params:params];
726+
[self playerAction:action params:params];
731727
break;
732728

733729
case TAG_BUTTON_SEEK_FORWARD_BIG:
734730
action = @"Player.Seek";
735731
params = [Utilities buildPlayerSeekStepParams:@"bigforward"];
736-
[self playbackAction:action params:params];
732+
[self playerAction:action params:params];
737733
break;
738734

739735
case TAG_BUTTON_PREVIOUS:
740736
if (AppDelegate.instance.serverVersion > 11) {
741737
action = @"Player.GoTo";
742738
params = @{@"to": @"previous"};
743-
[self playbackAction:action params:params];
739+
[self playerAction:action params:params];
744740
}
745741
else {
746742
action = @"Player.GoPrevious";
747743
params = nil;
748-
[self playbackAction:action params:nil];
744+
[self playerAction:action params:nil];
749745
}
750746
break;
751747

752748
case TAG_BUTTON_STOP:
753749
action = @"Player.Stop";
754750
params = nil;
755-
[self playbackAction:action params:nil];
751+
[self playerAction:action params:nil];
756752
break;
757753

758754
case TAG_BUTTON_NEXT:
759755
if (AppDelegate.instance.serverVersion > 11) {
760756
action = @"Player.GoTo";
761757
params = @{@"to": @"next"};
762-
[self playbackAction:action params:params];
758+
[self playerAction:action params:params];
763759
}
764760
else {
765761
action = @"Player.GoNext";
766762
params = nil;
767-
[self playbackAction:action params:nil];
763+
[self playerAction:action params:nil];
768764
}
769765
break;
770766

@@ -859,11 +855,11 @@ - (void)processButtonLongPress:(NSInteger)buttonTag {
859855
break;
860856

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

865861
case TAG_BUTTON_SEEK_FORWARD: // INCREASE PLAYBACK SPEED
866-
[self playbackAction:@"Player.SetSpeed" params:@{@"speed": @"increment"}];
862+
[self playerAction:@"Player.SetSpeed" params:@{@"speed": @"increment"}];
867863
break;
868864

869865
case TAG_BUTTON_INFO: // CODEC INFO

0 commit comments

Comments
 (0)