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 3560352414ce85b9ecc78ccfd3e9b59d3c45bc09..e364eb7f8342fcc81a8a87f1c5da02f8c982b0ba 100644 (file)
--- a/modules/video_output/x11/xcommon.c
+++ b/modules/video_output/x11/xcommon.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 #include <vlc_playlist.h>
 #include <vlc_vout.h>
@@ -206,10 +206,7 @@ int Activate ( vlc_object_t *p_this )
     /* Allocate structure */
     p_vout->p_sys = malloc( sizeof( vout_sys_t ) );
     if( p_vout->p_sys == NULL )
-    {
-        msg_Err( p_vout, "out of memory" );
         return VLC_ENOMEM;
-    }
 
     vlc_mutex_init( &p_vout->p_sys->lock );
 
@@ -1293,40 +1290,34 @@ static int ManageVideo( vout_thread_t *p_vout )
             switch( ((XButtonEvent *)&xevent)->button )
             {
                 case Button1:
-                    var_Get( p_vout, "mouse-button-down", &val );
-                    val.i_int &= ~1;
-                    var_Set( p_vout, "mouse-button-down", val );
+                    {
+                        var_Get( p_vout, "mouse-button-down", &val );
+                        val.i_int &= ~1;
+                        var_Set( p_vout, "mouse-button-down", val );
 
-                    val.b_bool = true;
-                    var_Set( p_vout, "mouse-clicked", val );
+                        val.b_bool = true;
+                        var_Set( p_vout, "mouse-clicked", val );
+
+                        vlc_value_t val; val.b_bool = false;
+                        var_Set( p_vout->p_libvlc, "intf-popupmenu", val );
+                    }
                     break;
 
                 case Button2:
                     {
-                        playlist_t *p_playlist;
-
                         var_Get( p_vout, "mouse-button-down", &val );
                         val.i_int &= ~2;
                         var_Set( p_vout, "mouse-button-down", val );
 
-                        p_playlist = vlc_object_find( p_vout,
-                                                      VLC_OBJECT_PLAYLIST,
-                                                      FIND_ANYWHERE );
-                        if( p_playlist != NULL )
-                        {
-                            vlc_value_t val;
-                            var_Get( p_playlist, "intf-show", &val );
-                            val.b_bool = !val.b_bool;
-                            var_Set( p_playlist, "intf-show", val );
-                            vlc_object_release( p_playlist );
-                        }
+                        var_Get( p_vout->p_libvlc, "intf-show", &val );
+                        val.b_bool = !val.b_bool;
+                        var_Set( p_vout->p_libvlc, "intf-show", val );
                     }
                     break;
 
                 case Button3:
                     {
                         intf_thread_t *p_intf;
-                        playlist_t *p_playlist;
 
                         var_Get( p_vout, "mouse-button-down", &val );
                         val.i_int &= ~4;
@@ -1339,15 +1330,8 @@ static int ManageVideo( vout_thread_t *p_vout )
                             vlc_object_release( p_intf );
                         }
 
-                        p_playlist = vlc_object_find( p_vout,
-                                                      VLC_OBJECT_PLAYLIST,
-                                                      FIND_ANYWHERE );
-                        if( p_playlist != NULL )
-                        {
-                            vlc_value_t val; val.b_bool = true;
-                            var_Set( p_playlist, "intf-popupmenu", val );
-                            vlc_object_release( p_playlist );
-                        }
+                        vlc_value_t val; val.b_bool = true;
+                        var_Set( p_vout->p_libvlc, "intf-popupmenu", val );
                     }
                     break;
 
@@ -1450,7 +1434,7 @@ static int ManageVideo( vout_thread_t *p_vout )
                                     p_win->video_window, p_win->gc, 0, 0,
                                     p_win->i_width, p_win->i_height );
                 }
-#endif 
+#endif
 
 #if 0
                 if( p_vout->p_libvlc->p_input_bank->pp_input[0] != NULL )
@@ -1477,13 +1461,11 @@ static int ManageVideo( vout_thread_t *p_vout )
                      == p_vout->p_sys->p_win->wm_delete_window ) )
         {
             /* the user wants to close the window */
-            playlist_t * p_playlist =
-                (playlist_t *)vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST,
-                                               FIND_ANYWHERE );
+            playlist_t * p_playlist = pl_Yield( p_vout );
             if( p_playlist != NULL )
             {
                 playlist_Stop( p_playlist );
-                vlc_object_release( p_playlist );
+                pl_Release( p_vout );
             }
         }
     }
@@ -1632,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;
@@ -2005,6 +1986,7 @@ static int NewPicture( vout_thread_t *p_vout, picture_t *p_pic )
                 p_pic->V_PIXELS = (uint8_t*)p_pic->p_sys->p_image->data
                     + p_pic->p_sys->p_image->offsets[1];
             }
+
             break;
 
 #else
@@ -2841,11 +2823,6 @@ IMAGE_TYPE * CreateShmImage( vout_thread_t *p_vout,
 
     /* Create XImage / XvImage */
 #ifdef MODULE_NAME_IS_xvideo
-
-    /* Make sure the buffer is aligned to multiple of 16 */
-    i_height = ( i_height + 15 ) >> 4 << 4;
-    i_width = ( i_width + 15 ) >> 4 << 4;
-
     p_image = XvShmCreateImage( p_display, i_xvport, i_chroma, 0,
                                 i_width, i_height, p_shm );
 #elif defined(MODULE_NAME_IS_xvmc)
@@ -2931,21 +2908,13 @@ static IMAGE_TYPE * CreateImage( vout_thread_t *p_vout,
 
     /* Allocate memory for image */
 #ifdef MODULE_NAME_IS_xvideo
-
-    /* Make sure the buffer is aligned to multiple of 16 */
-    i_height = ( i_height + 15 ) >> 4 << 4;
-    i_width = ( i_width + 15 ) >> 4 << 4;
-
     p_data = malloc( i_width * i_height * i_bits_per_pixel / 8 );
 #elif defined(MODULE_NAME_IS_x11)
     i_bytes_per_line = i_width * i_bytes_per_pixel;
     p_data = malloc( i_bytes_per_line * i_height );
 #endif
     if( !p_data )
-    {
-        msg_Err( p_vout, "out of memory" );
         return NULL;
-    }
 
 #ifdef MODULE_NAME_IS_x11
     /* Optimize the quantum of a scanline regarding its size - the quantum is
@@ -3006,7 +2975,14 @@ static int X11ErrorHandler( Display * display, XErrorEvent * event )
 
 #ifdef HAVE_SYS_SHM_H
     if( event->request_code == i_shm_major ) /* MIT-SHM */
+    {
+        fprintf( stderr,
+                 "[????????] x11 video output notice:"
+                 " buggy X11 server claims shared memory\n"
+                 "[????????] x11 video output notice:"
+                 " support though it does not work (OpenSSH?)\n" );
         return i_shm_major = 0;
+    }
 #endif
 
 #ifndef HAVE_OSSO