Skip to content

V
vlc-2-2
Commit 3c42af82 authored by Yoann Peronneau's avatar Yoann Peronneau
Browse files
Options

OSD sliders are now used if the vout is not embedded or in fullscreen mode.

parent 9cfa6038
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
modules/control/hotkeys.c
View file @ 3c42af82
...@@ -239,7 +239,7 @@ static void Run( intf_thread_t *p_intf ) ...@@ -239,7 +239,7 @@ static void Run( intf_thread_t *p_intf )
{ {
audio_volume_t i_newvol; audio_volume_t i_newvol;
aout_VolumeUp( p_intf, 1, &i_newvol ); aout_VolumeUp( p_intf, 1, &i_newvol );
if( p_vout->b_fullscreen ) if( !p_vout->p_parent_intf || p_vout->b_fullscreen )
{ {
vout_OSDSlider( VLC_OBJECT( p_intf ), vout_OSDSlider( VLC_OBJECT( p_intf ),
i_newvol*100/AOUT_VOLUME_MAX, 1 ); i_newvol*100/AOUT_VOLUME_MAX, 1 );
...@@ -254,7 +254,7 @@ static void Run( intf_thread_t *p_intf ) ...@@ -254,7 +254,7 @@ static void Run( intf_thread_t *p_intf )
{ {
audio_volume_t i_newvol; audio_volume_t i_newvol;
aout_VolumeDown( p_intf, 1, &i_newvol ); aout_VolumeDown( p_intf, 1, &i_newvol );
if( p_vout->b_fullscreen ) if( !p_vout->p_parent_intf || p_vout->b_fullscreen )
{ {
vout_OSDSlider( VLC_OBJECT( p_intf ), vout_OSDSlider( VLC_OBJECT( p_intf ),
i_newvol*100/AOUT_VOLUME_MAX, 1 ); i_newvol*100/AOUT_VOLUME_MAX, 1 );
...@@ -356,7 +356,7 @@ static void Run( intf_thread_t *p_intf ) ...@@ -356,7 +356,7 @@ static void Run( intf_thread_t *p_intf )
{ {
val.i_time = -10000000; val.i_time = -10000000;
var_Set( p_input, "time-offset", val ); var_Set( p_input, "time-offset", val );
if( p_vout->b_fullscreen ) if( !p_vout->p_parent_intf || p_vout->b_fullscreen )
{ {
vout_OSDSlider( VLC_OBJECT( p_intf ), vout_OSDSlider( VLC_OBJECT( p_intf ),
GetPosition( p_intf ), 0 ); GetPosition( p_intf ), 0 );
...@@ -370,7 +370,7 @@ static void Run( intf_thread_t *p_intf ) ...@@ -370,7 +370,7 @@ static void Run( intf_thread_t *p_intf )
{ {
val.i_time = 10000000; val.i_time = 10000000;
var_Set( p_input, "time-offset", val ); var_Set( p_input, "time-offset", val );
if( p_vout->b_fullscreen ) if( !p_vout->p_parent_intf || p_vout->b_fullscreen )
{ {
vout_OSDSlider( VLC_OBJECT( p_intf ), vout_OSDSlider( VLC_OBJECT( p_intf ),
GetPosition( p_intf ), 0 ); GetPosition( p_intf ), 0 );
...@@ -384,7 +384,7 @@ static void Run( intf_thread_t *p_intf ) ...@@ -384,7 +384,7 @@ static void Run( intf_thread_t *p_intf )
{ {
val.i_time = -60000000; val.i_time = -60000000;
var_Set( p_input, "time-offset", val ); var_Set( p_input, "time-offset", val );
if( p_vout->b_fullscreen ) if( !p_vout->p_parent_intf || p_vout->b_fullscreen )
{ {
vout_OSDSlider( VLC_OBJECT( p_intf ), vout_OSDSlider( VLC_OBJECT( p_intf ),
GetPosition( p_intf ), 0 ); GetPosition( p_intf ), 0 );
...@@ -398,7 +398,7 @@ static void Run( intf_thread_t *p_intf ) ...@@ -398,7 +398,7 @@ static void Run( intf_thread_t *p_intf )
{ {
val.i_time = 60000000; val.i_time = 60000000;
var_Set( p_input, "time-offset", val ); var_Set( p_input, "time-offset", val );
if( p_vout->b_fullscreen ) if( !p_vout->p_parent_intf || p_vout->b_fullscreen )
{ {
vout_OSDSlider( VLC_OBJECT( p_intf ), vout_OSDSlider( VLC_OBJECT( p_intf ),
GetPosition( p_intf ), 0 ); GetPosition( p_intf ), 0 );
...@@ -413,7 +413,7 @@ static void Run( intf_thread_t *p_intf ) ...@@ -413,7 +413,7 @@ static void Run( intf_thread_t *p_intf )
vout_OSDMessage( p_intf, _( "Jump -5 minutes" ) ); vout_OSDMessage( p_intf, _( "Jump -5 minutes" ) );
val.i_time = -300000000; val.i_time = -300000000;
var_Set( p_input, "time-offset", val ); var_Set( p_input, "time-offset", val );
if( p_vout->b_fullscreen ) if( !p_vout->p_parent_intf || p_vout->b_fullscreen )
{ {
vout_OSDSlider( VLC_OBJECT( p_intf ), vout_OSDSlider( VLC_OBJECT( p_intf ),
GetPosition( p_intf ), 0 ); GetPosition( p_intf ), 0 );
...@@ -427,7 +427,7 @@ static void Run( intf_thread_t *p_intf ) ...@@ -427,7 +427,7 @@ static void Run( intf_thread_t *p_intf )
{ {
val.i_time = 300000000; val.i_time = 300000000;
var_Set( p_input, "time-offset", val ); var_Set( p_input, "time-offset", val );
if( p_vout->b_fullscreen ) if( !p_vout->p_parent_intf || p_vout->b_fullscreen )
{ {
vout_OSDSlider( VLC_OBJECT( p_intf ), vout_OSDSlider( VLC_OBJECT( p_intf ),
GetPosition( p_intf ), 0 ); GetPosition( p_intf ), 0 );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment