VLCKit: Import MobileVLCKit.

[vlc] / projects / macosx / framework / Headers / Internal / VLCLibVLCBridging.h

diff --git a/projects/macosx/framework/Headers/Internal/VLCLibVLCBridging.h b/projects/macosx/framework/Headers/Internal/VLCLibVLCBridging.h
index cc94d5111a3e0126a95bcb7d9997734d7519007f..c26a0195e178ba47edf1af9c6a5235e700e66eb7 100644 (file)
--- a/projects/macosx/framework/Headers/Internal/VLCLibVLCBridging.h
+++ b/projects/macosx/framework/Headers/Internal/VLCLibVLCBridging.h
@@ -1,5 +1,5 @@
 /*****************************************************************************
-* VLCLibVLCbridging.h: VLC.framework VLCLibVLCBridging (Private) header
+* VLCLibVLCbridging.h: VLCKit.framework VLCLibVLCBridging (Private) header
 *****************************************************************************
 * Copyright (C) 2007 Pierre d'Herbemont
 * Copyright (C) 2007 the VideoLAN team
@@ -23,30 +23,20 @@
 *****************************************************************************/
 
 #import "VLCLibrary.h"
-#import "VLCMediaListAspect.h"
+#if !TARGET_OS_IPHONE
 #import "VLCStreamOutput.h"
+#endif
+#import "VLCMediaPlayer.h"
 
 /**
  * Bridges functionality between libvlc and VLCMediaList implementation.
  */
-
-/*
- * Utility function
- */
-
-#define catch_exception( ex ) __catch_exception( (void *)(ex), __FUNCTION__, __FILE__, __LINE__ )
-extern void __catch_exception( void * e, const char * function, const char * file, int line_number );
-
-/*
- * @interface VLC(class) (LibVLCBridging)
- */
-
 @interface VLCMediaList (LibVLCBridging)
 /* Factories */
 /**
  * Manufactures new object wrapped around specified media list.
  * \param p_new_mlist LibVLC media list pointer.
- * \return Newly create media list instance using specified media list 
+ * \return Newly create media list instance using specified media list
  * pointer.
  */
 + (id)mediaListWithLibVLCMediaList:(void *)p_new_mlist;
@@ -96,6 +86,15 @@ extern void __catch_exception( void * e, const char * function, const char * fil
 /**
  * Bridges functionality between VLCMedia and VLCMediaPlayer
  */
+@interface VLCMediaPlayer (LibVLCBridging)
+
+/* Properties */
+@property (readonly) void * libVLCMediaPlayer;    //< LibVLC media list pointer.
+@end
+
+/**
+ * Bridges functionality between VLCMediaPlayer and LibVLC core
+ */
 @interface VLCMedia (VLCMediaPlayerBridging)
 /**
  * Set's the length of the media object.  This value becomes available once the
@@ -103,8 +102,6 @@ extern void __catch_exception( void * e, const char * function, const char * fil
  * \param value
  */
 - (void)setLength:(VLCTime *)value;
-
-
 @end
 
 /**
@@ -124,41 +121,13 @@ extern void __catch_exception( void * e, const char * function, const char * fil
 @property (readonly) void * instance;
 @end
 
-/**
- * Bridges functionality between VLCMediaListAspect and libvlc.
- */
-@interface VLCMediaListAspect (VLCLibVLCBridging)
-/* Factories */
-/**
- * Manufactures a new media list aspect object with libvlc media list view instance.
- * \return Newly created media list aspect using specified libvlc media list view.
- */
-+ (id)mediaListAspectWithLibVLCMediaListView:(libvlc_media_list_view_t *)p_new_mlv;
-
-/**
- * Manufactures a new media list aspect object with libvlc media list view instance.
- * \return Newly created media list aspect using specified libvlc media list view.
- */
-+ (id)mediaListAspectWithLibVLCMediaListView:(libvlc_media_list_view_t *)p_new_mlv andMediaList:(VLCMediaList*)mediaList;
-
-/* Initializers */
-/**
- * Initializes a new media list aspect object with libvlc media list view instance.
- * \return Newly created media list aspect using specified libvlc media list view.
- */
-- (id)initWithLibVLCMediaListView:(libvlc_media_list_view_t *)p_new_mlv andMediaList:(VLCMediaList*)mediaList;
-
-/* Properties */
-@property (readonly) libvlc_media_list_view_t * libVLCMediaListView; //< Libvlc pointer to media list view instance.
-@end
-
 /**
  * Bridges functionality between VLCLibrary and VLCAudio.
  */
 @interface VLCLibrary (VLCAudioBridging)
 /**
  * Called by VLCAudio, each library has a singleton VLCaudio instance.  VLCAudio
- * calls this function to let the VLCLibrary instance know how to get in touch 
+ * calls this function to let the VLCLibrary instance know how to get in touch
  * with the VLCAudio instance.  TODO: Each media player instance should have it's
  * own audio instance...not each library instance.
  */
@@ -171,12 +140,17 @@ extern void __catch_exception( void * e, const char * function, const char * fil
 @interface VLCAudio (VLCAudioBridging)
 /* Initializers */
 /**
- * Initializes a new object using the specified library instance.
- * \return Newly created audio object using specified VLCLibrary instance.
+ * Initializes a new object using the specified mediaPlayer instance.
+ * \return Newly created audio object using specified VLCMediaPlayer instance.
  */
-- (id)initWithLibrary:(VLCLibrary *)library;
+- (id)initWithMediaPlayer:(VLCMediaPlayer *)mediaPlayer;
 @end
 
+/**
+ * TODO: Documentation
+ */
+#if !TARGET_OS_IPHONE
 @interface VLCStreamOutput (LibVLCBridge)
 - (NSString *)representedLibVLCOptions;
 @end
+#endif