Commit 6b7540a5 authored by Felix Paul Kühne's avatar Felix Paul Kühne

Don't try to use 10.5-only threading features on a 10.4u target. Fixes #1614 on OS X.

parent 8d65a755
......@@ -303,8 +303,6 @@ struct intf_sys_t
NSSize o_size_with_playlist;
NSThread * manageThread;
int i_lastShownVolume;
AppleRemote * o_remote;
......
......@@ -799,8 +799,8 @@ static VLCMain *_o_sharedMainInstance = nil;
userInfo: nil repeats: FALSE];
/* FIXME: don't poll */
manageThread = [[NSThread alloc] initWithTarget:self selector:@selector(manage)
object: nil];
[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:)];
......@@ -1230,11 +1230,14 @@ static VLCMain *_o_sharedMainInstance = nil;
p_playlist = pl_Yield( p_intf );
var_AddCallback( p_playlist, "playlist-current", PlaylistChanged, self );
var_AddCallback( p_playlist, "intf-change", PlaylistChanged, self );
var_AddCallback( p_playlist, "item-change", PlaylistChanged, self );
var_AddCallback( p_playlist, "item-append", PlaylistChanged, self );
var_AddCallback( p_playlist, "item-deleted", PlaylistChanged, self );
var_AddCallback( p_playlist, "playlist-current", PlaylistChanged, self );
// vlc_value_t val;
// var_Change( p_playlist, "playlist-current", VLC_VAR_CHOICESCOUNT, &val, NULL );
vlc_object_release( p_playlist );
......@@ -1451,7 +1454,6 @@ static VLCMain *_o_sharedMainInstance = nil;
else
{
p_intf->p_sys->i_play_status = END_S;
p_intf->p_sys->b_intf_update = true;
p_intf->p_sys->b_playlist_update = true;
[self playStatusUpdated: p_intf->p_sys->i_play_status];
[o_embedded_window playStatusUpdated: p_intf->p_sys->i_play_status];
......@@ -1601,6 +1603,7 @@ static VLCMain *_o_sharedMainInstance = nil;
o_temp = [NSString stringWithUTF8String:
p_playlist->status.p_item->p_input->psz_name];
[self setScrollField: o_temp stopAfter:-1];
[[[self getControls] getFSPanel] setStreamTitle: o_temp];
vlc_object_release( p_input );
vlc_object_release( p_playlist );
return;
......@@ -1777,9 +1780,6 @@ static VLCMain *_o_sharedMainInstance = nil;
msg_Dbg( p_intf, "Terminating" );
[manageThread cancel];
[manageThread release];
/* make sure that the current volume is saved */
config_PutInt( p_intf->p_libvlc, "volume", i_lastShownVolume );
returnedValue = config_SaveConfigFile( p_intf->p_libvlc, "main" );
......
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