]> git.sesse.net Git - vlc/blobdiff - modules/gui/macosx/intf.m
* Do not make a vlc_object_find to find the playlist, since we may get the item being...
[vlc] / modules / gui / macosx / intf.m
index 2c751c2d94cf0e554a02833ff17bd4db4d9de16f..4e06828a999a051978e5e53b286cc51089b6c882 100644 (file)
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * intf.m: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2005 the VideoLAN team
+ * Copyright (C) 2002-2006 the VideoLAN team
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -20,7 +20,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -43,7 +43,8 @@
 #include "bookmarks.h"
 #include "sfilters.h"
 #include "interaction.h"
-/*#include "update.h"*/
+#include "embeddedwindow.h"
+#include "update.h"
 
 /*****************************************************************************
  * Local prototypes.
@@ -74,7 +75,7 @@ int E_(OpenIntf) ( vlc_object_t *p_this )
     [NSThread detachNewThreadSelector:@selector(self) toTarget:[NSString string] withObject:nil];
 
     p_intf->p_sys->o_sendport = [[NSPort port] retain];
-    p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
+    p_intf->p_sys->p_sub = msg_Subscribe( p_intf, MSG_QUEUE_NORMAL );
     p_intf->b_play = VLC_TRUE;
     p_intf->pf_run = Run;
 
@@ -316,7 +317,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     } else {
         _o_sharedMainInstance = [super init];
     }
-    
+
     o_about = [[VLAboutBox alloc] init];
     o_prefs = nil;
     o_open = [[VLCOpen alloc] init];
@@ -326,7 +327,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     o_embedded_list = [[VLCEmbeddedList alloc] init];
     o_interaction_list = [[VLCInteractionList alloc] init];
     o_sfilters = nil;
-    /*o_update = [[VLCUpdate alloc] init];*/
+    o_update = [[VLCUpdate alloc] init];
 
     i_lastShownVolume = -1;
     return _o_sharedMainInstance;
@@ -449,14 +450,15 @@ static VLCMain *_o_sharedMainInstance = nil;
 
         var_AddCallback( p_playlist, "fullscreen", FullscreenChanged, self);
 
-        [o_btn_fullscreen setState: ( var_Get( p_playlist, "fullscreen", &val )>=0 && val.b_bool )];
+        [o_embedded_window setFullscreen: var_GetBool( p_playlist,
+                                                            "fullscreen" )];
         vlc_object_release( p_playlist );
     }
     
     var_Create( p_intf, "interaction", VLC_VAR_ADDRESS );
     var_AddCallback( p_intf, "interaction", InteractCallback, self );
     p_intf->b_interaction = VLC_TRUE;
-    
+
     nib_main_loaded = TRUE;
 }
 
@@ -484,7 +486,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     /* main menu */
     [o_mi_about setTitle: [_NS("About VLC media player") \
         stringByAppendingString: @"..."]];
-/*    [o_mi_checkForUpdate setTitle: _NS("Check for Update...")];*/
+    [o_mi_checkForUpdate setTitle: _NS("Check for Update...")];
     [o_mi_prefs setTitle: _NS("Preferences...")];
     [o_mi_add_intf setTitle: _NS("Add Interface")];
     [o_mu_add_intf setTitle: _NS("Add Interface")];
@@ -570,7 +572,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     [o_mi_extended setTitle: _NS("Extended Controls")];
     [o_mi_bookmarks setTitle: _NS("Bookmarks")];
     [o_mi_playlist setTitle: _NS("Playlist")];
-    [o_mi_info setTitle: _NS("Info")];
+    [o_mi_info setTitle: _NS("Information")];
     [o_mi_messages setTitle: _NS("Messages")];
 
     [o_mi_bring_atf setTitle: _NS("Bring All to Front")];
@@ -594,14 +596,14 @@ static VLCMain *_o_sharedMainInstance = nil;
     /* error panel */
     [o_error setTitle: _NS("Error")];
     [o_err_lbl setStringValue: _NS("An error has occurred which probably " \
-        "prevented the execution of your request:")];
+        "prevented the proper execution of the program:")];
     [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("Suppress further errors")];
+    [o_err_ckbk_surpress setTitle: _NS("Do not display further errors")];
 
-    [o_info_window setTitle: _NS("Info")];
+    [o_info_window setTitle: _NS("Information")];
 }
 
 - (void)applicationWillFinishLaunching:(NSNotification *)o_notification
@@ -670,7 +672,7 @@ static VLCMain *_o_sharedMainInstance = nil;
         psz_string = malloc( [o_data length] + 1 );
         [o_data getBytes: psz_string];
         psz_string[ [o_data length] ] = '\0';
-        msg_Err( VLCIntf, "cannot convert to wanted encoding: %s",
+        msg_Err( VLCIntf, "cannot convert to the requested encoding: %s",
                  psz_string );
     }
     else
