macosx: Fix addNode:.

[vlc] / modules / video_output / sdl.c

diff --git a/modules/video_output/sdl.c b/modules/video_output/sdl.c
index 152bfb9533952d7f7c4e90bd2953d0b52262cdc2..0bc7de17d5a14157aef0ac80fd7f454adaded16d 100644 (file)
--- a/modules/video_output/sdl.c
+++ b/modules/video_output/sdl.c
@@ -181,7 +181,7 @@ static int Open ( vlc_object_t *p_this )
     p_vout->pf_control = NULL;
 
 #ifdef HAVE_SETENV
-    psz_method = config_GetPsz( p_vout, "vout" );
+    char* psz = psz_method = config_GetPsz( p_vout, "vout" );
     if( psz_method )
     {
         while( *psz_method && *psz_method != ':' )
@@ -194,6 +194,7 @@ static int Open ( vlc_object_t *p_this )
             setenv( "SDL_VIDEODRIVER", psz_method + 1, 1 );
         }
     }
+    free( psz );
 #endif
 
     /* Initialize library */
@@ -432,8 +433,6 @@ static int Manage( vout_thread_t *p_vout )
             {
             case SDL_BUTTON_LEFT:
                 {
-                    playlist_t *p_playlist;
-
                     var_Get( p_vout, "mouse-button-down", &val );
                     val.i_int &= ~1;
                     var_Set( p_vout, "mouse-button-down", val );
@@ -441,22 +440,13 @@ static int Manage( vout_thread_t *p_vout )
                     val.b_bool = true;
                     var_Set( p_vout, "mouse-clicked", val );
 
-                    p_playlist = pl_Yield( p_vout );
-
-                    if( p_playlist != NULL )
-                    {
-                        vlc_value_t val;
-                        val.b_bool = false;
-                        var_Set( p_playlist, "intf-popupmenu", val );
-                        pl_Release( p_playlist );
-                    }
+                    val.b_bool = false;
+                    var_Set( p_vout->p_libvlc, "intf-popupmenu", val );
                 }
                 break;
 
             case SDL_BUTTON_MIDDLE:
                 {
-                    playlist_t *p_playlist;
-
                     var_Get( p_vout, "mouse-button-down", &val );
                     val.i_int &= ~2;
                     var_Set( p_vout, "mouse-button-down", val );
@@ -471,7 +461,6 @@ static int Manage( vout_thread_t *p_vout )
             case SDL_BUTTON_RIGHT:
                 {
                     intf_thread_t *p_intf;
-                    playlist_t *p_playlist;
 
                     var_Get( p_vout, "mouse-button-down", &val );
                     val.i_int &= ~4;
@@ -484,15 +473,8 @@ static int Manage( vout_thread_t *p_vout )
                         vlc_object_release( p_intf );
                     }
 
-                    p_playlist = pl_Yield( p_vout );
-
-                    if( p_playlist != NULL )
-                    {
-                        vlc_value_t val;
-                        val.b_bool = true;
-                        var_Set( p_playlist, "intf-popupmenu", val );
-                        pl_Release( p_playlist );
-                    }
+                    val.b_bool = true;
+                    var_Set( p_vout->p_libvlc, "intf-popupmenu", val );
                 }
                 break;
             }
@@ -531,12 +513,16 @@ static int Manage( vout_thread_t *p_vout )
         /* Quit event (close the window) */
         case SDL_QUIT:
             {
+#if 0
                 playlist_t *p_playlist = pl_Yield( p_vout );
                 if( p_playlist != NULL )
                 {
                     playlist_Stop( p_playlist );
-                    pl_Release( p_playlist );
+                    pl_Release( p_vout );
                 }
+#else
+#warning FIXME FIXME ?
+#endif
             }
             break;