* A few Mac OS X intf fixes. To be honest. we should rewrite the thing from scratch...

diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m
index 84b6b5965c9199314ea72013f7a9bf7e35cde9ec..9cb2b2dea33d5e8bc741c9805dcd509447875ec8 100644 (file)
--- a/modules/gui/macosx/controls.m
+++ b/modules/gui/macosx/controls.m
@@ -281,6 +281,7 @@
             /* We have a detached Vout */
             else if( [[o_window className] isEqualToString: @"VLCWindow"] )
             {
+                msg_Dbg( VLCIntf, "detached vout controls.m call getVoutView" );
                 o_vout_view = [o_window getVoutView];
             }
 

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 8ed5d471082465725d9442b48938bf7814d3e8b2..7ce714870ca30d530cf9fd70405eb28540a18d44 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -897,6 +897,7 @@ static VLCMain *_o_sharedMainInstance = nil;
             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];
+            msg_Dbg( p_intf, "input has stopped, refreshing interface" );
             vlc_object_release( p_input );
             p_input = NULL;
         }
@@ -1015,8 +1016,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;
@@ -1026,8 +1027,9 @@ static VLCMain *_o_sharedMainInstance = nil;
                 {
                     if( [[o_vout_wnd className] isEqualToString: @"VLCWindow"]
                         || [[[VLCMain sharedInstance] getEmbeddedList]
-                                            windowContainsEmbedded: o_vout_wnd])
+                                            windowContainsEmbedded: o_vout_wnd] )
                     {
+                        msg_Dbg( p_intf, "updateTitle call getVoutView" );
                         [[o_vout_wnd getVoutView] updateTitle];
                     }
                 }

diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m
index bc4d809cffb14f1f5a91bc3226b1682caa1711e5..4b12e94e9485d8278102daa7fea78c87bb4c605c 100644 (file)
--- a/modules/gui/macosx/vout.m
+++ b/modules/gui/macosx/vout.m
@@ -111,7 +111,11 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
 
 - (BOOL)windowContainsEmbedded: (id)o_window
 {
-    return ([self getViewForWindow: o_window] == nil ? NO : YES);
+    if( ![[o_window className] isEqualToString: @"VLCWindow"] )
+    {
+        NSLog( @"We were not given a VLCWindow" );
+    }
+    return ([self getViewForWindow: o_window] == nil ? NO : YES );
 }
 
 - (id)getViewForWindow: (id)o_window