Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
eae1c91d
Commit
eae1c91d
authored
Jul 21, 2012
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove osd_Volume()
parent
f12b08d1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
53 deletions
+0
-53
include/vlc_osd.h
include/vlc_osd.h
+0
-10
src/libvlccore.sym
src/libvlccore.sym
+0
-1
src/osd/osd.c
src/osd/osd.c
+0
-42
No files found.
include/vlc_osd.h
View file @
eae1c91d
...
...
@@ -363,16 +363,6 @@ VLC_API void osd_MenuDown( vlc_object_t * );
#define osd_MenuUp(object) osd_MenuUp( VLC_OBJECT(object) )
#define osd_MenuDown(object) osd_MenuDown( VLC_OBJECT(object) )
/**
* Display the audio volume bitmap.
*
* Display the correct audio volume bitmap that corresponds to the
* current Audio Volume setting.
*/
VLC_API
void
osd_Volume
(
vlc_object_t
*
);
#define osd_Volume(object) osd_Volume( VLC_OBJECT(object) )
/**
* Retrieve a non modifyable pointer to the OSD Menu state
*
...
...
src/libvlccore.sym
View file @
eae1c91d
...
...
@@ -285,7 +285,6 @@ osd_MenuUp
osd_Message
osd_ShowTextAbsolute
osd_ShowTextRelative
osd_Volume
path_sanitize
picture_BlendSubpicture
picture_CopyPixels
...
...
src/osd/osd.c
View file @
eae1c91d
...
...
@@ -573,48 +573,6 @@ static int osd_VolumeStep( vlc_object_t *p_this, int i_volume, int i_steps )
return
(
i_volume
/
i_volume_step
);
}
#undef osd_Volume
/**
* Display current audio volume bitmap
*
* The OSD Menu audio volume bar is updated to reflect the new audio volume. Call this function
* when the audio volume is updated outside the OSD menu command "menu up", "menu down" or "menu select".
*/
void
osd_Volume
(
vlc_object_t
*
p_this
)
{
osd_button_t
*
p_button
=
NULL
;
int
i_volume
=
0
;
int
i_steps
=
0
;
osd_menu_t
*
p_osd
=
osd_FindVisible
(
p_this
);
if
(
p_osd
==
NULL
)
return
;
if
(
p_osd
->
p_state
&&
p_osd
->
p_state
->
p_volume
)
{
p_button
=
p_osd
->
p_state
->
p_volume
;
if
(
p_osd
->
p_state
->
p_volume
)
p_osd
->
p_state
->
p_visible
=
p_osd
->
p_state
->
p_volume
;
if
(
p_button
&&
p_button
->
b_range
)
{
/* Update the volume state images to match the current volume */
i_volume
=
config_GetInt
(
p_this
,
"volume"
);
i_steps
=
osd_VolumeStep
(
p_this
,
i_volume
,
p_button
->
i_ranges
);
p_button
->
p_current_state
=
osd_VolumeStateChange
(
p_button
->
p_states
,
i_steps
);
osd_UpdateState
(
p_osd
->
p_state
,
p_button
->
i_x
,
p_button
->
i_y
,
p_button
->
p_current_state
->
i_width
,
p_button
->
p_current_state
->
i_height
,
p_button
->
p_current_state
->
p_pic
);
osd_SetMenuUpdate
(
p_osd
,
true
);
osd_SetMenuVisible
(
p_osd
,
true
);
}
}
vlc_mutex_unlock
(
&
osd_mutex
);
}
#undef osd_ButtonFind
osd_button_t
*
osd_ButtonFind
(
vlc_object_t
*
p_this
,
int
i_x
,
int
i_y
,
int
i_window_height
,
int
i_window_width
,
...
...
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