Move intf-popupmenu and video-on-top variables from playlist to libvlc.

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

diff --git a/modules/video_output/x11/xcommon.c b/modules/video_output/x11/xcommon.c
index b1b1a431ee931480afb7b6875ec370f5c640bd16..fadb89269837d51d54193407581bafa8c92460eb 100644 (file)
--- a/modules/video_output/x11/xcommon.c
+++ b/modules/video_output/x11/xcommon.c
@@ -1300,13 +1300,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;
 
@@ -1338,13 +1333,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;
 
@@ -1474,12 +1464,16 @@ static int ManageVideo( vout_thread_t *p_vout )
                      == p_vout->p_sys->p_win->wm_delete_window ) )
         {
             /* the user wants to close the window */
+#if 0
             playlist_t * p_playlist = pl_Yield( p_vout );
             if( p_playlist != NULL )
             {
                 playlist_Stop( p_playlist );
                 pl_Release( p_playlist );
             }
+#else
+#warning FIXME FIXME FIXME
+#endif
         }
     }