Changeset 6b7540a5c18cdf46db2e21f4198ab2d2d14677e9

Show
Ignore:
Timestamp:
06/29/08 00:34:48 (2 months ago)
Author:
Felix Paul Kühne <fkuehne@videolan.org>
git-committer:
Felix Paul Kühne <fkuehne@videolan.org> 1214692488 +0200
git-parent:

[8d65a7555d7cda5a871f104dc97d4ea963161903]

git-author:
Felix Paul Kühne <fkuehne@videolan.org> 1214692477 +0200
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/gui/macosx/intf.h

    r6a5fc04 r6b7540a  
    304304    NSSize o_size_with_playlist; 
    305305 
    306     NSThread * manageThread; 
    307  
    308306    int     i_lastShownVolume; 
    309307 

  • modules/gui/macosx/intf.m

    r1405cf7 r6b7540a  
    796796    /* FIXME: don't poll */ 
    797797    [NSTimer scheduledTimerWithTimeInterval: 0.5 
    798         target: self selector: @selector(manageIntf:) 
    799         userInfo: nil repeats: FALSE]; 
     798                                     target: self selector: @selector(manageIntf:) 
     799                                   userInfo: nil repeats: FALSE]; 
    800800 
    801801    /* FIXME: don't poll */ 
    802     manageThread = [[NSThread alloc] initWithTarget:self selector:@selector(manage) 
    803                                      object: nil]; 
     802    [NSThread detachNewThreadSelector: @selector(manage) 
     803                             toTarget: self withObject: nil]; 
    804804 
    805805    [o_controls setupVarMenuItem: o_mi_add_intf target: (vlc_object_t *)p_intf 
    …… 
    12311231    p_playlist = pl_Yield( p_intf ); 
    12321232 
     1233    var_AddCallback( p_playlist, "playlist-current", PlaylistChanged, self ); 
    12331234    var_AddCallback( p_playlist, "intf-change", PlaylistChanged, self ); 
    12341235    var_AddCallback( p_playlist, "item-change", PlaylistChanged, self ); 
    12351236    var_AddCallback( p_playlist, "item-append", PlaylistChanged, self ); 
    12361237    var_AddCallback( p_playlist, "item-deleted", PlaylistChanged, self ); 
    1237     var_AddCallback( p_playlist, "playlist-current", PlaylistChanged, self ); 
     1238 
     1239//    vlc_value_t val; 
     1240//    var_Change( p_playlist, "playlist-current", VLC_VAR_CHOICESCOUNT, &val, NULL ); 
    12381241 
    12391242    vlc_object_release( p_playlist ); 
    …… 
    12481251            p_intf->p_sys->p_input = p_playlist->p_input; 
    12491252 
    1250                 /* Refresh the interface */ 
     1253            /* Refresh the interface */ 
    12511254            if( p_intf->p_sys->p_input ) 
    12521255            { 
    …… 
    14521455    { 
    14531456        p_intf->p_sys->i_play_status = END_S; 
    1454         p_intf->p_sys->b_intf_update = true; 
    14551457        p_intf->p_sys->b_playlist_update = true; 
    14561458        [self playStatusUpdated: p_intf->p_sys->i_play_status]; 
    …… 
    16021604                p_playlist->status.p_item->p_input->psz_name]; 
    16031605        [self setScrollField: o_temp stopAfter:-1]; 
     1606        [[[self getControls] getFSPanel] setStreamTitle: o_temp]; 
    16041607        vlc_object_release( p_input ); 
    16051608        vlc_object_release( p_playlist ); 
    …… 
    17781781    msg_Dbg( p_intf, "Terminating" ); 
    17791782 
    1780     [manageThread cancel]; 
    1781     [manageThread release]; 
    1782  
    17831783    /* make sure that the current volume is saved */ 
    17841784    config_PutInt( p_intf->p_libvlc, "volume", i_lastShownVolume );