macosx/framework: Add VLCMediaListPlayer.

diff --git a/projects/macosx/framework/Headers/Internal/VLCLibVLCBridging.h b/projects/macosx/framework/Headers/Internal/VLCLibVLCBridging.h
index 8b3cd755c1ec35e5b79ceabfbfba27ee86c096ea..8125d108f628e4caf253114a6fe680353a751134 100644 (file)
--- a/projects/macosx/framework/Headers/Internal/VLCLibVLCBridging.h
+++ b/projects/macosx/framework/Headers/Internal/VLCLibVLCBridging.h
@@ -25,6 +25,7 @@
 #import "VLCLibrary.h"
 #import "VLCMediaListAspect.h"
 #import "VLCStreamOutput.h"
+#import "VLCMediaPlayer.h"
 
 /* Utility functions */
 /**
@@ -93,6 +94,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

diff --git a/projects/macosx/framework/Headers/Public/VLCKit.h b/projects/macosx/framework/Headers/Public/VLCKit.h
index 868aeec7b8add10d370db61e8203f886dcb98c26..5cfdabcf0e09afbd68bb7d6b56d38606b5e8e950 100644 (file)
--- a/projects/macosx/framework/Headers/Public/VLCKit.h
+++ b/projects/macosx/framework/Headers/Public/VLCKit.h
@@ -23,13 +23,14 @@
  *****************************************************************************/
 
 /**
- * TODO: Framework Documetnation
+ * TODO: Framework Documentation
  */
 
 #import <VLCKit/VLCLibrary.h>
 #import <VLCKit/VLCMedia.h>
 #import <VLCKit/VLCMediaLibrary.h>
 #import <VLCKit/VLCMediaList.h>
+#import <VLCKit/VLCMediaListPlayer.h>
 #import <VLCKit/VLCMediaListAspect.h>
 #import <VLCKit/VLCMediaDiscoverer.h>
 #import <VLCKit/VLCMediaPlayer.h>

diff --git a/projects/macosx/framework/Headers/Public/VLCMediaListPlayer.h b/projects/macosx/framework/Headers/Public/VLCMediaListPlayer.h
new file mode 100644 (file)
index 0000000..bdc9c65
--- /dev/null
+++ b/projects/macosx/framework/Headers/Public/VLCMediaListPlayer.h
@@ -0,0 +1,35 @@
+//
+//  VLCMediaListPlayer.h
+//  VLCKit
+//
+//  Created by Pierre d'Herbemont on 8/24/09.
+//  Copyright 2009 __MyCompanyName__. All rights reserved.
+//
+
+@class VLCMedia, VLCMediaPlayer, VLCMediaList;
+
+@interface VLCMediaListPlayer : NSObject {
+    void *instance;
+    VLCMedia *_rootMedia;
+    VLCMediaPlayer *_mediaPlayer;
+    VLCMediaList *_mediaList;
+}
+
+@property (readwrite, retain) VLCMediaList *mediaList;
+
+/**
+ * rootMedia - Use this method to play a media and its subitems.
+ * This will erase mediaList.
+ * Setting mediaList will erase rootMedia.
+ */
+@property (readwrite, retain) VLCMedia *rootMedia;
+@property (readonly, retain) VLCMediaPlayer *mediaPlayer;
+
+
+/**
+ * Basic play and stop are here. For other method, use the mediaPlayer.
+ * This may change.
+ */
+- (void)play;
+- (void)stop;
+@end

