Hopefully fix OS X

diff --git a/src/interface/interface.c b/src/interface/interface.c
index b04a59a6fd17da65d635bb9078d800e9ee2669a0..8c066163ddb154bf693fd54bfb6055d450c8cd7a 100644 (file)
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -66,10 +66,10 @@ static int AddIntfCallback( vlc_object_t *, char const *,
  *****************************************************************************/
 @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
 #endif
@@ -463,13 +463,13 @@ static int AddIntfCallback( vlc_object_t *p_this, char const *psz_cmd,
 
 #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

diff --git a/src/libvlc.c b/src/libvlc.c
index 1c0ce4e56c4106896d64108f71537ecc5f66cf1c..e4806e7d8c0d4776a34f81ce2ef6bbc74e4463e4 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -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.
  *****************************************************************************/
 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
  *  - gettext initialization
  *  - message queue, module bank and playlist initialization

diff --git a/src/libvlc.h b/src/libvlc.h
index 135581ba5eb011123c10c27ac08a9ef6592c7ba9..b0b9b83a3100f66745a5333b9ef25342661b8dd5 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -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[] =
 {