* OpenIntf: initialize interface
*****************************************************************************/
int E_(OpenIntf) ( vlc_object_t *p_this )
-{
+{
intf_thread_t *p_intf = (intf_thread_t*) p_this;
p_intf->p_sys = malloc( sizeof( intf_sys_t ) );
}
memset( p_intf->p_sys, 0, sizeof( *p_intf->p_sys ) );
-
+
p_intf->p_sys->o_pool = [[NSAutoreleasePool alloc] init];
/* Put Cocoa into multithread mode as soon as possible.
* TasksAndConcepts/ProgrammingTopics/Multithreading/index.html
* This thread does absolutely nothing at all. */
[NSThread detachNewThreadSelector:@selector(self) toTarget:[NSString string] withObject:nil];
-
+
p_intf->p_sys->o_sendport = [[NSPort port] retain];
p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
p_intf->b_play = VLC_TRUE;
void E_(CloseIntf) ( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t*) p_this;
-
+
msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
-
+
[p_intf->p_sys->o_sendport release];
[p_intf->p_sys->o_pool release];
-
+
free( p_intf->p_sys );
}
withObject: [NSValue valueWithPointer: p_arg]
waitUntilDone: NO];
}
- else if( NSApp != nil && [[VLCMain sharedInstance] respondsToSelector: @selector(getIntf)] )
+ else if( NSApp != nil && [[VLCMain sharedInstance] respondsToSelector: @selector(getIntf)] )
{
NSValue * o_v1;
NSValue * o_v2;
p_intf = (intf_thread_t *)VLCIntf;
o_recv_port = [[NSPort port] retain];
- o_v1 = [NSValue valueWithPointer: val];
+ o_v1 = [NSValue valueWithPointer: val];
o_v2 = [NSValue valueWithPointer: p_arg];
o_sig = [target methodSignatureForSelector: sel];
[o_msg release];
[o_recv_port release];
- }
+ }
else
{
i_ret = 1;
{
unichar i_nskey;
unsigned int i_vlckey;
-} nskeys_to_vlckeys[] =
+} nskeys_to_vlckeys[] =
{
{ NSUpArrowFunctionKey, KEY_UP },
{ NSDownArrowFunctionKey, KEY_DOWN },
unichar VLCKeyToCocoa( unsigned int i_key )
{
unsigned int i;
-
+
for( i = 0; nskeys_to_vlckeys[i].i_vlckey != 0; i++ )
{
if( nskeys_to_vlckeys[i].i_vlckey == (i_key & ~KEY_MODIFIER) )
unsigned int CocoaKeyToVLC( unichar i_key )
{
unsigned int i;
-
+
for( i = 0; nskeys_to_vlckeys[i].i_nskey != 0; i++ )
{
if( nskeys_to_vlckeys[i].i_nskey == i_key )
}
/*****************************************************************************
- * VLCMain implementation
+ * VLCMain implementation
*****************************************************************************/
@implementation VLCMain
return _o_sharedMainInstance ? _o_sharedMainInstance : [[self alloc] init];
}
-- (id)init
+- (id)init
{
- if (_o_sharedMainInstance) {
+ if( _o_sharedMainInstance) {
[self dealloc];
} else {
_o_sharedMainInstance = [super init];
}
-
+
return _o_sharedMainInstance;
}
[o_window setExcludedFromWindowsMenu: TRUE];
[o_msgs_panel setExcludedFromWindowsMenu: TRUE];
[o_msgs_panel setDelegate: self];
-
+
i_key = config_GetInt( p_intf, "key-quit" );
[o_mi_quit setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
[o_mi_quit setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
[self setSubmenusEnabled: FALSE];
[self manageVolumeSlider];
-
+
p_playlist = (playlist_t *) vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( p_playlist )
[o_volumeslider setToolTip: _NS("Volume")];
[o_timeslider setToolTip: _NS("Position")];
- /* messages panel */
+ /* messages panel */
[o_msgs_panel setTitle: _NS("Messages")];
[o_msgs_btn_crashlog setTitle: _NS("Open CrashLog")];
[o_mu_title setTitle: _NS("Title")];
[o_mi_chapter setTitle: _NS("Chapter")];
[o_mu_chapter setTitle: _NS("Chapter")];
-
+
[o_mu_audio setTitle: _NS("Audio")];
[o_mi_vol_up setTitle: _NS("Volume Up")];
[o_mi_vol_down setTitle: _NS("Volume Down")];
[o_mu_device setTitle: _NS("Audio Device")];
[o_mi_visual setTitle: _NS("Visualizations")];
[o_mu_visual setTitle: _NS("Visualizations")];
-
+
[o_mu_video setTitle: _NS("Video")];
[o_mi_half_window setTitle: _NS("Half Size")];
[o_mi_normal_window setTitle: _NS("Normal Size")];
[o_mu_subtitle setTitle: _NS("Subtitles Track")];
[o_mi_deinterlace setTitle: _NS("Deinterlace")];
[o_mu_deinterlace setTitle: _NS("Deinterlace")];
+ [o_mi_ffmpeg_pp setTitle: _NS("Post processing")];
+ [o_mu_ffmpeg_pp setTitle: _NS("Post processing")];
[o_mu_window setTitle: _NS("Window")];
[o_mi_minimize setTitle: _NS("Minimize Window")];
[o_mi_close_window setTitle: _NS("Close Window")];
[o_mi_controller setTitle: _NS("Controller")];
+ [o_mi_equalizer setTitle: _NS("Equalizer")];
[o_mi_playlist setTitle: _NS("Playlist")];
[o_mi_info setTitle: _NS("Info")];
[o_mi_messages setTitle: _NS("Messages")];
/* error panel */
[o_error setTitle: _NS("Error")];
[o_err_lbl setStringValue: _NS("An error has occurred which probably prevented the execution of your request:")];
- [o_err_bug_lbl setStringValue: _NS("If you believe that it is a bug, please follow the instructions at:")];
+ [o_err_bug_lbl setStringValue: _NS("If you believe that it is a bug, please follow the instructions at:")];
[o_err_btn_msgs setTitle: _NS("Open Messages Window")];
[o_err_btn_dismiss setTitle: _NS("Dismiss")];
[o_err_ckbk_surpress setTitle: _NS("Suppress further errors")];
o_img_pause_pressed = [[NSImage imageNamed: @"pause_blue"] retain];
[p_intf->p_sys->o_sendport setDelegate: self];
- [[NSRunLoop currentRunLoop]
+ [[NSRunLoop currentRunLoop]
addPort: p_intf->p_sys->o_sendport
forMode: NSDefaultRunLoopMode];
[NSThread detachNewThreadSelector: @selector(manage)
toTarget: self withObject: nil];
-
+
[o_controls setupVarMenuItem: o_mi_add_intf target: (vlc_object_t *)p_intf
var: "intf-add" selector: @selector(toggleVar:)];
NSDictionary *o_dic = [NSDictionary dictionaryWithObjectsAndKeys: o_filename, @"ITEM_URL", nil];
[o_playlist appendArray:
[NSArray arrayWithObject: o_dic] atPos: -1 enqueue: NO];
-
+
return( TRUE );
}
{
o_data = [id dataUsingEncoding: NSUTF8StringEncoding
allowLossyConversion: YES];
- psz_string = malloc( [o_data length] + 1 );
+ psz_string = malloc( [o_data length] + 1 );
[o_data getBytes: psz_string];
psz_string[ [o_data length] ] = '\0';
msg_Err( VLCIntf, "cannot convert to wanted encoding: %s",
}
else
{
- psz_string = malloc( [o_data length] + 1 );
+ psz_string = malloc( [o_data length] + 1 );
[o_data getBytes: psz_string];
psz_string[ [o_data length] ] = '\0';
}
NSLayoutManager *o_layout_manager = [[NSLayoutManager alloc] init];
NSTextContainer *o_container = [[NSTextContainer alloc]
initWithContainerSize: NSMakeSize(i_width, 2000)];
-
+
[o_layout_manager addTextContainer: o_container];
[o_container release];
[o_storage addLayoutManager: o_layout_manager];
[o_layout_manager release];
-
+
o_wrapped = [o_in_string mutableCopy];
glyphRange = [o_layout_manager glyphRangeForTextContainer: o_container];
-
+
for( glyphIndex = glyphRange.location ; glyphIndex < NSMaxRange(glyphRange) ;
glyphIndex += effectiveRange.length) {
lineFragmentRect = [o_layout_manager lineFragmentRectForGlyphAtIndex: glyphIndex
o_out_string = [NSString stringWithString: o_wrapped];
[o_wrapped release];
[o_storage release];
-
+
return o_out_string;
}
- (void)manage
{
NSDate * o_sleep_date;
+ playlist_t * p_playlist;
+
/* new thread requires a new pool */
NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW );
+ p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+
+ if( p_playlist != NULL )
+ {
+ var_AddCallback( p_playlist, "intf-change", PlaylistChanged, self );
+ var_AddCallback( p_playlist, "item-change", PlaylistChanged, self );
+ var_AddCallback( p_playlist, "playlist-current", PlaylistChanged, self );
+ vlc_object_release( p_playlist );
+ }
+
while( !p_intf->b_die )
{
- playlist_t * p_playlist;
- vlc_value_t val;
vlc_mutex_lock( &p_intf->change_lock );
- p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
+#define p_input p_intf->p_sys->p_input
- if( p_playlist != NULL )
+ if( p_input == NULL )
{
- var_AddCallback( p_playlist, "intf-change", PlaylistChanged, self );
- var_AddCallback( p_playlist, "item-change", PlaylistChanged, self );
- var_AddCallback( p_playlist, "playlist-current", PlaylistChanged, self );
+ p_input = (input_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_INPUT,
+ FIND_ANYWHERE );
-#define p_input p_playlist->p_input
-
+ /* Refresh the interface */
if( p_input )
{
- if( !p_input->b_die )
- {
- vlc_value_t val;
-
- /* New input or stream map change */
- msg_Dbg( p_intf, "stream has changed, refreshing interface" );
- p_intf->p_sys->b_playing = TRUE;
- p_intf->p_sys->b_current_title_update = 1;
- p_intf->p_sys->b_intf_update = TRUE;
-
- if( var_Get( (vlc_object_t *)p_input, "intf-change", &val )
- >= 0 && val.b_bool )
- {
- p_intf->p_sys->b_input_update = TRUE;
- }
- }
- }
- else if( p_intf->p_sys->b_playing && !p_intf->b_die )
- {
- p_intf->p_sys->b_playing = FALSE;
- }
-
-#undef p_input
- vlc_object_release( p_playlist );
-
- if( var_Get( p_intf, "intf-change", &val )
- >= 0 && val.b_bool )
- {
- p_intf->p_sys->b_fullscreen_update = TRUE;
+ msg_Dbg( p_intf, "input has changed, refreshing interface" );
+ p_intf->p_sys->i_play_status = PLAYING_S;
+ p_intf->p_sys->b_playing = TRUE;
+ p_intf->p_sys->b_current_title_update = 1;
+ p_intf->p_sys->b_intf_update = TRUE;
+ p_intf->p_sys->b_input_update = TRUE;
}
- val.b_bool = VLC_FALSE;
- var_Set( p_intf,"intf-change",val);
}
+ else if( p_input->b_dead )
+ {
+ /* input stopped */
+ p_intf->p_sys->b_playing = FALSE;
+ p_intf->p_sys->b_intf_update = TRUE;
+ p_intf->p_sys->i_play_status = PAUSE_S;
+ [o_scrollfield setStringValue: _NS("VLC media player") ];
+ vlc_object_release( p_input );
+ p_input = NULL;
+ }
+#undef p_input
vlc_mutex_unlock( &p_intf->change_lock );
- o_sleep_date = [NSDate dateWithTimeIntervalSinceNow: .5];
+ o_sleep_date = [NSDate dateWithTimeIntervalSinceNow: .3];
[NSThread sleepUntilDate: o_sleep_date];
}
- (void)manageIntf:(NSTimer *)o_timer
{
+ vlc_value_t val;
+
if( p_intf->p_vlc->b_die == VLC_TRUE )
{
[o_timer invalidate];
return;
}
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
-
- if( p_playlist == NULL )
- {
- return;
- }
-
- if ( p_intf->p_sys->b_playlist_update )
- {
- [o_playlist playlistUpdated];
- p_intf->p_sys->b_playlist_update = VLC_FALSE;
- }
-
- if( p_intf->p_sys->b_current_title_update )
- {
- NSString *o_temp;
- vout_thread_t *p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
- FIND_ANYWHERE );
-
- vlc_mutex_lock( &p_playlist->object_lock );
- o_temp = [NSString stringWithUTF8String:
- p_playlist->pp_items[p_playlist->i_index]->input.psz_name];
- if( o_temp == NULL )
- o_temp = [NSString stringWithCString:
- p_playlist->pp_items[p_playlist->i_index]->input.psz_name];
- vlc_mutex_unlock( &p_playlist->object_lock );
- [o_scrollfield setStringValue: o_temp ];
-
- if( p_vout != NULL )
- {
- id o_vout_wnd;
- NSEnumerator * o_enum = [[NSApp orderedWindows] objectEnumerator];
-
- while( ( o_vout_wnd = [o_enum nextObject] ) )
- {
- if( [[o_vout_wnd className] isEqualToString: @"VLCWindow"] )
- {
- ;//[o_vout_wnd updateTitle];
- }
- }
- vlc_object_release( (vlc_object_t *)p_vout );
- }
- [o_playlist updateRowSelection];
-
- p_intf->p_sys->b_current_title_update = FALSE;
- }
-
- vlc_mutex_lock( &p_playlist->object_lock );
-
-#define p_input p_playlist->p_input
-
+#define p_input p_intf->p_sys->p_input
if( p_intf->p_sys->b_intf_update )
{
vlc_bool_t b_input = VLC_FALSE;
vlc_bool_t b_seekable = VLC_FALSE;
vlc_bool_t b_chapters = VLC_FALSE;
+ playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
b_plmul = p_playlist->i_size > 1;
+ vlc_object_release( p_playlist );
+
if( ( b_input = ( p_input != NULL ) ) )
{
/* seekable streams */
- b_seekable = (BOOL)f_slider_old;
+ var_Get( p_input, "seekable", &val);
+ b_seekable = val.b_bool;
/* check wether slow/fast motion is possible*/
- b_control = p_input->input.b_can_pace_control;
+ b_control = p_input->input.b_can_pace_control;
/* chapters & titles */
- //b_chapters = p_input->stream.i_area_nb > 1;
+ //b_chapters = p_input->stream.i_area_nb > 1;
}
[o_btn_stop setEnabled: b_input];
[o_timeslider setEnabled: b_seekable];
[o_timefield setStringValue: @"0:00:00"];
- [self manageVolumeSlider];
p_intf->p_sys->b_intf_update = VLC_FALSE;
}
+ if ( p_intf->p_sys->b_playlist_update )
+ {
+ [o_playlist playlistUpdated];
+ p_intf->p_sys->b_playlist_update = VLC_FALSE;
+ }
+
if( p_intf->p_sys->b_fullscreen_update )
{
vout_thread_t * p_vout;
- vlc_value_t val;
-
+
+ playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+
[o_btn_fullscreen setState: ( var_Get( p_playlist, "fullscreen", &val )>=0 && val.b_bool ) ];
-
+
+ vlc_object_release( p_playlist );
+
p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE );
if( p_vout != NULL )
{
p_intf->p_sys->b_fullscreen_update = VLC_FALSE;
}
- if( p_intf->p_sys->b_playing && p_input != NULL )
+ if( p_input && !p_input->b_die )
{
- vlc_value_t time;
- NSString * o_time;
- mtime_t i_seconds;
+ vlc_value_t val;
- if( (BOOL)f_slider_old )
+ if( p_intf->p_sys->b_current_title_update )
{
- vlc_value_t pos;
- float f_updated;
-
- var_Get( p_input, "position", &pos );
- f_updated = 10000. * pos.f_float;
+ NSString *o_temp;
+ vout_thread_t *p_vout;
+ playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
- if( f_slider != f_updated )
+ if( p_playlist == NULL )
{
- [o_timeslider setFloatValue: f_updated];
+ return;
}
+
+ vlc_mutex_lock( &p_playlist->object_lock );
+ o_temp = [NSString stringWithUTF8String:
+ p_playlist->pp_items[p_playlist->i_index]->input.psz_name];
+ if( o_temp == NULL )
+ o_temp = [NSString stringWithCString:
+ p_playlist->pp_items[p_playlist->i_index]->input.psz_name];
+ vlc_mutex_unlock( &p_playlist->object_lock );
+ [o_scrollfield setStringValue: o_temp ];
+
+
+ p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
+ FIND_ANYWHERE );
+ if( p_vout != NULL )
+ {
+ id o_vout_wnd;
+ NSEnumerator * o_enum = [[NSApp orderedWindows] objectEnumerator];
+
+ while( ( o_vout_wnd = [o_enum nextObject] ) )
+ {
+ if( [[o_vout_wnd className] isEqualToString: @"VLCWindow"] )
+ {
+ ;//[o_vout_wnd updateTitle];
+ }
+ }
+ vlc_object_release( (vlc_object_t *)p_vout );
+ }
+ [o_playlist updateRowSelection];
+ vlc_object_release( p_playlist );
+ p_intf->p_sys->b_current_title_update = FALSE;
}
-
- var_Get( p_input, "time", &time );
- i_seconds = time.i_time / 1000000;
-
- o_time = [NSString stringWithFormat: @"%d:%02d:%02d",
- (int) (i_seconds / (60 * 60)),
- (int) (i_seconds / 60 % 60),
- (int) (i_seconds % 60)];
- [o_timefield setStringValue: o_time];
- }
- if( p_input )
- {
- vlc_value_t val;
- var_Get( p_input, "state", &val );
- if( val.i_int != PAUSE_S )
+ if( p_intf->p_sys->b_playing && [o_timeslider isEnabled] )
{
- p_intf->p_sys->b_play_status = TRUE;
+ /* Update the slider */
+ vlc_value_t time;
+ NSString * o_time;
+ mtime_t i_seconds;
+ vlc_value_t pos;
+ float f_updated;
+
+ var_Get( p_input, "position", &pos );
+ f_updated = 10000. * pos.f_float;
+ [o_timeslider setFloatValue: f_updated];
+
+ var_Get( p_input, "time", &time );
+ i_seconds = time.i_time / 1000000;
+
+ o_time = [NSString stringWithFormat: @"%d:%02d:%02d",
+ (int) (i_seconds / (60 * 60)),
+ (int) (i_seconds / 60 % 60),
+ (int) (i_seconds % 60)];
+ [o_timefield setStringValue: o_time];
}
- else
+
+ /* Manage volume status */
+ [self manageVolumeSlider];
+
+ /* Manage Playing status */
+ var_Get( p_input, "state", &val );
+ if( p_intf->p_sys->i_play_status != val.i_int )
{
- p_intf->p_sys->b_play_status = FALSE;
+ p_intf->p_sys->i_play_status = val.i_int;
+ [self playStatusUpdated: p_intf->p_sys->i_play_status];
}
- [self playStatusUpdated: p_intf->p_sys->b_play_status];
}
- else
+ else if( p_intf->p_sys->b_playing && !p_intf->b_die )
{
- p_intf->p_sys->b_play_status = FALSE;
- [self playStatusUpdated: p_intf->p_sys->b_play_status];
+ p_intf->p_sys->i_play_status = PAUSE_S;
+ p_intf->p_sys->b_intf_update = VLC_TRUE;
+ [self playStatusUpdated: p_intf->p_sys->i_play_status];
[self setSubmenusEnabled: FALSE];
}
#undef p_input
- vlc_mutex_unlock( &p_playlist->object_lock );
- vlc_object_release( p_playlist );
-
[self updateMessageArray];
- [NSTimer scheduledTimerWithTimeInterval: 0.5
+ [NSTimer scheduledTimerWithTimeInterval: 0.3
target: self selector: @selector(manageIntf:)
userInfo: nil repeats: FALSE];
}
- (void)setupMenus
{
- playlist_t *p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ playlist_t *p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
-
if( p_playlist != NULL )
{
#define p_input p_playlist->p_input
{
[o_controls setupVarMenuItem: o_mi_program target: (vlc_object_t *)p_input
var: "program" selector: @selector(toggleVar:)];
-
+
[o_controls setupVarMenuItem: o_mi_title target: (vlc_object_t *)p_input
var: "title" selector: @selector(toggleVar:)];
-
+
[o_controls setupVarMenuItem: o_mi_chapter target: (vlc_object_t *)p_input
var: "chapter" selector: @selector(toggleVar:)];
-
+
[o_controls setupVarMenuItem: o_mi_audiotrack target: (vlc_object_t *)p_input
var: "audio-es" selector: @selector(toggleVar:)];
-
+
[o_controls setupVarMenuItem: o_mi_videotrack target: (vlc_object_t *)p_input
var: "video-es" selector: @selector(toggleVar:)];
-
+
[o_controls setupVarMenuItem: o_mi_subtitle target: (vlc_object_t *)p_input
var: "spu-es" selector: @selector(toggleVar:)];
-
+
aout_instance_t * p_aout = vlc_object_find( p_intf, VLC_OBJECT_AOUT,
FIND_ANYWHERE );
if ( p_aout != NULL )
{
[o_controls setupVarMenuItem: o_mi_channels target: (vlc_object_t *)p_aout
var: "audio-channels" selector: @selector(toggleVar:)];
-
+
[o_controls setupVarMenuItem: o_mi_device target: (vlc_object_t *)p_aout
var: "audio-device" selector: @selector(toggleVar:)];
-
+
[o_controls setupVarMenuItem: o_mi_visual target: (vlc_object_t *)p_aout
var: "visual" selector: @selector(toggleVar:)];
vlc_object_release( (vlc_object_t *)p_aout );
}
-
+
vout_thread_t * p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
FIND_ANYWHERE );
-
+
if ( p_vout != NULL )
{
+ vlc_object_t * p_dec_obj;
+
[o_controls setupVarMenuItem: o_mi_screen target: (vlc_object_t *)p_vout
var: "video-device" selector: @selector(toggleVar:)];
-
+
[o_controls setupVarMenuItem: o_mi_deinterlace target: (vlc_object_t *)p_vout
var: "deinterlace" selector: @selector(toggleVar:)];
+
+ p_dec_obj = (vlc_object_t *)vlc_object_find(
+ (vlc_object_t *)p_vout,
+ VLC_OBJECT_DECODER,
+ FIND_PARENT );
+ if ( p_dec_obj != NULL )
+ {
+ [o_controls setupVarMenuItem: o_mi_ffmpeg_pp target:
+ (vlc_object_t *)p_dec_obj var:"ffmpeg-pp-q" selector:
+ @selector(toggleVar:)];
+
+ vlc_object_release(p_dec_obj);
+ }
vlc_object_release( (vlc_object_t *)p_vout );
}
}
}
}
-- (void)playStatusUpdated:(BOOL)b_pause
+- (void)playStatusUpdated:(int)i_status
{
- if( b_pause )
+ if( i_status != PAUSE_S )
{
[o_btn_play setImage: o_img_pause];
[o_btn_play setAlternateImage: o_img_pause_pressed];
[o_mi_subtitle setEnabled: b_enabled];
[o_mi_channels setEnabled: b_enabled];
[o_mi_deinterlace setEnabled: b_enabled];
+ [o_mi_ffmpeg_pp setEnabled: b_enabled];
[o_mi_device setEnabled: b_enabled];
[o_mi_screen setEnabled: b_enabled];
}
aout_VolumeGet( p_intf, &i_volume );
- [o_volumeslider setFloatValue: (float)i_volume / AOUT_VOLUME_STEP];
+ [o_volumeslider setFloatValue: (float)i_volume / AOUT_VOLUME_STEP];
[o_volumeslider setEnabled: TRUE];
p_intf->p_sys->b_mute = ( i_volume == 0 );
if( p_input != NULL )
{
vlc_value_t time;
+ vlc_value_t pos;
mtime_t i_seconds;
NSString * o_time;
- if( (BOOL)f_slider_old )
- {
- vlc_value_t pos;
- pos.f_float = f_updated / 10000.;
- if( f_slider != f_updated )
- {
- var_Set( p_input, "position", pos );
- [o_timeslider setFloatValue: f_updated];
- }
- }
-
+ pos.f_float = f_updated / 10000.;
+ var_Set( p_input, "position", pos );
+ [o_timeslider setFloatValue: f_updated];
+
var_Get( p_input, "time", &time );
i_seconds = time.i_time / 1000000;
-
+
o_time = [NSString stringWithFormat: @"%d:%02d:%02d",
(int) (i_seconds / (60 * 60)),
(int) (i_seconds / 60 % 60),
(int) (i_seconds % 60)];
[o_timefield setStringValue: o_time];
+
vlc_object_release( p_input );
}
}
[o_img_pause_pressed release];
o_img_pause_pressed = nil;
}
-
+
if( o_img_pause_pressed != nil )
{
[o_img_pause_pressed release];
o_img_pause_pressed = nil;
}
-
+
if( o_img_pause != nil )
{
[o_img_pause release];
/* write cached user defaults to disk */
[[NSUserDefaults standardUserDefaults] synchronize];
-
+
p_intf->b_die = VLC_TRUE;
[NSApp stop:NULL];
}
- (void)openRecentItem:(id)sender
{
- [self application: nil openFile: [sender title]];
+ [self application: nil openFile: [sender title]];
}
- (IBAction)viewPreferences:(id)sender
- (IBAction)openReadMe:(id)sender
{
- NSString * o_path = [[NSBundle mainBundle]
- pathForResource: @"README.MacOSX" ofType: @"rtf"];
+ NSString * o_path = [[NSBundle mainBundle]
+ pathForResource: @"README.MacOSX" ofType: @"rtf"];
- [[NSWorkspace sharedWorkspace] openFile: o_path
+ [[NSWorkspace sharedWorkspace] openFile: o_path
withApplication: @"TextEdit"];
}
- (IBAction)openDocumentation:(id)sender
{
- NSURL * o_url = [NSURL URLWithString:
+ NSURL * o_url = [NSURL URLWithString:
@"http://www.videolan.org/doc/"];
[[NSWorkspace sharedWorkspace] openURL: o_url];
- (IBAction)reportABug:(id)sender
{
- NSURL * o_url = [NSURL URLWithString:
+ NSURL * o_url = [NSURL URLWithString:
@"http://www.videolan.org/support/bug-reporting.html"];
[[NSWorkspace sharedWorkspace] openURL: o_url];
- (IBAction)openLicense:(id)sender
{
- NSString * o_path = [[NSBundle mainBundle]
+ NSString * o_path = [[NSBundle mainBundle]
pathForResource: @"COPYING" ofType: nil];
- [[NSWorkspace sharedWorkspace] openFile: o_path
+ [[NSWorkspace sharedWorkspace] openFile: o_path
withApplication: @"TextEdit"];
}
- (IBAction)openCrashLog:(id)sender
{
NSString * o_path = [@"~/Library/Logs/CrashReporter/VLC.crash.log"
- stringByExpandingTildeInPath];
+ stringByExpandingTildeInPath];
+
-
if ( [[NSFileManager defaultManager] fileExistsAtPath: o_path ] )
{
- [[NSWorkspace sharedWorkspace] openFile: o_path
+ [[NSWorkspace sharedWorkspace] openFile: o_path
withApplication: @"Console"];
}
else
id o_msg;
NSEnumerator * o_enum;
- [o_messages setString: @""];
+ [o_messages setString: @""];
[o_msg_lock lock];
[o_menu insertItemWithTitle: o_doc
action: @selector(openRecentItem:)
- keyEquivalent: @"" atIndex: 0];
+ keyEquivalent: @"" atIndex: 0];
if( i_nb_docs == 0 )
{
break;
}
- }
+ }
}
else
{
NSValue * o_value;
NSInvocation * o_inv;
NSConditionLock * o_lock;
-
+
o_data = [[o_msg components] lastObject];
- o_inv = *((NSInvocation **)[o_data bytes]);
+ o_inv = *((NSInvocation **)[o_data bytes]);
[o_inv getArgument: &o_value atIndex: 2];
val = (id **)[o_value pointerValue];
[o_inv setArgument: val[1] atIndex: 2];
projects / vlc / blobdiff