b_menu_change: remove write-only variable
authorRémi Denis-Courmont <rdenis@simphalempin.com>
Tue, 16 Dec 2008 21:00:08 +0000 (23:00 +0200)
committerRémi Denis-Courmont <rdenis@simphalempin.com>
Tue, 16 Dec 2008 21:01:43 +0000 (23:01 +0200)
include/vlc_interface.h
modules/video_output/aa.c
modules/video_output/ggi.c
modules/video_output/sdl.c
modules/video_output/x11/xcommon.c
src/interface/interface.c

index f390972..572148f 100644 (file)
@@ -72,7 +72,6 @@ struct intf_thread_t
 
     /* XXX: new message passing stuff will go here */
     vlc_mutex_t  change_lock;
-    bool   b_menu_change;
     bool   b_menu;
 };
 
index 9123a51..d173514 100644 (file)
@@ -200,16 +200,8 @@ static int Manage( vout_thread_t *p_vout )
     {
     case AA_MOUSE:
         aa_getmouse( p_vout->p_sys->aa_context, &x, &y, &b );
-        if ( b & AA_BUTTON3 )
-        {
-            intf_thread_t *p_intf;
-            p_intf = vlc_object_find( p_vout, VLC_OBJECT_INTF, FIND_ANYWHERE );
-            if( p_intf )
-            {
-                p_intf->b_menu_change = 1;
-                vlc_object_release( p_intf );
-            }
-        }
+        /*if ( b & AA_BUTTON3 )
+             trigger contextual menu here */
         break;
     case AA_RESIZE:
         p_vout->i_changes |= VOUT_SIZE_CHANGE;
index 7ee119f..da70775 100644 (file)
@@ -311,16 +311,7 @@ static int Manage( vout_thread_t *p_vout )
                         break;
 
                     case GII_PBUTTON_RIGHT:
-                        {
-                            intf_thread_t *p_intf;
-                            p_intf = vlc_object_find( p_vout, VLC_OBJECT_INTF,
-                                                              FIND_ANYWHERE );
-                            if( p_intf )
-                            {
-                                p_intf->b_menu_change = 1;
-                                vlc_object_release( p_intf );
-                            }
-                        }
+                        /* trigger contextual menu here */
                         break;
                 }
                 break;
index 17efea7..08fb157 100644 (file)
@@ -459,18 +459,9 @@ static int Manage( vout_thread_t *p_vout )
 
             case SDL_BUTTON_RIGHT:
                 {
-                    intf_thread_t *p_intf;
-
                     var_Get( p_vout, "mouse-button-down", &val );
                     val.i_int &= ~4;
                     var_Set( p_vout, "mouse-button-down", val );
-                    p_intf = vlc_object_find( p_vout, VLC_OBJECT_INTF,
-                                                      FIND_ANYWHERE );
-                    if( p_intf )
-                    {
-                        p_intf->b_menu_change = 1;
-                        vlc_object_release( p_intf );
-                    }
 
                     val.b_bool = true;
                     var_Set( p_vout->p_libvlc, "intf-popupmenu", val );
index 83a3b88..c64ad74 100644 (file)
@@ -1327,13 +1327,6 @@ static int ManageVideo( vout_thread_t *p_vout )
                         var_Get( p_vout, "mouse-button-down", &val );
                         val.i_int &= ~4;
                         var_Set( p_vout, "mouse-button-down", val );
-                        p_intf = vlc_object_find( p_vout, VLC_OBJECT_INTF,
-                                                          FIND_ANYWHERE );
-                        if( p_intf )
-                        {
-                            p_intf->b_menu_change = 1;
-                            vlc_object_release( p_intf );
-                        }
 
                         vlc_value_t val; val.b_bool = true;
                         var_Set( p_vout->p_libvlc, "intf-popupmenu", val );
index 6c8c9f9..2bd8115 100644 (file)
@@ -108,7 +108,6 @@ intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module )
 
     /* Initialize structure */
     p_intf->b_menu        = false;
-    p_intf->b_menu_change = false;
 
     /* Initialize mutexes */
     vlc_mutex_init( &p_intf->change_lock );