* Remove the old info window from SVN.

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

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 6941b578942b57ce9508df93ea43031408d9e434..4a692321acbb8eb3bd4cc051403cc5ac431d100e 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -35,7 +35,6 @@
 #include "vout.h"
 #include "prefs.h"
 #include "playlist.h"
-#include "info.h"
 #include "controls.h"
 
 /*****************************************************************************
@@ -59,7 +58,7 @@ int E_(OpenIntf) ( vlc_object_t *p_this )
     memset( p_intf->p_sys, 0, sizeof( *p_intf->p_sys ) );
     
     p_intf->p_sys->o_pool = [[NSAutoreleasePool alloc] init];
-    
+
     /* Put Cocoa into multithread mode as soon as possible.
      * http://developer.apple.com/techpubs/macosx/Cocoa/
      * TasksAndConcepts/ProgrammingTopics/Multithreading/index.html
@@ -68,12 +67,12 @@ int E_(OpenIntf) ( vlc_object_t *p_this )
     
     p_intf->p_sys->o_sendport = [[NSPort port] retain];
     p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
+    p_intf->b_play = VLC_TRUE;
     p_intf->pf_run = Run;
     
-    [[VLCApplication sharedApplication] autorelease];
+    [VLCApplication sharedApplication];
     [NSApp setIntf: p_intf];
 
-
     [NSBundle loadNibNamed: @"MainMenu" owner: NSApp];
 
     return( 0 );
@@ -210,6 +209,7 @@ static void Run( intf_thread_t *p_intf )
 - (void)terminate:(id)sender
 {
     p_intf->p_vlc->b_die = VLC_TRUE;
+    [super terminate:sender];
 }
 
 
@@ -421,6 +421,7 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
 {
     unsigned int i_key = 0;
     intf_thread_t * p_intf = [NSApp getIntf];
+    playlist_t *p_playlist;
     vlc_value_t val;
 
     [self initStrings];
@@ -480,15 +481,23 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
     [o_mi_fullscreen setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
     [o_mi_fullscreen setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
 
-    var_Create (p_intf, "fullscreen", VLC_VAR_BOOL );
-    var_Change (p_intf, "fullscreen", VLC_VAR_INHERITVALUE, &val, NULL );
-    [o_btn_fullscreen setState: val.b_bool];
-
-    var_Create(p_intf,"intf-change",VLC_VAR_BOOL );
+    var_Create( p_intf, "intf-change", VLC_VAR_BOOL );
 
     [self setSubmenusEnabled: FALSE];
     [self manageVolumeSlider];
+    
+    p_playlist = (playlist_t *) vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
 
+    if( p_playlist )
+    {
+        /* Check if we need to start playing */
+        if( p_intf->b_play )
+        {
+            playlist_Play( p_playlist );
+        }
+        [o_btn_fullscreen setState: ( var_Get( p_playlist, "fullscreen", &val )>=0 && val.b_bool )];
+        vlc_object_release( p_playlist );
+    }
 }
 
 - (void)initStrings
@@ -516,6 +525,7 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
     [o_mi_prefs setTitle: _NS("Preferences...")];
     [o_mi_add_intf setTitle: _NS("Add Interface")];
     [o_mu_add_intf setTitle: _NS("Add Interface")];
+    [o_mi_services setTitle: _NS("Services")];
     [o_mi_hide setTitle: _NS("Hide VLC")];
     [o_mi_hide_others setTitle: _NS("Hide Others")];
     [o_mi_show_all setTitle: _NS("Show All")];
@@ -615,7 +625,7 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
     [o_err_bug_lbl setStringValue: _NS("If you believe that it is a bug, please follow the instructions at:")]; 
     [o_err_btn_msgs setTitle: _NS("Open Messages Window")];
     [o_err_btn_dismiss setTitle: _NS("Dismiss")];
-    [o_err_ckbk_surpress setTitle: _NS("Surpress further errors")];
+    [o_err_ckbk_surpress setTitle: _NS("Suppress further errors")];
 
     [o_info_window setTitle: _NS("Info")];
 }
@@ -677,6 +687,15 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
     return nil;
 }
 
+- (id)getInfo
+{
+    if ( o_info )
+    {
+        return o_info;
+    }
+    return  nil;
+}
+
 - (void)manage
 {
     NSDate * o_sleep_date;
@@ -801,7 +820,7 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
             vlc_object_release( (vlc_object_t *)p_vout );
         }
         [o_playlist updateRowSelection];
-        [o_info updateInfo];
+//        [o_info updateInfo];
 
         p_intf->p_sys->b_current_title_update = FALSE;
     }
@@ -850,23 +869,18 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
         p_intf->p_sys->b_intf_update = VLC_FALSE;
     }
 
-    if (p_intf->p_sys->b_fullscreen_update )
+    if( p_intf->p_sys->b_fullscreen_update )
     {
         vout_thread_t * p_vout;
         vlc_value_t val;
-        if (var_Change (p_intf, "fullscreen", VLC_VAR_INHERITVALUE, &val, NULL)>=0 &&  val.b_bool )
-        {
-            [o_btn_fullscreen setState:VLC_TRUE];
-        }
-        else
-        {
-            [o_btn_fullscreen setState:VLC_FALSE];
-        }
-        p_vout = vlc_object_find(p_intf,VLC_OBJECT_VOUT,FIND_ANYWHERE);
-        if (p_vout != NULL)
+ 
+        [o_btn_fullscreen setState: ( var_Get( p_playlist, "fullscreen", &val )>=0 && val.b_bool ) ];
+        
+        p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE );
+        if( p_vout != NULL )
         {
             [o_btn_fullscreen setEnabled: VLC_TRUE];
-            vlc_object_release(p_vout);
+            vlc_object_release( p_vout );
         }
         else
         {
@@ -1247,6 +1261,7 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
         o_msg_lock = nil;
     }
 
+    [NSApp terminate: nil];
     [NSApp stop: nil];
 
     /* write cached user defaults to disk */