Commit 2d83c3c2 authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: fixed spu announcements for playback controls

parent b23c2737
...@@ -161,18 +161,27 @@ static VLCCoreInteraction *_o_sharedInstance = nil; ...@@ -161,18 +161,27 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
{ {
vlc_value_t val; vlc_value_t val;
playlist_t * p_playlist = pl_Get( VLCIntf ); playlist_t * p_playlist = pl_Get( VLCIntf );
vout_thread_t *p_vout = getVout();
var_Get( p_playlist, "random", &val ); var_Get( p_playlist, "random", &val );
val.b_bool = !val.b_bool; val.b_bool = !val.b_bool;
var_Set( p_playlist, "random", val ); var_Set( p_playlist, "random", val );
if( val.b_bool ) if( val.b_bool )
{ {
//vout_OSDMessage( VLCIntf, SPU_DEFAULT_CHANNEL, "%s", _( "Random On" ) ); if (p_vout)
{
vout_OSDMessage( p_vout, SPU_DEFAULT_CHANNEL, "%s", _( "Random On" ) );
vlc_object_release( p_vout );
}
config_PutInt( p_playlist, "random", 1 ); config_PutInt( p_playlist, "random", 1 );
} }
else else
{ {
//vout_OSDMessage( VLCIntf, SPU_DEFAULT_CHANNEL, "%s", _( "Random Off" ) ); if (p_vout)
{
vout_OSDMessage( p_vout, SPU_DEFAULT_CHANNEL, "%s", _( "Random Off" ) );
vlc_object_release( p_vout );
}
config_PutInt( p_playlist, "random", 0 ); config_PutInt( p_playlist, "random", 0 );
} }
} }
...@@ -186,7 +195,12 @@ static VLCCoreInteraction *_o_sharedInstance = nil; ...@@ -186,7 +195,12 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
config_PutInt( p_playlist, "repeat", NO ); config_PutInt( p_playlist, "repeat", NO );
config_PutInt( p_playlist, "loop", YES ); config_PutInt( p_playlist, "loop", YES );
//vout_OSDMessage( VLCIntf, SPU_DEFAULT_CHANNEL, "%s", _( "Repeat All" ) ); vout_thread_t *p_vout = getVout();
if (p_vout)
{
vout_OSDMessage( p_vout, SPU_DEFAULT_CHANNEL, "%s", _( "Repeat All" ) );
vlc_object_release( p_vout );
}
} }
- (void)repeatOne - (void)repeatOne
...@@ -198,7 +212,12 @@ static VLCCoreInteraction *_o_sharedInstance = nil; ...@@ -198,7 +212,12 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
config_PutInt( p_playlist, "repeat", YES ); config_PutInt( p_playlist, "repeat", YES );
config_PutInt( p_playlist, "loop", NO ); config_PutInt( p_playlist, "loop", NO );
//vout_OSDMessage( VLCIntf, SPU_DEFAULT_CHANNEL, "%s", _( "Repeat One" ) ); vout_thread_t *p_vout = getVout();
if (p_vout)
{
vout_OSDMessage( p_vout, SPU_DEFAULT_CHANNEL, "%s", _( "Repeat One" ) );
vlc_object_release( p_vout );
}
} }
- (void)repeatOff - (void)repeatOff
...@@ -210,11 +229,14 @@ static VLCCoreInteraction *_o_sharedInstance = nil; ...@@ -210,11 +229,14 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
config_PutInt( p_playlist, "repeat", NO ); config_PutInt( p_playlist, "repeat", NO );
config_PutInt( p_playlist, "loop", NO ); config_PutInt( p_playlist, "loop", NO );
//vout_OSDMessage( VLCIntf, SPU_DEFAULT_CHANNEL, "%s", _( "Repeat Off" ) ); vout_thread_t *p_vout = getVout();
if (p_vout)
{
vout_OSDMessage( p_vout, SPU_DEFAULT_CHANNEL, "%s", _( "Repeat Off" ) );
vlc_object_release( p_vout );
}
} }
// CAVE: [o_main manageVolumeSlider]
- (void)volumeUp - (void)volumeUp
{ {
var_SetInteger( VLCIntf->p_libvlc, "key-action", ACTIONID_VOL_UP ); var_SetInteger( VLCIntf->p_libvlc, "key-action", ACTIONID_VOL_UP );
......
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