From 400c890f082caabafc17500c6d6b6701d584216a Mon Sep 17 00:00:00 2001 From: Jean-Paul Saman Date: Sat, 13 Aug 2005 19:26:27 +0000 Subject: [PATCH] Reworked OSD Volume handling and display of volumebar. Run make stamp-api to update include/vlc_symbols.h. --- include/vlc_osd.h | 17 +++------- modules/control/rc.c | 6 ++-- src/osd/osd.c | 78 +++++++++----------------------------------- 3 files changed, 23 insertions(+), 78 deletions(-) diff --git a/include/vlc_osd.h b/include/vlc_osd.h index 866ecdc65a..5f942c4afd 100644 --- a/include/vlc_osd.h +++ b/include/vlc_osd.h @@ -305,21 +305,14 @@ VLC_EXPORT( void, __osd_MenuDown, ( vlc_object_t * ) ); #define osd_MenuDown(object) __osd_MenuDown( VLC_OBJECT(object) ) /** - * Turn Volume Up + * Display the audio volume bitmap. * - * Use the OSD menu to turn the audio volume up. + * Display the correct audio volume bitmap that corresponds to the + * current Audio Volume setting. */ -VLC_EXPORT( void, __osd_VolumeUp, ( vlc_object_t * ) ); +VLC_EXPORT( void, __osd_Volume, ( vlc_object_t * ) ); -/** - * Turn Volume Down - * - * Use the OSD menu to turn the audio volume down. - */ -VLC_EXPORT( void, __osd_VolumeDown, ( vlc_object_t * ) ); - -#define osd_VolumeUp(object) __osd_VolumeUp( VLC_OBJECT(object) ) -#define osd_VolumeDown(object) __osd_VolumeDown( VLC_OBJECT(object) ) +#define osd_Volume(object) __osd_Volume( VLC_OBJECT(object) ) /** * Retrieve a non modifyable pointer to the OSD Menu state diff --git a/modules/control/rc.c b/modules/control/rc.c index 4a7db821c7..57a7e88474 100644 --- a/modules/control/rc.c +++ b/modules/control/rc.c @@ -1686,7 +1686,8 @@ static int Volume( vlc_object_t *p_this, char const *psz_cmd, var_Set( p_intf->p_vlc, "key-pressed", keyval ); } i_error = aout_VolumeSet( p_this, i_volume ); - msg_rc( STATUS_CHANGE "( audio volume: %d )", i_volume ); + osd_Volume( p_this ); + msg_rc( STATUS_CHANGE "( audio volume: %d )", i_volume ); } } else @@ -1724,14 +1725,13 @@ static int VolumeMove( vlc_object_t *p_this, char const *psz_cmd, { if ( aout_VolumeUp( p_this, i_nb_steps, &i_volume ) < 0 ) i_error = VLC_EGENERIC; - osd_VolumeUp( p_this ); } else { if ( aout_VolumeDown( p_this, i_nb_steps, &i_volume ) < 0 ) i_error = VLC_EGENERIC; - osd_VolumeDown( p_this ); } + osd_Volume( p_this ); if ( !i_error ) msg_rc( STATUS_CHANGE "( audio volume: %d )", i_volume ); return i_error; diff --git a/src/osd/osd.c b/src/osd/osd.c index 659b58a6ec..989b7172f2 100644 --- a/src/osd/osd.c +++ b/src/osd/osd.c @@ -33,6 +33,9 @@ #undef OSD_MENU_DEBUG +/* 3 is a magic number for 32 volume decrease steps */ +#define OSD_VOLUME_STEPS(i_volume,i_n) (i_volume/AOUT_VOLUME_STEP) / (AOUT_VOLUME_STEP/(i_n-1)) + /***************************************************************************** * Local prototypes *****************************************************************************/ @@ -77,7 +80,7 @@ osd_menu_t *__osd_MenuCreate( vlc_object_t *p_this, const char *psz_file ) /* Update the volume state images to match the current volume */ i_volume = config_GetInt( p_this, "volume" ); - i_steps = (i_volume / AOUT_VOLUME_STEP / 3); /* 3 is a magic number for 32 volume decrease steps */ + i_steps = OSD_VOLUME_STEPS( i_volume, p_osd->p_state->p_volume->i_ranges ); p_osd->p_state->p_volume->p_current_state = osd_VolumeStateChange( p_osd->p_state->p_volume->p_states, i_steps ); /* Initialize OSD state */ @@ -156,6 +159,8 @@ static inline osd_state_t *osd_VolumeStateChange( osd_state_t *p_current, int i_ { osd_state_t *p_temp = NULL; int i; + + if( i_steps < 0 ) i_steps = 0; for( i=0; (i < i_steps) && (p_current != NULL); i++ ) { @@ -522,12 +527,12 @@ void __osd_MenuDown( vlc_object_t *p_this ) } /** - * Audio volume up + * 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". + * when the audio volume is updated outside the OSD menu command "menu up", "menu down" or "menu select". */ -void __osd_VolumeUp( vlc_object_t *p_this ) +void __osd_Volume( vlc_object_t *p_this ) { osd_menu_t *p_osd = NULL; osd_button_t *p_button = NULL; @@ -537,77 +542,24 @@ void __osd_VolumeUp( vlc_object_t *p_this ) if( ( p_osd = vlc_object_find( p_this, VLC_OBJECT_OSDMENU, FIND_ANYWHERE ) ) == NULL ) { - msg_Err( p_this, "osd_VolumeUp failed" ); + msg_Err( p_this, "OSD menu volume update failed" ); return; } var_Get( p_this->p_libvlc, "osd_mutex", &lockval ); vlc_mutex_lock( lockval.p_address ); - /* Update the volume state images to match the current volume */ - i_volume = config_GetInt( p_this, "volume" ); - i_steps = (i_volume / AOUT_VOLUME_STEP / 3); /* 3 is a magic number for 32 volume decrease steps */ - p_osd->p_state->p_volume->p_current_state = osd_VolumeStateChange( p_osd->p_state->p_volume->p_states, i_steps ); - 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 ) { - osd_state_t *p_temp = p_button->p_current_state; - if( p_temp->p_next ) - p_button->p_current_state = p_temp->p_next; - - osd_UpdateState( p_osd->p_state, - p_button->i_x, p_button->i_y, - p_button->p_current_state->p_pic->p[Y_PLANE].i_visible_pitch, - p_button->p_current_state->p_pic->p[Y_PLANE].i_visible_lines, - p_button->p_current_state->p_pic ); - osd_SetMenuUpdate( p_osd, VLC_TRUE ); - osd_SetMenuVisible( p_osd, VLC_TRUE ); - } - vlc_object_release( (vlc_object_t*) p_osd ); - vlc_mutex_unlock( lockval.p_address ); -} - -/** - * Audio volume down - * - * 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 down". - */ -void __osd_VolumeDown( vlc_object_t *p_this ) -{ - osd_menu_t *p_osd = NULL; - osd_button_t *p_button = NULL; - vlc_value_t lockval; - int i_volume = 0; - int i_steps = 0; - - if( ( p_osd = vlc_object_find( p_this, VLC_OBJECT_OSDMENU, FIND_ANYWHERE ) ) == NULL ) - { - msg_Err( p_this, "osd_VolumeDown failed" ); - return; - } - - var_Get( p_this->p_libvlc, "osd_mutex", &lockval ); - vlc_mutex_lock( lockval.p_address ); - - /* Update the volume state images to match the current volume */ - i_volume = config_GetInt( p_this, "volume" ); - i_steps = (i_volume / AOUT_VOLUME_STEP / 3); /* 3 is a magic number for 32 volume decrease steps */ - p_osd->p_state->p_volume->p_current_state = osd_VolumeStateChange( p_osd->p_state->p_volume->p_states, i_steps ); - - 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 ) - { - osd_state_t *p_temp = p_button->p_current_state; - if( p_temp && p_temp->p_prev ) - p_button->p_current_state = p_temp->p_prev; + /* Update the volume state images to match the current volume */ + i_volume = config_GetInt( p_this, "volume" ); + i_steps = OSD_VOLUME_STEPS( 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, + osd_UpdateState( p_osd->p_state, p_button->i_x, p_button->i_y, p_button->p_current_state->p_pic->p[Y_PLANE].i_visible_pitch, p_button->p_current_state->p_pic->p[Y_PLANE].i_visible_lines, -- 2.39.2