diff --git a/projects/macosx/framework/Sources/VLCMediaListPlayer.m b/projects/macosx/framework/Sources/VLCMediaListPlayer.m
new file mode 100644 (file)
index 0000000..b35855e
--- /dev/null
+++ b/projects/macosx/framework/Sources/VLCMediaListPlayer.m
@@ -0,0 +1,98 @@
+//
+//  VLCMediaListPlayer.m
+//  VLCKit
+//
+//  Created by Pierre d'Herbemont on 8/24/09.
+//  Copyright 2009 __MyCompanyName__. All rights reserved.
+//
+
+#import "VLCMediaListPlayer.h"
+#import "VLCMedia.h"
+#import "VLCMediaPlayer.h"
+#import "VLCMediaList.h"
+#import "VLCLibVLCBridging.h"
+
+@implementation VLCMediaListPlayer
+- (id)init
+{
+    if (self = [super init])
+    {
+        _mediaPlayer = [[VLCMediaPlayer alloc] init];
+
+        libvlc_exception_t ex;
+        libvlc_exception_init(&ex);
+        instance = libvlc_media_list_player_new([VLCLibrary sharedInstance], &ex);
+        catch_exception(&ex);
+        libvlc_media_list_player_set_media_player(instance, [_mediaPlayer libVLCMediaPlayer], &ex);
+        catch_exception(&ex);
+    }
+    return self;
+}
+
+- (void)dealloc
+{
+    [_mediaPlayer release];
+    [_rootMedia release];
+    [super dealloc];
+}
+- (VLCMediaPlayer *)mediaPlayer
+{
+    return _mediaPlayer;
+}
+
+- (void)setMediaList:(VLCMediaList *)mediaList
+{
+    if (_mediaList == mediaList)
+        return;
+    [_mediaList release];
+    _mediaList = [mediaList retain];
+    
+    libvlc_exception_t ex;
+    libvlc_exception_init(&ex);
+    libvlc_media_list_player_set_media_list(instance, [mediaList libVLCMediaList], &ex);
+    catch_exception(&ex);
+    [self willChangeValueForKey:@"rootMedia"];
+    [_rootMedia release];
+    _rootMedia = nil;
+    [self didChangeValueForKey:@"rootMedia"];
+}
+
+- (VLCMediaList *)mediaList
+{
+    return _mediaList;
+}
+
+- (void)setRootMedia:(VLCMedia *)media
+{
+    if (_rootMedia == media)
+        return;
+    [_rootMedia release];
+    _rootMedia = [media retain];
+    VLCMediaList *mediaList = [[VLCMediaList alloc] init];
+    if (media)
+        [mediaList addMedia:media];
+    [self setMediaList:mediaList];
+    [mediaList release];
+}
+
+- (VLCMedia *)rootMedia
+{
+    return _rootMedia;
+}
+
+- (void)play
+{
+    libvlc_exception_t ex;
+    libvlc_exception_init(&ex);
+    libvlc_media_list_player_play(instance, &ex);
+    catch_exception(&ex);    
+}
+
+- (void)stop
+{
+    libvlc_exception_t ex;
+    libvlc_exception_init(&ex);
+    libvlc_media_list_player_stop(instance, &ex);
+    catch_exception(&ex);        
+}
+@end

diff --git a/projects/macosx/framework/Sources/VLCMediaPlayer.m b/projects/macosx/framework/Sources/VLCMediaPlayer.m
index 6f781dac8d1e54c67ac5a325b58ca77e25c65949..73b720883b52ee72ce5d31b09bd01f3fe53dbbac 100644 (file)
--- a/projects/macosx/framework/Sources/VLCMediaPlayer.m
+++ b/projects/macosx/framework/Sources/VLCMediaPlayer.m
@@ -600,7 +600,10 @@ static const VLCMediaPlayerState libvlc_to_local_state[] =
     return ret;
 }
 
-
+- (void *)libVLCMediaPlayer
+{
+    return instance;
+}
 @end
 
 @implementation VLCMediaPlayer (Private)

