#define AOUT_VOLUME_DEFAULT 256
#define AOUT_VOLUME_STEP 32
#define AOUT_VOLUME_MAX 1024
-#define AOUT_VOLUME_MIN 0
VLC_API audio_volume_t aout_VolumeGet( vlc_object_t * );
#define aout_VolumeGet(a) aout_VolumeGet(VLC_OBJECT(a))
audio_volume_t i_volume = atoi( newval.psz_string );
if ( (i_volume > (audio_volume_t)AOUT_VOLUME_MAX) )
{
- msg_rc( "Volume must be in the range %d-%d.", AOUT_VOLUME_MIN,
- AOUT_VOLUME_MAX );
+ msg_rc( "Volume must be in the range 0-%d.", AOUT_VOLUME_MAX );
i_error = VLC_EBADVAR;
}
else
{
- if( i_volume == AOUT_VOLUME_MIN )
+ if( i_volume == 0 )
aout_ToggleMute( p_playlist, NULL );
if( !aout_VolumeSet( p_playlist, i_volume ) )
i_error = VLC_SUCCESS;
static int vlclua_volume_set( lua_State *L )
{
playlist_t *p_this = vlclua_get_playlist_internal( L );
- int i_volume = __MAX(__MIN(luaL_checkint( L, 1 ), AOUT_VOLUME_MAX),
- AOUT_VOLUME_MIN);
+ int i_volume = __MAX(__MIN(luaL_checkint( L, 1 ), AOUT_VOLUME_MAX), 0);
int i_ret = aout_VolumeSet( p_this, i_volume );
return vlclua_push_ret( L, i_ret );
}
prepareVolume (obj, &aout, &volume, &mute);
value += volume;
- if (value < AOUT_VOLUME_MIN)
- volume = AOUT_VOLUME_MIN;
+ if (value < 0)
+ volume = 0;
else
if (value > AOUT_VOLUME_MAX)
volume = AOUT_VOLUME_MAX;
mute = !mute;
ret = commitVolume (obj, aout, volume, mute);
if (volp != NULL)
- *volp = mute ? AOUT_VOLUME_MIN : volume;
+ *volp = mute ? 0 : volume;
return ret;
}
prepareVolume (obj, &aout, &volume, NULL);
ret = commitVolume (obj, aout, volume, mute);
if (volp != NULL)
- *volp = mute ? AOUT_VOLUME_MIN : volume;
+ *volp = mute ? 0 : volume;
return ret;
}
add_bool( "audio", 1, AUDIO_TEXT, AUDIO_LONGTEXT, false )
change_safe ()
- add_integer_with_range( "volume", AOUT_VOLUME_DEFAULT, AOUT_VOLUME_MIN,
+ add_integer_with_range( "volume", AOUT_VOLUME_DEFAULT, 0,
AOUT_VOLUME_MAX, VOLUME_TEXT,
VOLUME_LONGTEXT, false )
- add_integer_with_range( "volume-step", AOUT_VOLUME_STEP, AOUT_VOLUME_MIN,
+ add_integer_with_range( "volume-step", AOUT_VOLUME_STEP, 0,
AOUT_VOLUME_MAX, VOLUME_STEP_TEXT,
VOLUME_STEP_LONGTEXT, true )
add_integer( "aout-rate", 0, AOUT_RATE_TEXT,