Rework of vout_OSDEpg.

[vlc] / projects / macosx / vlc_app / Sources / VLCController.m

diff --git a/projects/macosx/vlc_app/Sources/VLCController.m b/projects/macosx/vlc_app/Sources/VLCController.m
index 38a5e3854e146ead35b26540956403c77bd3ea41..53dea37067b77d59213aa66ca165e61f3bdd2e18 100644 (file)
--- a/projects/macosx/vlc_app/Sources/VLCController.m
+++ b/projects/macosx/vlc_app/Sources/VLCController.m
@@ -52,6 +52,9 @@
     VLCURLToRepresentedFileNameTransformer *urlToRepresentedFileName;
     urlToRepresentedFileName = [[[VLCURLToRepresentedFileNameTransformer alloc] init] autorelease];
     [NSValueTransformer setValueTransformer:(id)urlToRepresentedFileName forName:@"URLToRepresentedFileNameTransformer"];
+    VLCSelectionIndexToDescriptionTransformer *indexToDescription;
+    indexToDescription = [[[VLCSelectionIndexToDescriptionTransformer alloc] init] autorelease];
+    [NSValueTransformer setValueTransformer:(id)indexToDescription forName:@"SelectionIndexToDescriptionTransformer"];
 
     /***********************************
      * categories: Main content
@@ -59,17 +62,8 @@
     NSArray * mediaDiscoverers = [NSArray arrayWithObjects:
         [[[VLCMediaDiscoverer alloc] initWithName:@"shoutcasttv"] autorelease],
         [[[VLCMediaDiscoverer alloc] initWithName:@"shoutcast"] autorelease],
-        [[[VLCMediaDiscoverer alloc] initWithName:@"sap"] autorelease], nil];
-
-    NSArray * playlists = [NSMutableArray arrayWithObjects:[VLCMedia mediaAsNodeWithName:@"Default Playlist"], nil];
-
-    NSDictionary * playlistsAsDictionary = [NSMutableDictionary dictionaryWithObjectsAndKeys:
-                                [@"Playlists" uppercaseString], @"descriptionInCategoriesList",
-                                @"Playlists", @"descriptionInVideoView",
-                                [NSNumber numberWithBool:NO], @"selectableInCategoriesList",
-                                playlists, @"childrenInCategoriesList",
-                                playlists, @"childrenInVideoView",
-                                nil];
+        [[[VLCMediaDiscoverer alloc] initWithName:@"sap"] autorelease],
+        [[[VLCMediaDiscoverer alloc] initWithName:@"freebox"] autorelease], nil];
 
     self.categories = [NSArray arrayWithObjects:
                     [NSMutableDictionary dictionaryWithObjectsAndKeys:
@@ -79,7 +73,7 @@
                         mediaDiscoverers, @"childrenInCategoriesList",
                         mediaDiscoverers, @"childrenInVideoView",
                         nil],
-                    playlistsAsDictionary,
+                    [VLCMedia mediaAsNodeWithName:@"Playlist"],
                     nil];
 
     /* Execution will continue in applicationDidFinishLaunching */