Changeset a409380da011ba3fb820b7d2265171239e3b8851

Show
Ignore:
Timestamp:
07/05/08 02:14:17 (2 months ago)
Author:
Pierre d'Herbemont <pdherbemont@videolan.org>
git-committer:
Pierre d'Herbemont <pdherbemont@videolan.org> 1215216857 +0200
git-parent:

[7a4d005e335d72525c197cfc552fd74273f36a49]

git-author:
Pierre d'Herbemont <pdherbemont@videolan.org> 1215216857 +0200
Message:

macosx: Make sure the manageIntf: Timer is getting cancelled at exit.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/gui/macosx/intf.h

    r7a4d005 ra409380  
    308308    pthread_t manage_thread; 
    309309 
     310    /* The timer that update the interface */ 
     311    NSTimer * interfaceTimer; 
     312 
    310313    AppleRemote * o_remote; 
    311314    BOOL b_remote_button_hold; /* true as long as the user holds the left,right,plus or minus on the remote control */ 

  • modules/gui/macosx/intf.m

    r7a4d005 ra409380  
    779779 
    780780    /* FIXME: don't poll */ 
    781     [NSTimer scheduledTimerWithTimeInterval: 0.5 
     781    interfaceTimer = [[NSTimer scheduledTimerWithTimeInterval: 0.5 
    782782                                     target: self selector: @selector(manageIntf:) 
    783                                    userInfo: nil repeats: FALSE]; 
     783                                   userInfo: nil repeats: FALSE] retain]; 
    784784 
    785785    /* Note: we use the pthread API to support pre-10.5 */ 
    …… 
    14441444        [self resetScrollField]; 
    14451445 
    1446     [NSTimer scheduledTimerWithTimeInterval: 0.3 
     1446    [interfaceTimer autorelease]; 
     1447 
     1448    interfaceTimer = [[NSTimer scheduledTimerWithTimeInterval: 0.3 
    14471449        target: self selector: @selector(manageIntf:) 
    1448         userInfo: nil repeats: FALSE]; 
     1450        userInfo: nil repeats: FALSE] retain]; 
    14491451} 
    14501452 
    …… 
    17661768    pthread_join( manage_thread, NULL ); 
    17671769 
     1770    /* Make sure the interfaceTimer is destroyed */ 
     1771    [interfaceTimer invalidate]; 
     1772    [interfaceTimer release]; 
     1773    interfaceTimer = nil; 
     1774 
    17681775    /* make sure that the current volume is saved */ 
    17691776    config_PutInt( p_intf->p_libvlc, "volume", i_lastShownVolume );