diff --git a/projects/macosx/framework/VLCKit.xcodeproj/project.pbxproj b/projects/macosx/framework/VLCKit.xcodeproj/project.pbxproj
index 9e3315516510e49455c7dac75749807be7b0ccc8..97b395b7428f09c6b0b1c83c192d140d4af162e1 100644 (file)
--- a/projects/macosx/framework/VLCKit.xcodeproj/project.pbxproj
+++ b/projects/macosx/framework/VLCKit.xcodeproj/project.pbxproj
@@ -48,6 +48,8 @@
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
+               63014A7A1042ACE100534090 /* VLCMediaListPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 63014A781042ACE100534090 /* VLCMediaListPlayer.m */; };
+               63014B7E1042E64A00534090 /* VLCMediaListPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 63014B7D1042E64A00534090 /* VLCMediaListPlayer.h */; };
                6303C43A0CF45CAE0000ECC8 /* VLCMediaListAspect.m in Sources */ = {isa = PBXBuildFile; fileRef = 6303C4390CF45CAE0000ECC8 /* VLCMediaListAspect.m */; };
                6303C43C0CF45CC30000ECC8 /* VLCMediaListAspect.h in Headers */ = {isa = PBXBuildFile; fileRef = 6303C43B0CF45CC30000ECC8 /* VLCMediaListAspect.h */; settings = {ATTRIBUTES = (Public, ); }; };
                632A0E850D3835C400AFC99B /* VLCStreamSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 632A0E830D3835C400AFC99B /* VLCStreamSession.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -120,6 +122,8 @@
                0867D6A5FE840307C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
                1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
                32DBCF5E0370ADEE00C91783 /* VLC_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLC_Prefix.pch; sourceTree = "<group>"; };
+               63014A781042ACE100534090 /* VLCMediaListPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCMediaListPlayer.m; sourceTree = "<group>"; };
+               63014B7D1042E64A00534090 /* VLCMediaListPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCMediaListPlayer.h; path = Public/VLCMediaListPlayer.h; sourceTree = "<group>"; };
                63030CC70CCA652C0088ECD1 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; name = Info.plist; path = Resources/Info.plist; sourceTree = "<group>"; };
                6303C4390CF45CAE0000ECC8 /* VLCMediaListAspect.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCMediaListAspect.m; sourceTree = "<group>"; };
                6303C43B0CF45CC30000ECC8 /* VLCMediaListAspect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCMediaListAspect.h; path = Public/VLCMediaListAspect.h; sourceTree = "<group>"; };
@@ -220,6 +224,7 @@
                                EF78BD3E0CAEEFF600354E6E /* VLCMedia.m */,
                                637D5ADB0CF6F2720073EA45 /* VLCMediaDiscoverer.m */,
                                EF78BD410CAEEFF600354E6E /* VLCMediaList.m */,
+                               63014A781042ACE100534090 /* VLCMediaListPlayer.m */,
                                6303C4390CF45CAE0000ECC8 /* VLCMediaListAspect.m */,
                                EF8BB8CF0CAFA8D80038A613 /* VLCMediaPlayer.m */,
                                EF78BD400CAEEFF600354E6E /* VLCMediaLibrary.m */,
@@ -304,6 +309,7 @@
                                637D5ABC0CF6F2650073EA45 /* VLCMediaDiscoverer.h */,
                                EF78BD160CAEEEE700354E6E /* VLCMediaList.h */,
                                6303C43B0CF45CC30000ECC8 /* VLCMediaListAspect.h */,
+                               63014B7D1042E64A00534090 /* VLCMediaListPlayer.h */,
                                EF8BB8CE0CAFA8D80038A613 /* VLCMediaPlayer.h */,
                                EF78BD150CAEEEE700354E6E /* VLCMediaLibrary.h */,
                                6341FCAE0D2C0929002A97B7 /* VLCVideoLayer.h */,
@@ -348,6 +354,7 @@
                                A7A0CEA40D2EF13000F2C039 /* VLCVideoCommon.h in Headers */,
                                632A0E850D3835C400AFC99B /* VLCStreamSession.h in Headers */,
                                632A0EC30D38392E00AFC99B /* VLCStreamOutput.h in Headers */,
+                               63014B7E1042E64A00534090 /* VLCMediaListPlayer.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -521,6 +528,7 @@
                                A7A0CEA50D2EF13000F2C039 /* VLCVideoCommon.m in Sources */,
                                632A0E860D3835C400AFC99B /* VLCStreamSession.m in Sources */,
                                632A0EC40D38392E00AFC99B /* VLCStreamOutput.m in Sources */,
+                               63014A7A1042ACE100534090 /* VLCMediaListPlayer.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };