Commit 3f99651d authored by zorglub's avatar zorglub
Browse files

Hopefully fix OS X

parent f0531d5b
...@@ -66,10 +66,10 @@ static int AddIntfCallback( vlc_object_t *, char const *, ...@@ -66,10 +66,10 @@ static int AddIntfCallback( vlc_object_t *, char const *,
*****************************************************************************/ *****************************************************************************/
@interface VLCApplication : NSApplication @interface VLCApplication : NSApplication
{ {
vlc_t *o_vlc; libvlc_int_t *o_libvlc;
} }
- (void)setVLC: (vlc_t *)p_vlc; - (void)setVLC: (libvlc_int_t *)p_libvlc;
@end @end
#endif #endif
...@@ -463,13 +463,13 @@ static int AddIntfCallback( vlc_object_t *p_this, char const *psz_cmd, ...@@ -463,13 +463,13 @@ static int AddIntfCallback( vlc_object_t *p_this, char const *psz_cmd,
#ifdef __APPLE__ #ifdef __APPLE__
/***************************************************************************** /*****************************************************************************
* VLCApplication implementation * VLCApplication implementation
*****************************************************************************/ *****************************************************************************/
@implementation VLCApplication @implementation VLCApplication
- (void)setVLC: (vlc_t *) p_vlc - (void)setVLC: (libvlc_int_t *) p_libvlc
{ {
o_vlc = p_vlc; o_vlc = p_libvlc;
} }
- (void)stop: (id)sender - (void)stop: (id)sender
......
...@@ -90,9 +90,9 @@ char const * VLC_Error( int i_err ) ...@@ -90,9 +90,9 @@ char const * VLC_Error( int i_err )
} }
/***************************************************************************** /*****************************************************************************
* VLC_Create: allocate a vlc_t structure, and initialize libvlc if needed. * VLC_Create: allocate a libvlc instance and intialize global libvlc stuff if needed
***************************************************************************** *****************************************************************************
* This function allocates a vlc_t structure and returns a negative value * This function allocates a libvlc instance and returns a negative value
* in case of failure. Also, the thread system is initialized. * in case of failure. Also, the thread system is initialized.
*****************************************************************************/ *****************************************************************************/
int VLC_Create( void ) int VLC_Create( void )
...@@ -110,9 +110,9 @@ int VLC_Create( void ) ...@@ -110,9 +110,9 @@ int VLC_Create( void )
/***************************************************************************** /*****************************************************************************
* VLC_Init: initialize a vlc_t structure. * VLC_Init: initialize a libvlc instance
***************************************************************************** *****************************************************************************
* This function initializes a previously allocated vlc_t structure: * This function initializes a previously allocated libvlc instance:
* - CPU detection * - CPU detection
* - gettext initialization * - gettext initialization
* - message queue, module bank and playlist initialization * - message queue, module bank and playlist initialization
......
...@@ -2133,7 +2133,8 @@ static module_config_t p_help_config[] = ...@@ -2133,7 +2133,8 @@ static module_config_t p_help_config[] =
*****************************************************************************/ *****************************************************************************/
/***************************************************************************** /*****************************************************************************
* Initializer for the vlc_t structure storing the action / key associations * Initializer for the libvlc instance structure
* storing the action / key associations
*****************************************************************************/ *****************************************************************************/
static struct hotkey p_hotkeys[] = static struct hotkey p_hotkeys[] =
{ {
......
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