Merge pull request #1248 from wutschel/play_tv_directly

Improvement: Play TV/Radio channels on selection Maintenance: Rework menu parameters forcePlayback and forceActionsheet
xbmc · Feb 23, 2025 · 908d6a6 · 908d6a6
2 parents 1b9f538 + d3357be
commit 908d6a6
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 25 deletions.
diff --git a/XBMC Remote/AppDelegate.m b/XBMC Remote/AppDelegate.m
@@ -4296,6 +4296,7 @@ - (BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(N
             @"thumbWidth": @LIVETV_THUMB_WIDTH_SMALL,
             @"enableCollectionView": @YES,
             @"itemSizes": [self itemSizes_Music],
+            @"forcePlayback": @YES,
         },
 
         @{
@@ -4622,7 +4623,6 @@ - (BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(N
             @"rowHeight": @CHANNEL_EPG_ROW_HEIGHT,
             @"thumbWidth": @LIVETV_THUMB_WIDTH,
             @"itemSizes": [self itemSizes_Music],
-            @"forceActionSheet": @YES,
         },
 
         @{
@@ -4645,6 +4645,7 @@ - (BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(N
             @"thumbWidth": @LIVETV_THUMB_WIDTH_SMALL,
             @"enableCollectionView": @YES,
             @"itemSizes": [self itemSizes_Music],
+            @"forcePlayback": @YES,
         },
 
         @{},
@@ -4747,7 +4748,6 @@ - (BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(N
             @"rowHeight": @CHANNEL_EPG_ROW_HEIGHT,
             @"thumbWidth": @LIVETV_THUMB_WIDTH,
             @"itemSizes": [self itemSizes_Music],
-            @"forceActionSheet": @YES,
         },
 
         @{},
@@ -4851,6 +4851,7 @@ - (BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(N
             @"thumbWidth": @LIVETV_THUMB_WIDTH_SMALL,
             @"enableCollectionView": @YES,
             @"itemSizes": [self itemSizes_Music],
+            @"forcePlayback": @YES,
         },
 
         @{
@@ -5175,7 +5176,6 @@ - (BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(N
             @"rowHeight": @CHANNEL_EPG_ROW_HEIGHT,
             @"thumbWidth": @LIVETV_THUMB_WIDTH,
             @"itemSizes": [self itemSizes_Music],
-            @"forceActionSheet": @YES,
         },
 
         @{
@@ -5198,6 +5198,7 @@ - (BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(N
             @"thumbWidth": @LIVETV_THUMB_WIDTH_SMALL,
             @"enableCollectionView": @YES,
             @"itemSizes": [self itemSizes_Music],
+            @"forcePlayback": @YES,
         },
 
         @{},
@@ -5300,7 +5301,6 @@ - (BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(N
             @"rowHeight": @CHANNEL_EPG_ROW_HEIGHT,
             @"thumbWidth": @LIVETV_THUMB_WIDTH,
             @"itemSizes": [self itemSizes_Music],
-            @"forceActionSheet": @YES,
         },
 
         @{},
@@ -5715,6 +5715,7 @@ - (BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(N
             @"thumbWidth": @SETTINGS_THUMB_WIDTH_BIG,
             @"itemSizes": [self itemSizes_Music],
             @"enableCollectionView": @YES,
+            @"forceActionSheet": @YES,
         },
 
         @{
@@ -5734,6 +5735,7 @@ - (BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(N
             @"thumbWidth": @SETTINGS_THUMB_WIDTH_BIG,
             @"itemSizes": [self itemSizes_Music],
             @"enableCollectionView": @YES,
+            @"forceActionSheet": @YES,
         },
 
         @{
@@ -5753,6 +5755,7 @@ - (BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(N
             @"thumbWidth": @SETTINGS_THUMB_WIDTH_BIG,
             @"itemSizes": [self itemSizes_Music],
             @"enableCollectionView": @YES,
+            @"forceActionSheet": @YES,
         },
 
         @{
@@ -5767,6 +5770,7 @@ - (BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(N
             @"rowHeight": @FILEMODE_ROW_HEIGHT,
             @"thumbWidth": @0,
             @"morelabel": LOCALIZED_STR(@"Execute a specific action"),
+            @"forceActionSheet": @YES,
         },
 
         @{
@@ -5781,6 +5785,7 @@ - (BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(N
             @"rowHeight": @FILEMODE_ROW_HEIGHT,
             @"thumbWidth": @0,
             @"morelabel": LOCALIZED_STR(@"Activate a specific window"),
+            @"forceActionSheet": @YES,
         },
     ] mutableCopy];
 
@@ -5911,26 +5916,11 @@ - (BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(N
             @"rowHeight": @SETTINGS_ROW_HEIGHT,
             @"thumbWidth": @0,
         },
-
-        @{
-            @"forceActionSheet": @YES,
-        },
-
-        @{
-            @"forceActionSheet": @YES,
-        },
-
-        @{
-            @"forceActionSheet": @YES,
-        },
-
-        @{
-            @"forceActionSheet": @YES,
-        },
-
-        @{
-            @"forceActionSheet": @YES,
-        },
+        @{},
+        @{},
+        @{},
+        @{},
+        @{},
     ] mutableCopy];
 
     xbmcSettings.subItem.mainFields = @[

diff --git a/XBMC Remote/DetailViewController.m b/XBMC Remote/DetailViewController.m
@@ -1424,6 +1424,7 @@ - (void)viewChild:(NSIndexPath*)indexPath item:(NSDictionary*)item displayPoint:
                                               @([parameters[@"FrodoExtraArt"] boolValue]), @"FrodoExtraArt",
                                               @([parameters[@"enableLibraryCache"] boolValue]), @"enableLibraryCache",
                                               @([parameters[@"enableCollectionView"] boolValue]), @"enableCollectionView",
+                                              @([parameters[@"forcePlayback"] boolValue]), @"forcePlayback",
                                               @([parameters[@"forceActionSheet"] boolValue]), @"forceActionSheet",
                                               @([parameters[@"collectionViewRecentlyAdded"] boolValue]), @"collectionViewRecentlyAdded",
                                               @([parameters[@"blackTableSeparator"] boolValue]), @"blackTableSeparator",
@@ -1547,7 +1548,7 @@ - (void)didSelectItemAtIndexPath:(NSIndexPath*)indexPath item:(NSDictionary*)ite
     int activeTab = [self getActiveTab:item];
     NSDictionary *methods = menuItem.subItem.mainMethod[activeTab];
     NSMutableArray *sheetActions = [menuItem.sheetActions[activeTab] mutableCopy];
-    NSMutableDictionary *parameters = menuItem.subItem.mainParameters[activeTab];
+    NSMutableDictionary *parameters = menuItem.mainParameters[activeTab];
     if ([item[@"family"] isEqualToString:@"id"]) {
         if (IS_IPHONE) {
             SettingsValuesViewController *settingsViewController = [[SettingsValuesViewController alloc] initWithFrame:CGRectMake(0, 0, self.view.bounds.size.width, self.view.bounds.size.height) withItem:item];
@@ -1601,6 +1602,9 @@ - (void)didSelectItemAtIndexPath:(NSIndexPath*)indexPath item:(NSDictionary*)ite
         }
         [self deselectAtIndexPath:indexPath];
     }
+    else if ([parameters[@"forcePlayback"] boolValue]) {
+        [self addPlayback:item indexPath:indexPath position:indexPath.row shuffle:NO];
+    }
     else if (methods[@"method"] != nil && ![parameters[@"forceActionSheet"] boolValue] && !stackscrollFullscreen) {
         // There is a child and we want to show it (only when not in fullscreen)
         [self viewChild:indexPath item:item displayPoint:point];