* fixed a bug which prevented the fspanel to show up in some circumstances. Patch...

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

diff --git a/modules/gui/macosx/wizard.m b/modules/gui/macosx/wizard.m
index 9d950b35ade6d33c515a5f9b95994c8e584caced..c2f3845f758bcad8fc0000244789ef86ead607e6 100644 (file)
--- a/modules/gui/macosx/wizard.m
+++ b/modules/gui/macosx/wizard.m
@@ -33,9 +33,8 @@
  *****************************************************************************/
 #import "wizard.h"
 #import "intf.h"
-#import "network.h"
 #import "playlist.h"
-#import <vlc/intf.h>
+#import <vlc_interface.h>
 
 /*****************************************************************************
  * VLCWizard implementation
@@ -306,7 +305,7 @@ static VLCWizard *_o_sharedInstance = nil;
 - (void)resetWizard
 {
     /* get the current state of our setting to keep the selections or not */
-    keepSettingsOrNot = (BOOL *)config_GetInt( VLCIntf, "macosx-wizard-keep" );
+    b_keepSettingsOrNot = (BOOL)config_GetInt( VLCIntf, "macosx-wizard-keep" );
 
     /* go to the front page and clean up a bit */
     [o_userSelections removeAllObjects];
@@ -314,7 +313,7 @@ static VLCWizard *_o_sharedInstance = nil;
     [o_tab_pageHolder selectFirstTabViewItem:self];
 
     
-    if( keepSettingsOrNot )
+    if( b_keepSettingsOrNot )
         return;
     
     /* reset the wizard-window to its default values if wanted */
@@ -1198,10 +1197,10 @@ static VLCWizard *_o_sharedInstance = nil;
                     /* check whether the extension is hidden or not. 
                      * if not, remove it
                      * we need the casting to make GCC4 happy */
-                    if( (int)[[[NSFileManager defaultManager] fileAttributesAtPath: \
+                    if( [[[NSFileManager defaultManager] fileAttributesAtPath: \
                         [[o_userSelections objectForKey:@"pathToStrm"] \
                         objectAtIndex: x] traverseLink: NO] objectForKey: \
-                        NSFileExtensionHidden] == YES )
+                        NSFileExtensionHidden] )
                         fileNameToUse = [NSString stringWithString:
                             [[NSFileManager defaultManager] displayNameAtPath:
                             [[o_userSelections objectForKey:@"pathToStrm"]
@@ -1320,8 +1319,8 @@ static VLCWizard *_o_sharedInstance = nil;
             if( x == 0 )
             {
                 /* play the first item and add the others afterwards */
-                playlist_item_t *p_item = playlist_ItemGetByInput( p_playlist, p_input );
-                playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, NULL,
+                playlist_item_t *p_item = playlist_ItemGetByInput( p_playlist, p_input, VLC_TRUE );
+                playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, VLC_TRUE, NULL,
                           p_item );
             }
 
@@ -1348,7 +1347,7 @@ static VLCWizard *_o_sharedInstance = nil;
             objectAtIndex:0]];
         x += 1;
     }
-    if( keepSettingsOrNot && savePreviousSel >= 0 )
+    if( b_keepSettingsOrNot && savePreviousSel >= 0 )
         [o_t4_pop_videoCodec selectItemAtIndex: savePreviousSel];
 
     savePreviousSel = [o_t4_pop_audioCodec indexOfSelectedItem];
@@ -1360,7 +1359,7 @@ static VLCWizard *_o_sharedInstance = nil;
             objectAtIndex:0]];
         x += 1;
     }
-    if( keepSettingsOrNot && savePreviousSel >= 0 )
+    if( b_keepSettingsOrNot && savePreviousSel >= 0 )
         [o_t4_pop_audioCodec selectItemAtIndex: savePreviousSel];
 }