/*****************************************************************************
- * controls.m: MacOS X interface plugin
+ * controls.m: MacOS X interface module
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
- * $Id: controls.m,v 1.43 2003/06/30 01:52:57 hartman Exp $
+ * $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
- * Derk-Jan Hartman <thedj@users.sourceforge.net>
+ * Derk-Jan Hartman <hartman at videolan dot org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "vout.h"
#include "open.h"
#include "controls.h"
+#include <osd.h>
/*****************************************************************************
* VLCControls implementation
- (IBAction)play:(id)sender
{
- intf_thread_t * p_intf = [NSApp getIntf];
-
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ vlc_value_t val;
+ playlist_t * p_playlist;
+ intf_thread_t * p_intf = VLCIntf;
+ input_thread_t * p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT,
FIND_ANYWHERE );
- if( p_playlist == NULL )
+
+ val.i_int = PLAYING_S;
+ if( p_input )
{
- return;
+ var_Get( p_input, "state", &val );
}
-
- if( playlist_IsPlaying( p_playlist ) )
+ if( p_input && val.i_int != PAUSE_S )
{
- playlist_Pause( p_playlist );
- vlc_object_release( p_playlist );
+ vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Pause" ) );
+ val.i_int = PAUSE_S;
+ var_Set( p_input, "state", val );
}
else
{
- if( !playlist_IsEmpty( p_playlist ) )
- {
- playlist_Play( p_playlist );
- vlc_object_release( p_playlist );
- }
- else
+ p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ if( p_playlist )
{
- vlc_object_release( p_playlist );
- [o_open openFileGeneric: nil];
+ vlc_mutex_lock( &p_playlist->object_lock );
+ if( p_playlist->i_size )
+ {
+ vlc_mutex_unlock( &p_playlist->object_lock );
+ vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Play" ) );
+ playlist_Play( p_playlist );
+ vlc_object_release( p_playlist );
+ }
+ else
+ {
+ vlc_mutex_unlock( &p_playlist->object_lock );
+ vlc_object_release( p_playlist );
+ [o_open openFileGeneric: nil];
+ }
}
}
+ if( p_input ) vlc_object_release( p_input );
}
- (IBAction)stop:(id)sender
{
- intf_thread_t * p_intf = [NSApp getIntf];
-
+ intf_thread_t * p_intf = VLCIntf;
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
- if( p_playlist == NULL )
+ if( p_playlist != NULL )
{
- return;
+ vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Stop" ) );
+ playlist_Stop( p_playlist );
+ vlc_object_release( p_playlist );
}
-
- playlist_Stop( p_playlist );
- vlc_object_release( p_playlist );
}
- (IBAction)faster:(id)sender
{
- intf_thread_t * p_intf = [NSApp getIntf];
-
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ intf_thread_t * p_intf = VLCIntf;
+ input_thread_t * p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT,
FIND_ANYWHERE );
- if( p_playlist == NULL )
+ if( p_input != NULL )
{
- return;
+ vlc_value_t val; val.b_bool = VLC_TRUE;
+
+ var_Set( p_input, "rate-faster", val );
+ vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Faster" ) );
+ vlc_object_release( p_input );
}
+}
- vlc_mutex_lock( &p_playlist->object_lock );
- if( p_playlist->p_input != NULL )
+- (IBAction)slower:(id)sender
+{
+ intf_thread_t * p_intf = VLCIntf;
+ input_thread_t * p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT,
+ FIND_ANYWHERE );
+ if( p_input != NULL )
{
- input_SetStatus( p_playlist->p_input, INPUT_STATUS_FASTER );
- }
- vlc_mutex_unlock( &p_playlist->object_lock );
+ vlc_value_t val; val.b_bool = VLC_TRUE;
- vlc_object_release( p_playlist );
+ var_Set( p_input, "rate-slower", val );
+ vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Slower" ) );
+ vlc_object_release( p_input );
+ }
}
-- (IBAction)slower:(id)sender
+- (IBAction)prev:(id)sender
{
- intf_thread_t * p_intf = [NSApp getIntf];
-
+ intf_thread_t * p_intf = VLCIntf;
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
- if( p_playlist == NULL )
+ if( p_playlist )
{
- return;
+ playlist_Prev( p_playlist );
+ vlc_object_release( p_playlist );
+ vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Previous" ) );
}
+}
- vlc_mutex_lock( &p_playlist->object_lock );
- if( p_playlist->p_input != NULL )
+- (IBAction)next:(id)sender
+{
+ intf_thread_t * p_intf = VLCIntf;
+ playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ if( p_playlist )
{
- input_SetStatus( p_playlist->p_input, INPUT_STATUS_SLOWER );
+ playlist_Next( p_playlist );
+ vlc_object_release( p_playlist );
+ vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Next" ) );
}
- vlc_mutex_unlock( &p_playlist->object_lock );
-
- vlc_object_release( p_playlist );
}
-- (IBAction)prev:(id)sender
+- (IBAction)random:(id)sender
{
+ intf_thread_t * p_intf = VLCIntf;
vlc_value_t val;
- intf_thread_t * p_intf = [NSApp getIntf];
-
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
if( p_playlist == NULL )
return;
}
- vlc_mutex_lock( &p_playlist->object_lock );
-
- if( p_playlist->p_input == NULL )
+ var_Get( p_playlist, "random", &val );
+ val.b_bool = !val.b_bool;
+ var_Set( p_playlist, "random", val );
+ if( val.b_bool )
{
- vlc_mutex_unlock( &p_playlist->object_lock );
- vlc_object_release( p_playlist );
- return;
- }
-
- vlc_mutex_lock( &p_playlist->p_input->stream.stream_lock );
-
-#define p_area p_playlist->p_input->stream.p_selected_area
- if( p_area->i_part > 0 && p_area->i_part_nb > 1)
- {
- vlc_mutex_unlock( &p_playlist->p_input->stream.stream_lock );
- vlc_mutex_unlock( &p_playlist->object_lock );
- var_Get( p_playlist->p_input, "prev-chapter", &val );
- var_Set( p_playlist->p_input, "prev-chapter", val );
-
- p_intf->p_sys->b_input_update = VLC_TRUE;
- }
- else if( p_area->i_id > 1 )
- {
- vlc_mutex_unlock( &p_playlist->p_input->stream.stream_lock );
- vlc_mutex_unlock( &p_playlist->object_lock );
- var_Get( p_playlist->p_input, "prev-title", &val );
- var_Set( p_playlist->p_input, "prev-title", val );
-
- p_intf->p_sys->b_input_update = VLC_TRUE;
+ vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Random On" ) );
}
else
{
- vlc_mutex_unlock( &p_playlist->p_input->stream.stream_lock );
- vlc_mutex_unlock( &p_playlist->object_lock );
- playlist_Prev( p_playlist );
- }
-#undef p_area
+ vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Random Off" ) );
+ }
+ p_intf->p_sys->b_playlist_update = VLC_TRUE;
+ p_intf->p_sys->b_intf_update = VLC_TRUE;
vlc_object_release( p_playlist );
}
-- (IBAction)next:(id)sender
+- (IBAction)repeat:(id)sender
{
+ intf_thread_t * p_intf = VLCIntf;
vlc_value_t val;
- intf_thread_t * p_intf = [NSApp getIntf];
-
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
if( p_playlist == NULL )
{
return;
}
-
- vlc_mutex_lock( &p_playlist->object_lock );
- if( p_playlist->p_input == NULL )
- {
- vlc_mutex_unlock( &p_playlist->object_lock );
- vlc_object_release( p_playlist );
- return;
- }
-
- vlc_mutex_lock( &p_playlist->p_input->stream.stream_lock );
-
-#define p_area p_playlist->p_input->stream.p_selected_area
- if( p_area->i_part < p_area->i_part_nb && p_area->i_part_nb > 1 )
- {
- vlc_mutex_unlock( &p_playlist->p_input->stream.stream_lock );
- vlc_mutex_unlock( &p_playlist->object_lock );
- var_Get( p_playlist->p_input, "next-chapter", &val );
- var_Set( p_playlist->p_input, "next-chapter", val );
-
- p_intf->p_sys->b_input_update = VLC_TRUE;
- }
- else if( p_area->i_id < p_playlist->p_input->stream.i_area_nb )
+ var_Get( p_playlist, "repeat", &val );
+ if (!val.b_bool)
+ {
+ var_Set( p_playlist, "loop", val );
+ }
+ val.b_bool = !val.b_bool;
+ var_Set( p_playlist, "repeat", val );
+ if( val.b_bool )
{
- vlc_mutex_unlock( &p_playlist->p_input->stream.stream_lock );
- vlc_mutex_unlock( &p_playlist->object_lock );
- var_Get( p_playlist->p_input, "next-title", &val );
- var_Set( p_playlist->p_input, "next-title", val );
-
- p_intf->p_sys->b_input_update = VLC_TRUE;
+ vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat All" ) );
}
else
{
- vlc_mutex_unlock( &p_playlist->p_input->stream.stream_lock );
- vlc_mutex_unlock( &p_playlist->object_lock );
- playlist_Next( p_playlist );
+ vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat Off" ) );
}
-#undef p_area
+ p_intf->p_sys->b_playlist_update = VLC_TRUE;
+ p_intf->p_sys->b_intf_update = VLC_TRUE;
vlc_object_release( p_playlist );
}
- (IBAction)loop:(id)sender
{
- intf_thread_t * p_intf = [NSApp getIntf];
-
+ intf_thread_t * p_intf = VLCIntf;
+ vlc_value_t val;
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
if( p_playlist == NULL )
return;
}
- config_PutInt( p_playlist, "loop",
- !config_GetInt( p_playlist, "loop" ) );
+ var_Get( p_playlist, "loop", &val );
+ if (!val.b_bool)
+ {
+ var_Set( p_playlist, "repeat", val );
+ }
+ val.b_bool = !val.b_bool;
+ var_Set( p_playlist, "loop", val );
+ if( val.b_bool )
+ {
+ vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat One" ) );
+ }
+ else
+ {
+ vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat Off" ) );
+ }
+ p_intf->p_sys->b_playlist_update = VLC_TRUE;
+ p_intf->p_sys->b_intf_update = VLC_TRUE;
vlc_object_release( p_playlist );
}
- (IBAction)forward:(id)sender
{
- intf_thread_t * p_intf = [NSApp getIntf];
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ intf_thread_t * p_intf = VLCIntf;
+ input_thread_t * p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT,
FIND_ANYWHERE );
- if( p_playlist == NULL || p_playlist->p_input == NULL )
+ if( p_input != NULL )
{
- if ( p_playlist != NULL ) vlc_object_release( p_playlist );
- return;
+ vlc_value_t time;
+ time.i_time = 10 * 1000000;
+ var_Set( p_input, "time-offset", time );
+ vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Jump +10 Seconds" ) );
+ vlc_object_release( p_input );
}
-
- input_Seek( p_playlist->p_input, 5, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR );
- vlc_object_release( p_playlist );
}
- (IBAction)backward:(id)sender
{
- intf_thread_t * p_intf = [NSApp getIntf];
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ intf_thread_t * p_intf = VLCIntf;
+ input_thread_t * p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT,
FIND_ANYWHERE );
- if( p_playlist == NULL || p_playlist->p_input == NULL )
+ if( p_input != NULL )
{
- if ( p_playlist != NULL ) vlc_object_release( p_playlist );
- return;
+ vlc_value_t time;
+ time.i_time = -10 * 1000000;
+ var_Set( p_input, "time-offset", time );
+ vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Jump -10 Seconds" ) );
+ vlc_object_release( p_input );
}
-
- input_Seek( p_playlist->p_input, -5, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR );
- vlc_object_release( p_playlist );
}
+
- (IBAction)volumeUp:(id)sender
{
- intf_thread_t * p_intf = [NSApp getIntf];
+ intf_thread_t * p_intf = VLCIntf;
if( p_intf->p_sys->b_mute )
{
- (IBAction)volumeDown:(id)sender
{
- intf_thread_t * p_intf = [NSApp getIntf];
+ intf_thread_t * p_intf = VLCIntf;
if( p_intf->p_sys->b_mute )
{
- (IBAction)mute:(id)sender
{
- intf_thread_t * p_intf = [NSApp getIntf];
+ intf_thread_t * p_intf = VLCIntf;
audio_volume_t i_volume;
aout_VolumeMute( p_intf, &i_volume );
- (IBAction)volumeSliderUpdated:(id)sender
{
- intf_thread_t * p_intf = [NSApp getIntf];
+ intf_thread_t * p_intf = VLCIntf;
audio_volume_t i_volume = (audio_volume_t)[sender intValue];
aout_VolumeSet( p_intf, i_volume * AOUT_VOLUME_STEP );
- (void)updateVolumeSlider
{
- intf_thread_t * p_intf = [NSApp getIntf];
+ intf_thread_t * p_intf = VLCIntf;
audio_volume_t i_volume;
aout_VolumeGet( p_intf, &i_volume );
- [o_volumeslider setFloatValue: (float)(i_volume / AOUT_VOLUME_STEP)];
+ [o_volumeslider setFloatValue: (float)(i_volume / AOUT_VOLUME_STEP)];
+
+ vout_OSDMessage( p_intf, DEFAULT_CHAN, "Vol %d%%",
+ i_volume*200/AOUT_VOLUME_MAX );
}
- (IBAction)windowAction:(id)sender
{
id o_window = [NSApp keyWindow];
NSString *o_title = [sender title];
- NSArray *o_windows = [NSApp windows];
+ NSArray *o_windows = [NSApp orderedWindows];
NSEnumerator *o_enumerator = [o_windows objectEnumerator];
- vout_thread_t *p_vout = vlc_object_find( [NSApp getIntf], VLC_OBJECT_VOUT,
+ vout_thread_t *p_vout = vlc_object_find( VLCIntf, VLC_OBJECT_VOUT,
FIND_ANYWHERE );
if( p_vout != NULL )
{
if( [[o_window className] isEqualToString: @"VLCWindow"] )
{
- if( [o_title isEqualToString: _NS("Fullscreen") ] )
- [o_window toggleFullscreen];
- else if( [o_title isEqualToString: _NS("Half Size") ] )
+ if( [o_title isEqualToString: _NS("Half Size") ] )
[o_window scaleWindowWithFactor: 0.5];
else if( [o_title isEqualToString: _NS("Normal Size") ] )
[o_window scaleWindowWithFactor: 1.0];
else if( [o_title isEqualToString: _NS("Double Size") ] )
[o_window scaleWindowWithFactor: 2.0];
- else if( [o_title isEqualToString: _NS("Float On Top") ] )
+ else if( [o_title isEqualToString: _NS("Float on Top") ] )
[o_window toggleFloatOnTop];
- else if( [o_title isEqualToString: _NS("Fit To Screen") ] )
+ else if( [o_title isEqualToString: _NS("Fit to Screen") ] )
{
if( ![o_window isZoomed] )
[o_window performZoom:self];
}
+ else
+ {
+ [o_window toggleFullscreen];
+ }
+ break;
}
}
vlc_object_release( (vlc_object_t *)p_vout );
/* Get the descriptive name of the variable */
var_Change( p_object, psz_variable, VLC_VAR_GETTEXT, &text, NULL );
- [o_mi setTitle: [NSApp localizedString: text.psz_string ?
+ [o_mi setTitle: [[VLCMain sharedInstance] localizedString: text.psz_string ?
text.psz_string : strdup( psz_variable ) ]];
var_Get( p_object, psz_variable, &val );
o_data = [[VLCMenuExt alloc] initWithVar: psz_variable Object: p_object->i_object_id
Value: val ofType: i_type];
[o_mi setRepresentedObject: [NSValue valueWithPointer:[o_data retain]]];
- [o_mi setState: val.b_bool ? TRUE : FALSE ];
+ if( !( i_type & VLC_VAR_ISCOMMAND ) )
+ [o_mi setState: val.b_bool ? TRUE : FALSE ];
break;
default:
return;
}
- if( (i_type & VLC_VAR_TYPE) == VLC_VAR_STRING ) free( val.psz_string );
+ if( ( i_type & VLC_VAR_TYPE ) == VLC_VAR_STRING ) free( val.psz_string );
if( text.psz_string ) free( text.psz_string );
}
switch( i_type & VLC_VAR_TYPE )
{
- case VLC_VAR_VARIABLE:
-
- /* This is causing crashes for the moment.
- o_title = [NSApp localizedString: text_list.p_list->p_values[i].psz_string ?
- text_list.p_list->p_values[i].psz_string : val_list.p_list->p_values[i].psz_string ];
-
- o_data = [[VLCMenuExt alloc] initWithVar: strdup(psz_variable) Object: p_object->i_object_id
- Value: val ofType: i_type];
- [o_lmi setRepresentedObject: [NSValue valueWithPointer:[o_data retain]]];
-
- // Create a submenu
- NSMenu *o_menu = [o_lmi submenu];
-
- [self setupVarMenu: o_menu forMenuItem: o_lmi target:p_object
- var:psz_variable selector:pf_callback];
-*/
- return;
-
case VLC_VAR_STRING:
another_val.psz_string =
strdup(val_list.p_list->p_values[i].psz_string);
- o_title = [NSApp localizedString: text_list.p_list->p_values[i].psz_string ?
+ o_title = [[VLCMain sharedInstance] localizedString: text_list.p_list->p_values[i].psz_string ?
text_list.p_list->p_values[i].psz_string : val_list.p_list->p_values[i].psz_string ];
o_lmi = [o_menu addItemWithTitle: o_title action: pf_callback keyEquivalent: @""];
[o_lmi setRepresentedObject: [NSValue valueWithPointer:[o_data retain]]];
[o_lmi setTarget: self];
- if( !strcmp( val.psz_string, val_list.p_list->p_values[i].psz_string ) )
+ if( !strcmp( val.psz_string, val_list.p_list->p_values[i].psz_string ) && !( i_type & VLC_VAR_ISCOMMAND ) )
[o_lmi setState: TRUE ];
break;
case VLC_VAR_INTEGER:
o_title = text_list.p_list->p_values[i].psz_string ?
- [NSApp localizedString: strdup( text_list.p_list->p_values[i].psz_string )] :
+ [[VLCMain sharedInstance] localizedString: strdup( text_list.p_list->p_values[i].psz_string )] :
[NSString stringWithFormat: @"%d",
val_list.p_list->p_values[i].i_int];
[o_lmi setRepresentedObject: [NSValue valueWithPointer:[ o_data retain]]];
[o_lmi setTarget: self];
- if( val_list.p_list->p_values[i].i_int == val.i_int )
+ if( val_list.p_list->p_values[i].i_int == val.i_int && !( i_type & VLC_VAR_ISCOMMAND ) )
[o_lmi setState: TRUE ];
break;
NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
VLCMenuExt *o_data = (VLCMenuExt *)_o_data;
- vlc_thread_set_priority( [NSApp getIntf] , VLC_THREAD_PRIORITY_LOW );
+ vlc_thread_set_priority( VLCIntf , VLC_THREAD_PRIORITY_LOW );
- p_object = (vlc_object_t *)vlc_object_get( [NSApp getIntf],
+ p_object = (vlc_object_t *)vlc_object_get( VLCIntf,
[o_data objectID] );
if( p_object != NULL )
- (BOOL)validateMenuItem:(NSMenuItem *)o_mi
{
BOOL bEnabled = TRUE;
- intf_thread_t * p_intf = [NSApp getIntf];
-
+ vlc_value_t val;
+ intf_thread_t * p_intf = VLCIntf;
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
{
if( p_playlist != NULL && p_input != NULL )
{
- vlc_mutex_lock( &p_input->stream.stream_lock );
- bEnabled = p_input->stream.b_pace_control;
- vlc_mutex_unlock( &p_input->stream.stream_lock );
+ bEnabled = p_input->input.b_can_pace_control;
}
else
{
else
{
bEnabled = p_playlist->i_size > 1;
-
- if( p_input != NULL )
- {
- vlc_mutex_lock( &p_input->stream.stream_lock );
- bEnabled |= p_input->stream.i_area_nb > 1;
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- }
}
}
- else if( [[o_mi title] isEqualToString: _NS("Loop")] )
+ else if( [[o_mi title] isEqualToString: _NS("Random")] )
{
- int i_state = config_GetInt( p_playlist, "loop" ) ?
- NSOnState : NSOffState;
-
+ int i_state;
+ var_Get( p_playlist, "random", &val );
+ i_state = val.b_bool ? NSOnState : NSOffState;
+ [o_mi setState: i_state];
+ }
+ else if( [[o_mi title] isEqualToString: _NS("Repeat One")] )
+ {
+ int i_state;
+ var_Get( p_playlist, "repeat", &val );
+ i_state = val.b_bool ? NSOnState : NSOffState;
+ [o_mi setState: i_state];
+ }
+ else if( [[o_mi title] isEqualToString: _NS("Repeat All")] )
+ {
+ int i_state;
+ var_Get( p_playlist, "loop", &val );
+ i_state = val.b_bool ? NSOnState : NSOffState;
[o_mi setState: i_state];
}
else if( [[o_mi title] isEqualToString: _NS("Step Forward")] ||
{
if( p_playlist != NULL && p_input != NULL )
{
- vlc_mutex_lock( &p_input->stream.stream_lock );
- bEnabled = p_input->stream.b_seekable;
- vlc_mutex_unlock( &p_input->stream.stream_lock );
+ bEnabled = TRUE; /* FIXME p_input seekable */
}
else
{
[[o_mi title] isEqualToString: _NS("Half Size")] ||
[[o_mi title] isEqualToString: _NS("Normal Size")] ||
[[o_mi title] isEqualToString: _NS("Double Size")] ||
- [[o_mi title] isEqualToString: _NS("Fit To Screen")] ||
- [[o_mi title] isEqualToString: _NS("Float On Top")] )
+ [[o_mi title] isEqualToString: _NS("Fit to Screen")] ||
+ [[o_mi title] isEqualToString: _NS("Float on Top")] )
{
id o_window;
- NSArray *o_windows = [NSApp windows];
+ NSArray *o_windows = [NSApp orderedWindows];
NSEnumerator *o_enumerator = [o_windows objectEnumerator];
bEnabled = FALSE;
- if ( [[o_mi title] isEqualToString: _NS("Float On Top")] )
- {
- int i_state = config_GetInt( p_playlist, "macosx-float" ) ?
- NSOnState : NSOffState;
- [o_mi setState: i_state];
- }
-
vout_thread_t *p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
FIND_ANYWHERE );
if( p_vout != NULL )
{
+ if ( [[o_mi title] isEqualToString: _NS("Float on Top")] )
+ {
+ var_Get( p_vout, "video-on-top", &val );
+ [o_mi setState: val.b_bool ? NSOnState : NSOffState];
+ }
+
while ((o_window = [o_enumerator nextObject]))
{
if( [[o_window className] isEqualToString: @"VLCWindow"] )
projects / vlc / blobdiff