Commit e27abe75 authored by hartman's avatar hartman
Browse files

* modules/gui/macosx/controls.m:

  - fixed the mute and volumeup volumedown when you use them mixed.
* src/audio_output/intf.c:
  - set "saved-volume" on volume up, volume down.
parent 9246efce
......@@ -2,7 +2,7 @@
* controls.m: MacOS X interface plugin
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: controls.m,v 1.27 2003/02/10 00:41:45 hartman Exp $
* $Id: controls.m,v 1.28 2003/02/12 14:22:23 hartman Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
......@@ -312,13 +312,13 @@
{
intf_thread_t * p_intf = [NSApp getIntf];
aout_VolumeUp( p_intf, 1, NULL );
if( p_intf->p_sys->b_mute )
{
[self mute: nil];
}
aout_VolumeUp( p_intf, 1, NULL );
[self updateVolumeSlider];
}
......@@ -326,12 +326,12 @@
{
intf_thread_t * p_intf = [NSApp getIntf];
aout_VolumeDown( p_intf, 1, NULL );
if( p_intf->p_sys->b_mute )
{
[self mute: nil];
}
aout_VolumeDown( p_intf, 1, NULL );
[self updateVolumeSlider];
}
......
......@@ -2,7 +2,7 @@
* intf.c : audio output API towards the interface modules
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: intf.c,v 1.16 2003/02/09 01:13:43 massiot Exp $
* $Id: intf.c,v 1.17 2003/02/12 14:22:23 hartman Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -140,6 +140,7 @@ int __aout_VolumeUp( vlc_object_t * p_object, int i_nb_steps,
i = AOUT_VOLUME_MAX;
}
config_PutInt( p_object, "volume", i );
config_PutInt( p_object, "saved-volume", i );
if ( pi_volume != NULL ) *pi_volume = (audio_volume_t)i;
if ( p_aout == NULL ) return 0;
......@@ -175,6 +176,7 @@ int __aout_VolumeDown( vlc_object_t * p_object, int i_nb_steps,
i = AOUT_VOLUME_MIN;
}
config_PutInt( p_object, "volume", i );
config_PutInt( p_object, "saved-volume", i );
if ( pi_volume != NULL ) *pi_volume = (audio_volume_t)i;
if ( p_aout == NULL ) return 0;
......
Supports Markdown
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