Changeset 3f99651d8fa1356203faf67103e1c500d3b30e16

Show
Ignore:
Timestamp:
15/09/06 22:14:07 (2 years ago)
Author:
Clément Stenac <zorglub@videolan.org>
git-committer:
Clément Stenac <zorglub@videolan.org> 1158351247 +0000
git-parent:

[f0531d5b038ed279e206a3deeae9e70f243a6704]

git-author:
Clément Stenac <zorglub@videolan.org> 1158351247 +0000
Message:

Hopefully fix OS X

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • src/interface/interface.c

    rf485214 r3f99651  
    6767@interface VLCApplication : NSApplication 
    6868{ 
    69    vlc_t *o_vlc; 
    70 } 
    71  
    72 - (void)setVLC: (vlc_t *)p_vlc; 
     69   libvlc_int_t *o_libvlc; 
     70} 
     71 
     72- (void)setVLC: (libvlc_int_t *)p_libvlc; 
    7373 
    7474@end 
    …… 
    464464#ifdef __APPLE__ 
    465465/***************************************************************************** 
    466  * VLCApplication implementation  
    467  *****************************************************************************/ 
    468 @implementation VLCApplication  
    469  
    470 - (void)setVLC: (vlc_t *) p_vlc 
    471 { 
    472     o_vlc = p_vlc; 
     466 * VLCApplication implementation 
     467 *****************************************************************************/ 
     468@implementation VLCApplication 
     469 
     470- (void)setVLC: (libvlc_int_t *) p_libvlc 
     471{ 
     472    o_vlc = p_libvlc; 
    473473} 
    474474 

  • src/libvlc.c

    re9947be r3f99651  
    9191 
    9292/***************************************************************************** 
    93  * VLC_Create: allocate a vlc_t structure, and initialize libvlc if needed. 
    94  ***************************************************************************** 
    95  * This function allocates a vlc_t structure and returns a negative value 
     93 * VLC_Create: allocate a libvlc instance and intialize global libvlc stuff if needed 
     94 ***************************************************************************** 
     95 * This function allocates a libvlc instance and returns a negative value 
    9696 * in case of failure. Also, the thread system is initialized. 
    9797 *****************************************************************************/ 
    …… 
    111111 
    112112/***************************************************************************** 
    113  * VLC_Init: initialize a vlc_t structure. 
    114  ***************************************************************************** 
    115  * This function initializes a previously allocated vlc_t structure: 
     113 * VLC_Init: initialize a libvlc instance 
     114 ***************************************************************************** 
     115 * This function initializes a previously allocated libvlc instance: 
    116116 *  - CPU detection 
    117117 *  - gettext initialization 

  • src/libvlc.h

    r4b0f3f8 r3f99651  
    21342134 
    21352135/***************************************************************************** 
    2136  * Initializer for the vlc_t structure storing the action / key associations 
     2136 * Initializer for the libvlc instance structure 
     2137 * storing the action / key associations 
    21372138 *****************************************************************************/ 
    21382139static struct hotkey p_hotkeys[] =