Use pl_Release with the right argument.

[vlc] / modules / video_output / x11 / xcommon.c

diff --git a/modules/video_output/x11/xcommon.c b/modules/video_output/x11/xcommon.c
index 1bc947d9dc8a793b66ab9718cbb1e0929f3d16d9..e364eb7f8342fcc81a8a87f1c5da02f8c982b0ba 100644 (file)
--- a/modules/video_output/x11/xcommon.c
+++ b/modules/video_output/x11/xcommon.c
@@ -1291,8 +1291,6 @@ static int ManageVideo( vout_thread_t *p_vout )
             {
                 case Button1:
                     {
-                        playlist_t *p_playlist;
-
                         var_Get( p_vout, "mouse-button-down", &val );
                         val.i_int &= ~1;
                         var_Set( p_vout, "mouse-button-down", val );
@@ -1300,13 +1298,8 @@ static int ManageVideo( 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 );
-                        }
+                        vlc_value_t val; val.b_bool = false;
+                        var_Set( p_vout->p_libvlc, "intf-popupmenu", val );
                     }
                     break;
 
@@ -1325,7 +1318,6 @@ static int ManageVideo( vout_thread_t *p_vout )
                 case Button3:
                     {
                         intf_thread_t *p_intf;
-                        playlist_t *p_playlist;
 
                         var_Get( p_vout, "mouse-button-down", &val );
                         val.i_int &= ~4;
@@ -1338,13 +1330,8 @@ static int ManageVideo( 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 );
-                        }
+                        vlc_value_t val; val.b_bool = true;
+                        var_Set( p_vout->p_libvlc, "intf-popupmenu", val );
                     }
                     break;
 
@@ -1478,7 +1465,7 @@ static int ManageVideo( vout_thread_t *p_vout )
             if( p_playlist != NULL )
             {
                 playlist_Stop( p_playlist );
-                pl_Release( p_playlist );
+                pl_Release( p_vout );
             }
         }
     }
@@ -1627,10 +1614,9 @@ static int CreateWindow( vout_thread_t *p_vout, x11_window_t *p_win )
 
     if( !p_vout->b_fullscreen )
     {
-        p_win->owner_window = (Window)
-            vout_RequestWindow( p_vout, &p_win->i_x, &p_win->i_y,
-                                &p_win->i_width, &p_win->i_height );
-
+        void *ptr = vout_RequestWindow( p_vout, &p_win->i_x, &p_win->i_y,
+                                        &p_win->i_width, &p_win->i_height );
+        p_win->owner_window = (uintptr_t)ptr;
         xsize_hints.base_width  = xsize_hints.width = p_win->i_width;
         xsize_hints.base_height = xsize_hints.height = p_win->i_height;
         xsize_hints.flags       = PSize | PMinSize;