Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
a69d057f
Commit
a69d057f
authored
Nov 13, 2010
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
OSD: remove always NULL p_feedback button field
parent
83b0e6f2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
21 deletions
+0
-21
include/vlc_osd.h
include/vlc_osd.h
+0
-1
modules/misc/osd/osd_menu.c
modules/misc/osd/osd_menu.c
+0
-20
No files found.
include/vlc_osd.h
View file @
a69d057f
...
...
@@ -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 */
...
...
modules/misc/osd/osd_menu.c
View file @
a69d057f
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment