Commit 3fa04561 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* Changed mute hotkey to command-alt-arrowdown (like in iTunes) to avoid dupe...

* Changed mute hotkey to command-alt-arrowdown (like in iTunes) to avoid dupe with messages window hotkey.
* Solved a deadlock due to volumeGet. Remember locking functions are not allowed from the GUI thread.
* Fix the OSD feedback of the Repeat One, Repeat All commands
* Added Chris Clepper to the THANKS file for his OpenGL fix [11368]
parent f36c5936
......@@ -24,8 +24,9 @@ Brieuc Jeunhomme <bbp at via.ecp.fr> - bug fixes
Bruno Vella <allevb at tin.it> - Italian localization
Carlo Calabr <murray at via.ecp.fr> - Italian localization
Carsten Gottbeht <gottbehuet at active-elements dot de> - v4l hotplug fix
Chris Clepper - OpenGL fix
Christof Baumgaertner - dbox web intf
Christophe Mutricy <xtophe at nxtelevision dot com>- many fixes (preferences, M3U, ...)
Christophe Mutricy <xtophe at nxtelevision dot com> - many fixes (preferences, M3U, ...)
Christopher Johnson <cjohnson at mint.net> - Qt fix in vlc.spec
Colin Simmonds <colin_simmonds at Mac.lover.org> - compile fix for Mac OS X
Damian Ivereigh <damian at cisco.com> - ac3dec uninitialized data structure fix
......
......@@ -155,7 +155,7 @@
var_Set( p_playlist, "repeat", val );
if( val.b_bool )
{
vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat All" ) );
vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat One" ) );
}
else
{
......@@ -187,7 +187,7 @@
var_Set( p_playlist, "loop", val );
if( val.b_bool )
{
vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat One" ) );
vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat All" ) );
}
else
{
......
......@@ -70,6 +70,7 @@ struct intf_sys_t
vlc_bool_t b_playmode_update;
vlc_bool_t b_current_title_update;
vlc_bool_t b_fullscreen_update;
vlc_bool_t b_volume_update;
/* menus handlers */
vlc_bool_t b_input_update;
......
......@@ -817,6 +817,9 @@ static VLCMain *_o_sharedMainInstance = nil;
}
#undef p_input
/* Manage volume status */
[self manageVolumeSlider];
vlc_mutex_unlock( &p_intf->change_lock );
o_sleep_date = [NSDate dateWithTimeIntervalSinceNow: .1];
......@@ -972,6 +975,19 @@ static VLCMain *_o_sharedMainInstance = nil;
(int) (i_seconds % 60)];
[o_timefield setStringValue: o_time];
}
if( p_intf->p_sys->b_volume_update )
{
NSString *o_text;
o_text = [NSString stringWithFormat: _NS("Volume: %d"), i_lastShownVolume * 200 / AOUT_VOLUME_MAX];
if( i_lastShownVolume != -1 )
[self setScrollField:o_text stopAfter:1000000];
[o_volumeslider setFloatValue: (float)i_lastShownVolume / AOUT_VOLUME_STEP];
[o_volumeslider setEnabled: TRUE];
p_intf->p_sys->b_mute = ( i_lastShownVolume == 0 );
p_intf->p_sys->b_volume_update = FALSE;
}
/* Manage Playing status */
var_Get( p_input, "state", &val );
......@@ -996,8 +1012,6 @@ static VLCMain *_o_sharedMainInstance = nil;
if( (i_end_scroll != -1) && (mdate() > i_end_scroll) )
[self resetScrollField];
/* Manage volume status */
[self manageVolumeSlider];
[NSTimer scheduledTimerWithTimeInterval: 0.3
target: self selector: @selector(manageIntf:)
......@@ -1233,17 +1247,9 @@ static VLCMain *_o_sharedMainInstance = nil;
if( i_volume != i_lastShownVolume )
{
NSString *o_text;
o_text = [NSString stringWithFormat: _NS("Volume: %d"), i_volume * 200 / AOUT_VOLUME_MAX];
if( i_lastShownVolume != -1 )
[self setScrollField:o_text stopAfter:1000000];
[o_volumeslider setFloatValue: (float)i_volume / AOUT_VOLUME_STEP];
[o_volumeslider setEnabled: TRUE];
i_lastShownVolume = i_volume;
p_intf->p_sys->b_volume_update = TRUE;
}
p_intf->p_sys->b_mute = ( i_volume == 0 );
}
- (IBAction)timesliderUpdate:(id)sender
......
......@@ -1347,7 +1347,7 @@ vlc_module_begin();
# define KEY_QUIT KEY_MODIFIER_COMMAND|'q'
# define KEY_VOL_UP KEY_MODIFIER_COMMAND|KEY_UP
# define KEY_VOL_DOWN KEY_MODIFIER_COMMAND|KEY_DOWN
# define KEY_VOL_MUTE KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'m'
# define KEY_VOL_MUTE KEY_MODIFIER_COMMAND|KEY_MODIFIER_ALT|KEY_DOWN
# define KEY_SUBDELAY_UP 'j'
# define KEY_SUBDELAY_DOWN 'h'
# define KEY_AUDIODELAY_UP 'g'
......
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