* moved garfou's changes before a variable that is at risk of overflow

  maybe this will fix the random crashes?

diff --git a/modules/gui/macosx/vout.h b/modules/gui/macosx/vout.h
index 7debaa56e7862da9cee0eb808b7ee040467f5dee..cd1e820f60200d2e736171a455783ec6da4b84b0 100644 (file)
--- a/modules/gui/macosx/vout.h
+++ b/modules/gui/macosx/vout.h
@@ -2,7 +2,7 @@
  * vout.h: MacOS X interface plugin
  *****************************************************************************
  * Copyright (C) 2001-2003 VideoLAN
- * $Id: vout.h,v 1.13 2003/08/19 14:07:51 garf Exp $
+ * $Id: vout.h,v 1.14 2003/11/05 00:40:08 hartman Exp $
  *
  * Authors: Colin Delacroix <colin@zoy.org>
  *          Florian G. Pflug <fgp@phlo.org>
@@ -73,6 +73,10 @@ struct vout_sys_t
     NSRect s_rect;
     int b_pos_saved;
     VLCWindow * o_window;
+    Rect rect;
+    int portx;
+    int porty;
+    int isplugin;
 
     vlc_bool_t b_mouse_moved;
     vlc_bool_t b_mouse_pointer_visible;
@@ -88,9 +92,5 @@ struct vout_sys_t
     ImageDescriptionHandle h_img_descr;
     Ptr p_fullscreen_state;
     RgnHandle mask;
-    Rect rect;
-    int portx;
-    int porty;
-    int isplugin;
 #endif
 };

diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m
index b5f35430fedc69200e30b341ef853f43280bd885..4f69da99e499b986353f8ece408fa37bcea6f40e 100644 (file)
--- a/modules/gui/macosx/vout.m
+++ b/modules/gui/macosx/vout.m
@@ -3,7 +3,7 @@
  * vout.m: MacOS X video output plugin
  *****************************************************************************
  * Copyright (C) 2001-2003 VideoLAN
- * $Id: vout.m,v 1.61 2003/10/31 15:54:53 hartman Exp $
+ * $Id: vout.m,v 1.62 2003/11/05 00:40:08 hartman Exp $
  *
  * Authors: Colin Delacroix <colin@zoy.org>
  *          Florian G. Pflug <fgp@phlo.org>
@@ -1026,7 +1026,7 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic )
 
     vlc_mutex_lock( &p_playlist->object_lock );
     o_title = [NSMutableString stringWithUTF8String: 
-        p_playlist->pp_items[p_playlist->i_index]->psz_name]; 
+        p_playlist->pp_items[p_playlist->i_index]->psz_uri]; 
     vlc_mutex_unlock( &p_playlist->object_lock );
 
     vlc_object_release( p_playlist );