Skip to content

V
vlc
Commit 38518ced authored by Simon Latapie's avatar Simon Latapie
Browse files
Options

* http.c: removed a completely useless check (now you can change volume 

 	   value without playing anything)
parent fe2d6895
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 35 deletions
modules/control/http.c
View file @ 38518ced
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* http.c : http mini-server ;) * http.c : http mini-server ;)
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: http.c,v 1.30 2003/11/09 03:41:50 garf Exp $ * $Id: http.c,v 1.31 2003/11/09 05:22:56 garf Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* Laurent Aimar <fenrir@via.ecp.fr> * Laurent Aimar <fenrir@via.ecp.fr>
...@@ -1696,51 +1696,47 @@ static void MacroDo( httpd_file_callback_args_t *p_args, ...@@ -1696,51 +1696,47 @@ static void MacroDo( httpd_file_callback_args_t *p_args,
audio_volume_t i_volume; audio_volume_t i_volume;
int i_value; int i_value;
if( p_sys->p_input ) uri_extract_value( p_request, "value", vol, 8 );
{ aout_VolumeGet( p_intf, &i_volume );
uri_extract_value( p_request, "value", vol, 8 ); uri_decode_url_encoded( vol );
aout_VolumeGet( p_intf, &i_volume );
uri_decode_url_encoded( vol );
if( vol[0] == '+' ) if( vol[0] == '+' )
{
i_value = atoi( vol + 1 );
if( (i_volume + i_value) > AOUT_VOLUME_MAX )
{ {
i_value = atoi( vol + 1 ); aout_VolumeSet( p_intf , AOUT_VOLUME_MAX );
if( (i_volume + i_value) > AOUT_VOLUME_MAX ) msg_Dbg( p_intf, "requested volume set: max" );
{
aout_VolumeSet( p_intf , AOUT_VOLUME_MAX );
msg_Dbg( p_intf, "requested volume set: max" );
} else
{
aout_VolumeSet( p_intf , (i_volume + i_value) );
msg_Dbg( p_intf, "requested volume set: +%i", (i_volume + i_value) );
}
} else } else
if( vol[0] == '-' )
{ {
i_value = atoi( vol + 1 ); aout_VolumeSet( p_intf , (i_volume + i_value) );
if( (i_volume - i_value) < AOUT_VOLUME_MIN ) msg_Dbg( p_intf, "requested volume set: +%i", (i_volume + i_value) );
{ }
aout_VolumeSet( p_intf , AOUT_VOLUME_MIN ); } else
msg_Dbg( p_intf, "requested volume set: min" ); if( vol[0] == '-' )
} else {
{ i_value = atoi( vol + 1 );
aout_VolumeSet( p_intf , (i_volume - i_value) ); if( (i_volume - i_value) < AOUT_VOLUME_MIN )
msg_Dbg( p_intf, "requested volume set: -%i", (i_volume - i_value) ); {
} aout_VolumeSet( p_intf , AOUT_VOLUME_MIN );
msg_Dbg( p_intf, "requested volume set: min" );
} else } else
{ {
i_value = atoi( vol ); aout_VolumeSet( p_intf , (i_volume - i_value) );
if( ( i_value <= AOUT_VOLUME_MAX ) && ( i_value >= AOUT_VOLUME_MIN ) ) msg_Dbg( p_intf, "requested volume set: -%i", (i_volume - i_value) );
{ }
aout_VolumeSet( p_intf , atoi( vol ) ); } else
msg_Dbg( p_intf, "requested volume set: %i", atoi( vol ) ); {
} i_value = atoi( vol );
if( ( i_value <= AOUT_VOLUME_MAX ) && ( i_value >= AOUT_VOLUME_MIN ) )
{
aout_VolumeSet( p_intf , atoi( vol ) );
msg_Dbg( p_intf, "requested volume set: %i", atoi( vol ) );
} }
} }
break; break;
} }
/* playlist management */ /* playlist management */
case MVLC_ADD: case MVLC_ADD:
{ {
......
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