[vlc-commits] commit: OSD: remove always NULL p_feedback button field ( Rémi Denis-Courmont )

[git at videolan.org]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Nov 13 23:40:24 2010 +0200| [a69d057ffdfa6477287e0ccaf544eb50557827ad] | committer: Rémi Denis-Courmont 

OSD: remove always NULL p_feedback button field

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a69d057ffdfa6477287e0ccaf544eb50557827ad
---

 include/vlc_osd.h           |    1 -
 modules/misc/osd/osd_menu.c |   20 --------------------
 2 files changed, 0 insertions(+), 21 deletions(-)

diff --git a/include/vlc_osd.h b/include/vlc_osd.h
index 06168b4..02b394e 100644
--- a/include/vlc_osd.h
+++ b/include/vlc_osd.h
@@ -170,7 +170,6 @@ struct osd_button_t
 
     osd_state_t *p_current_state; /*< pointer to current state image */
     osd_state_t *p_states; /*< doubly linked list of states */
-    picture_t   *p_feedback; /*< feedback picture */
 
     char    *psz_name;     /*< name of button */
 
diff --git a/modules/misc/osd/osd_menu.c b/modules/misc/osd/osd_menu.c
index 57cd24e..a26e7c1 100644
--- a/modules/misc/osd/osd_menu.c
+++ b/modules/misc/osd/osd_menu.c
@@ -92,7 +92,6 @@ osd_button_t *osd_ButtonNew( const char *psz_action, int i_x, int i_y )
 
     p_button->psz_action = strdup(psz_action);
     p_button->psz_action_down = NULL;
-    p_button->p_feedback = NULL;
     p_button->i_x = i_x;
     p_button->i_y = i_y;
 
@@ -128,12 +127,6 @@ void osd_ButtonFree( osd_menu_t *p_menu, osd_button_t *p_button )
             free( p_current->p_next->psz_name );
             free( p_current->p_next->psz_action );
             free( p_current->p_next->psz_action_down );
-            if( p_current->p_feedback )
-            {
-                free( p_current->p_feedback->p_data_orig );
-                free( p_current->p_feedback );
-                p_current->p_feedback = NULL;
-            }
 
             /* Free all states first */
             if( p_current->p_next->p_states )
@@ -148,13 +141,6 @@ void osd_ButtonFree( osd_menu_t *p_menu, osd_button_t *p_button )
             free( p_current->p_up->psz_name );
             free( p_current->p_up->psz_action );
             free( p_current->p_up->psz_action_down );
-            if( p_current->p_feedback )
-            {
-                free( p_current->p_feedback->p_data_orig );
-                free( p_current->p_feedback );
-            }
-
-            p_current->p_feedback = NULL;
 
             /* Free all states first */
             if( p_current->p_up->p_states )
@@ -171,12 +157,6 @@ void osd_ButtonFree( osd_menu_t *p_menu, osd_button_t *p_button )
         free( p_button->psz_name );
         free( p_button->psz_action );
         free( p_button->psz_action_down );
-        if( p_current->p_feedback )
-        {
-            free( p_current->p_feedback->p_data_orig );
-            free( p_current->p_feedback );
-            p_current->p_feedback = NULL;
-        }
 
         if( p_button->p_states )
             osd_StatesFree( p_menu, p_button->p_states );