@@ -875,30 +877,27 @@ static VLCMain *_o_sharedMainInstance = nil;
     {
         vlc_mutex_lock( &p_intf->change_lock );
 
-#define p_input p_intf->p_sys->p_input
 
-        if( p_input == NULL )
+        if( p_intf->p_sys->p_input == NULL )
         {
-            p_input = (input_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_INPUT,
-                                           FIND_ANYWHERE );
+            p_intf->p_sys->p_input = p_playlist->p_input;
 
-            /* Refresh the interface */
-            if( p_input )
+                /* Refresh the interface */
+            if( p_intf->p_sys->p_input )
             {
                 msg_Dbg( p_intf, "input has changed, refreshing interface" );
                 p_intf->p_sys->b_input_update = VLC_TRUE;
             }
         }
-        else if( p_input->b_die || p_input->b_dead )
+        else if( p_intf->p_sys->p_input->b_die || p_intf->p_sys->p_input->b_dead )
         {
             /* input stopped */
             p_intf->p_sys->b_intf_update = VLC_TRUE;
             p_intf->p_sys->i_play_status = END_S;
             [self setScrollField: _NS("VLC media player") stopAfter:-1];
-            vlc_object_release( p_input );
-            p_input = NULL;
+            msg_Dbg( p_intf, "input has stopped, refreshing interface" );
+            p_intf->p_sys->p_input = NULL;
         }
-#undef p_input
 
         /* Manage volume status */
         [self manageVolumeSlider];
@@ -964,6 +963,8 @@ static VLCMain *_o_sharedMainInstance = nil;
         [o_timeslider setEnabled: b_seekable];
         [o_timefield setStringValue: @"0:00:00"];
 
+        [o_embedded_window setSeekable: b_seekable];
+
         p_intf->p_sys->b_intf_update = VLC_FALSE;
     }
 
@@ -983,7 +984,7 @@ static VLCMain *_o_sharedMainInstance = nil;
         playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
                                                    FIND_ANYWHERE );
         var_Get( p_playlist, "fullscreen", &val );
-        [o_btn_fullscreen setState: val.b_bool];
+        [o_embedded_window setFullscreen: val.b_bool];
         vlc_object_release( p_playlist );
 
         p_intf->p_sys->b_fullscreen_update = VLC_FALSE;
@@ -1011,8 +1012,8 @@ static VLCMain *_o_sharedMainInstance = nil;
                     p_playlist->status.p_item->input.psz_name];
             [self setScrollField: o_temp stopAfter:-1];
 
-            p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
-                                                    FIND_ANYWHERE );
+            p_vout = vlc_object_find( p_input, VLC_OBJECT_VOUT,
+                                                    FIND_PARENT );
             if( p_vout != NULL )
             {
                 id o_vout_wnd;
@@ -1020,9 +1021,12 @@ static VLCMain *_o_sharedMainInstance = nil;
 
                 while( ( o_vout_wnd = [o_enum nextObject] ) )
                 {
-                    if( [[o_vout_wnd className] isEqualToString: @"VLCWindow"] )
+                    if( [[o_vout_wnd className] isEqualToString: @"VLCWindow"]
+                        || [[[VLCMain sharedInstance] getEmbeddedList]
+                                            windowContainsEmbedded: o_vout_wnd] )
                     {
-                        [o_vout_wnd updateTitle];
+                        msg_Dbg( p_intf, "updateTitle call getVoutView" );
+                        [[o_vout_wnd getVoutView] updateTitle];
                     }
                 }
                 vlc_object_release( (vlc_object_t *)p_vout );
@@ -1053,8 +1057,9 @@ static VLCMain *_o_sharedMainInstance = nil;
                             (int) (i_seconds / 60 % 60),
                             (int) (i_seconds % 60)];
             [o_timefield setStringValue: o_time];
+            [o_embedded_window setTime: o_time position: f_updated];
         }
-        
+
         if( p_intf->p_sys->b_volume_update )
         {
             NSString *o_text;
@@ -1075,6 +1080,7 @@ static VLCMain *_o_sharedMainInstance = nil;
         {
             p_intf->p_sys->i_play_status = val.i_int;
             [self playStatusUpdated: p_intf->p_sys->i_play_status];
+            [o_embedded_window playStatusUpdated: p_intf->p_sys->i_play_status];
         }
     }
     else
@@ -1082,6 +1088,7 @@ static VLCMain *_o_sharedMainInstance = nil;
         p_intf->p_sys->i_play_status = END_S;
         p_intf->p_sys->b_intf_update = VLC_TRUE;
         [self playStatusUpdated: p_intf->p_sys->i_play_status];
+        [o_embedded_window playStatusUpdated: p_intf->p_sys->i_play_status];
         [self setSubmenusEnabled: FALSE];
     }
 
@@ -1368,6 +1375,7 @@ static VLCMain *_o_sharedMainInstance = nil;
                         (int) (i_seconds / 60 % 60),
                         (int) (i_seconds % 60)];
         [o_timefield setStringValue: o_time];
+        [o_embedded_window setTime: o_time position: f_updated];
     }
 #undef p_input
 }
@@ -1626,7 +1634,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     [o_prefs showPrefs];
 }
 
-/*- (IBAction)checkForUpdate:(id)sender
+- (IBAction)checkForUpdate:(id)sender
 {
     if (!nib_update_loaded)
     {
@@ -1635,7 +1643,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     } else {
         [o_update showUpdateWindow];
     }
-}*/
+}
 
 - (IBAction)closeError:(id)sender
 {
@@ -1718,7 +1726,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     }
     else
     {
-        NSBeginInformationalAlertSheet(_NS("No CrashLog found"), @"Continue", nil, nil, o_msgs_panel, self, NULL, NULL, nil, _NS("You haven't experienced any heavy crashes yet.") );
+        NSBeginInformationalAlertSheet(_NS("No CrashLog found"), @"Continue", nil, nil, o_msgs_panel, self, NULL, NULL, nil, _NS("Couldn't find any trace of a previous crash.") );
 
     }
 }