macosx: Ignore attachment:// in Art uri for now.

[vlc] / modules / gui / macosx / wizard.m

diff --git a/modules/gui/macosx/wizard.m b/modules/gui/macosx/wizard.m
index f0f3cb09030edd0df5260310c3abab466bd978bd..ade0a61f7f21cd7661e39707e60e0255630389e7 100644 (file)
--- a/modules/gui/macosx/wizard.m
+++ b/modules/gui/macosx/wizard.m
@@ -477,7 +477,7 @@ static VLCWizard *_o_sharedInstance = nil;
     [o_wizard_window close];
 }
 
-- (id)getPlaylistWizard
+- (id)playlistWizard
 {
     return o_playlist_wizard;
 }
@@ -1053,7 +1053,8 @@ static VLCWizard *_o_sharedInstance = nil;
         if (anythingEnabled == YES)
         {
             /* re-select the previously chosen item, if available */
-            [o_t5_matrix_encap selectCellWithTag: i_temp];
+            if( [[o_t5_matrix_encap cellWithTag: i_temp] isEnabled] )
+                [o_t5_matrix_encap selectCellWithTag: i_temp];
 
             /* go the encap-tab */
             [o_tab_pageHolder selectTabViewItemAtIndex:4];
@@ -1277,14 +1278,16 @@ static VLCWizard *_o_sharedInstance = nil;
                 objectAtIndex:x] UTF8String],
                 [tempString UTF8String] );
             input_item_AddOption( p_input, [[[o_userSelections
-                objectForKey:@"opts"] objectAtIndex: x] UTF8String]);
+                objectForKey:@"opts"] objectAtIndex: x] UTF8String],
+                VLC_INPUT_OPTION_TRUSTED );
 
             if(! [[o_userSelections objectForKey:@"partExtractFrom"]
                 isEqualToString:@""] )
             {
                 input_item_AddOption( p_input, [[NSString
                     stringWithFormat: @"start-time=%@", [o_userSelections
-                    objectForKey: @"partExtractFrom"]] UTF8String] );
+                    objectForKey: @"partExtractFrom"]] UTF8String],
+                                       VLC_INPUT_OPTION_TRUSTED );
             }
 
             if(! [[o_userSelections objectForKey:@"partExtractTo"]
@@ -1292,12 +1295,14 @@ static VLCWizard *_o_sharedInstance = nil;
             {
                 input_item_AddOption( p_input, [[NSString
                     stringWithFormat: @"stop-time=%@", [o_userSelections
-                    objectForKey: @"partExtractTo"]] UTF8String] );
+                    objectForKey: @"partExtractTo"]] UTF8String],
+                    VLC_INPUT_OPTION_TRUSTED );
             }
 
             input_item_AddOption( p_input, [[NSString stringWithFormat:
                 @"ttl=%@", [o_userSelections objectForKey:@"ttl"]]
-                UTF8String] );
+                UTF8String],
+                VLC_INPUT_OPTION_TRUSTED );
 
             /* FIXME: playlist_AddInput() can fail */
             playlist_AddInput( p_playlist, p_input, PLAYLIST_STOP,
@@ -1307,7 +1312,7 @@ static VLCWizard *_o_sharedInstance = nil;
             {
                 /* play the first item and add the others afterwards */
                 PL_LOCK;
-                playlist_item_t *p_item = playlist_ItemGetByInput( p_playlist, p_input, pl_Locked );
+                playlist_item_t *p_item = playlist_ItemGetByInput( p_playlist, p_input );
                 playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Locked, NULL,
                           p_item );
                 PL_UNLOCK;
@@ -1317,7 +1322,7 @@ static VLCWizard *_o_sharedInstance = nil;
             x += 1;
         }
 
-        vlc_object_release( p_playlist );
+        pl_Release( p_intf );
 
         /* close the window, since we are done */
         [o_wizard_window close];
@@ -1660,7 +1665,7 @@ static VLCWizard *_o_sharedInstance = nil;
         @"Input"])
     {
         /* reset the wizard before going backwards. Otherwise, we might get
-         * unwanted behaviours in the Encap-Selection */
+         * unwanted behaviour in the Encap-Selection */
         [self resetWizard];
         /* show "Hello" */
         [o_tab_pageHolder selectTabViewItemAtIndex:0];