Move the Mac OS X framework plus the yet to be finished VLC.app to projects/macosx...
authorPierre d'Herbemont <pdherbemont@videolan.org>
Mon, 4 Feb 2008 01:19:53 +0000 (01:19 +0000)
committerPierre d'Herbemont <pdherbemont@videolan.org>
Mon, 4 Feb 2008 01:19:53 +0000 (01:19 +0000)
218 files changed:
extras/package/macosx/Framework/Examples/FlashVideoDownloader/Controller.h [deleted file]
extras/package/macosx/Framework/Examples/FlashVideoDownloader/Controller.m [deleted file]
extras/package/macosx/Framework/Examples/FlashVideoDownloader/English.lproj/InfoPlist.strings [deleted file]
extras/package/macosx/Framework/Examples/FlashVideoDownloader/English.lproj/MainMenu.nib/classes.nib [deleted file]
extras/package/macosx/Framework/Examples/FlashVideoDownloader/English.lproj/MainMenu.nib/info.nib [deleted file]
extras/package/macosx/Framework/Examples/FlashVideoDownloader/English.lproj/MainMenu.nib/keyedobjects.nib [deleted file]
extras/package/macosx/Framework/Examples/FlashVideoDownloader/FlashVideoDownloader.xcodeproj/project.pbxproj [deleted file]
extras/package/macosx/Framework/Examples/FlashVideoDownloader/FlashVideoDownloader_Prefix.pch [deleted file]
extras/package/macosx/Framework/Examples/FlashVideoDownloader/GradientBackgroundView.h [deleted file]
extras/package/macosx/Framework/Examples/FlashVideoDownloader/GradientBackgroundView.m [deleted file]
extras/package/macosx/Framework/Examples/FlashVideoDownloader/Info.plist [deleted file]
extras/package/macosx/Framework/Examples/FlashVideoDownloader/main.m [deleted file]
extras/package/macosx/Framework/Examples/iPodConverter/Controller.h [deleted file]
extras/package/macosx/Framework/Examples/iPodConverter/Controller.m [deleted file]
extras/package/macosx/Framework/Examples/iPodConverter/English.lproj/InfoPlist.strings [deleted file]
extras/package/macosx/Framework/Examples/iPodConverter/English.lproj/MainMenu.nib/classes.nib [deleted file]
extras/package/macosx/Framework/Examples/iPodConverter/English.lproj/MainMenu.nib/info.nib [deleted file]
extras/package/macosx/Framework/Examples/iPodConverter/English.lproj/MainMenu.nib/keyedobjects.nib [deleted file]
extras/package/macosx/Framework/Examples/iPodConverter/GradientBackgroundView.h [deleted file]
extras/package/macosx/Framework/Examples/iPodConverter/GradientBackgroundView.m [deleted file]
extras/package/macosx/Framework/Examples/iPodConverter/Info.plist [deleted file]
extras/package/macosx/Framework/Examples/iPodConverter/MovieReceiver.h [deleted file]
extras/package/macosx/Framework/Examples/iPodConverter/MovieReceiver.m [deleted file]
extras/package/macosx/Framework/Examples/iPodConverter/iPodConverter.xcodeproj/project.pbxproj [deleted file]
extras/package/macosx/Framework/Examples/iPodConverter/iPodConverter_Prefix.pch [deleted file]
extras/package/macosx/Framework/Examples/iPodConverter/main.m [deleted file]
extras/package/macosx/Framework/Examples/test/Controller.h [deleted file]
extras/package/macosx/Framework/Examples/test/Controller.m [deleted file]
extras/package/macosx/Framework/Examples/test/English.lproj/InfoPlist.strings [deleted file]
extras/package/macosx/Framework/Examples/test/English.lproj/MainMenu.nib/classes.nib [deleted file]
extras/package/macosx/Framework/Examples/test/English.lproj/MainMenu.nib/info.nib [deleted file]
extras/package/macosx/Framework/Examples/test/English.lproj/MainMenu.nib/keyedobjects.nib [deleted file]
extras/package/macosx/Framework/Examples/test/Info.plist [deleted file]
extras/package/macosx/Framework/Examples/test/main.m [deleted file]
extras/package/macosx/Framework/Examples/test/test.xcodeproj/project.pbxproj [deleted file]
extras/package/macosx/Framework/Examples/test/test_Prefix.pch [deleted file]
extras/package/macosx/Framework/Headers/Internal/VLCEventManager.h [deleted file]
extras/package/macosx/Framework/Headers/Internal/VLCLibVLCBridging.h [deleted file]
extras/package/macosx/Framework/Headers/Internal/VLCVideoCommon.h [deleted file]
extras/package/macosx/Framework/Headers/Public/VLCAudio.h [deleted file]
extras/package/macosx/Framework/Headers/Public/VLCKit.h [deleted file]
extras/package/macosx/Framework/Headers/Public/VLCLibrary.h [deleted file]
extras/package/macosx/Framework/Headers/Public/VLCMedia.h [deleted file]
extras/package/macosx/Framework/Headers/Public/VLCMediaDiscoverer.h [deleted file]
extras/package/macosx/Framework/Headers/Public/VLCMediaLibrary.h [deleted file]
extras/package/macosx/Framework/Headers/Public/VLCMediaList.h [deleted file]
extras/package/macosx/Framework/Headers/Public/VLCMediaListAspect.h [deleted file]
extras/package/macosx/Framework/Headers/Public/VLCMediaPlayer.h [deleted file]
extras/package/macosx/Framework/Headers/Public/VLCPlaylistDataSource.h [deleted file]
extras/package/macosx/Framework/Headers/Public/VLCServicesDiscoverer.h [deleted file]
extras/package/macosx/Framework/Headers/Public/VLCStreamOutput.h [deleted file]
extras/package/macosx/Framework/Headers/Public/VLCStreamSession.h [deleted file]
extras/package/macosx/Framework/Headers/Public/VLCTime.h [deleted file]
extras/package/macosx/Framework/Headers/Public/VLCVideoLayer.h [deleted file]
extras/package/macosx/Framework/Headers/Public/VLCVideoView.h [deleted file]
extras/package/macosx/Framework/Makefile [deleted file]
extras/package/macosx/Framework/Pre-Compile.sh [deleted file]
extras/package/macosx/Framework/Resources/Info.plist [deleted file]
extras/package/macosx/Framework/Resources/version.plist [deleted file]
extras/package/macosx/Framework/Sources/VLCAudio.m [deleted file]
extras/package/macosx/Framework/Sources/VLCEventManager.m [deleted file]
extras/package/macosx/Framework/Sources/VLCLibrary.m [deleted file]
extras/package/macosx/Framework/Sources/VLCMedia.m [deleted file]
extras/package/macosx/Framework/Sources/VLCMediaDiscoverer.m [deleted file]
extras/package/macosx/Framework/Sources/VLCMediaLibrary.m [deleted file]
extras/package/macosx/Framework/Sources/VLCMediaList.m [deleted file]
extras/package/macosx/Framework/Sources/VLCMediaListAspect.m [deleted file]
extras/package/macosx/Framework/Sources/VLCMediaPlayer.m [deleted file]
extras/package/macosx/Framework/Sources/VLCPlaylistDataSource.m [deleted file]
extras/package/macosx/Framework/Sources/VLCServicesDiscoverer.m [deleted file]
extras/package/macosx/Framework/Sources/VLCStreamOutput.m [deleted file]
extras/package/macosx/Framework/Sources/VLCStreamSession.m [deleted file]
extras/package/macosx/Framework/Sources/VLCTime.m [deleted file]
extras/package/macosx/Framework/Sources/VLCVideoCommon.m [deleted file]
extras/package/macosx/Framework/Sources/VLCVideoLayer.m [deleted file]
extras/package/macosx/Framework/Sources/VLCVideoView.m [deleted file]
extras/package/macosx/Framework/VLCKit.xcodeproj/project.pbxproj [deleted file]
extras/package/macosx/Framework/VLC_Prefix.pch [deleted file]
extras/package/macosx/VLC_app/English.lproj/InfoPlist.strings [deleted file]
extras/package/macosx/VLC_app/English.lproj/MainMenu.nib/classes.nib [deleted file]
extras/package/macosx/VLC_app/English.lproj/MainMenu.nib/info.nib [deleted file]
extras/package/macosx/VLC_app/English.lproj/MainMenu.nib/keyedobjects.nib [deleted file]
extras/package/macosx/VLC_app/English.lproj/MainWindow.xib [deleted file]
extras/package/macosx/VLC_app/Icons/applications-internet.png [deleted file]
extras/package/macosx/VLC_app/Icons/dialog-error.png [deleted file]
extras/package/macosx/VLC_app/Info.plist [deleted file]
extras/package/macosx/VLC_app/Sources/ImageAndTextCell.h [deleted file]
extras/package/macosx/VLC_app/Sources/ImageAndTextCell.m [deleted file]
extras/package/macosx/VLC_app/Sources/VLCAppAdditions.h [deleted file]
extras/package/macosx/VLC_app/Sources/VLCAppAdditions.m [deleted file]
extras/package/macosx/VLC_app/Sources/VLCAppBindings.h [deleted file]
extras/package/macosx/VLC_app/Sources/VLCAppBindings.m [deleted file]
extras/package/macosx/VLC_app/Sources/VLCBrowsableVideoView.h [deleted file]
extras/package/macosx/VLC_app/Sources/VLCBrowsableVideoView.m [deleted file]
extras/package/macosx/VLC_app/Sources/VLCController.h [deleted file]
extras/package/macosx/VLC_app/Sources/VLCController.m [deleted file]
extras/package/macosx/VLC_app/Sources/VLCExceptionHandler.h [deleted file]
extras/package/macosx/VLC_app/Sources/VLCExceptionHandler.m [deleted file]
extras/package/macosx/VLC_app/Sources/VLCFullScreenControllerWindow.h [deleted file]
extras/package/macosx/VLC_app/Sources/VLCFullScreenControllerWindow.m [deleted file]
extras/package/macosx/VLC_app/Sources/VLCMainWindow.h [deleted file]
extras/package/macosx/VLC_app/Sources/VLCMainWindow.m [deleted file]
extras/package/macosx/VLC_app/Sources/VLCMediaArrayController.h [deleted file]
extras/package/macosx/VLC_app/Sources/VLCMediaArrayController.m [deleted file]
extras/package/macosx/VLC_app/Sources/VLCValueTransformer.h [deleted file]
extras/package/macosx/VLC_app/Sources/VLCValueTransformer.m [deleted file]
extras/package/macosx/VLC_app/VLC.xcodeproj/project.pbxproj [deleted file]
extras/package/macosx/VLC_app/VLC_Prefix.pch [deleted file]
extras/package/macosx/VLC_app/main.m [deleted file]
projects/macosx/framework/Examples/FlashVideoDownloader/Controller.h [new file with mode: 0644]
projects/macosx/framework/Examples/FlashVideoDownloader/Controller.m [new file with mode: 0644]
projects/macosx/framework/Examples/FlashVideoDownloader/English.lproj/InfoPlist.strings [new file with mode: 0644]
projects/macosx/framework/Examples/FlashVideoDownloader/English.lproj/MainMenu.nib/classes.nib [new file with mode: 0644]
projects/macosx/framework/Examples/FlashVideoDownloader/English.lproj/MainMenu.nib/info.nib [new file with mode: 0644]
projects/macosx/framework/Examples/FlashVideoDownloader/English.lproj/MainMenu.nib/keyedobjects.nib [new file with mode: 0644]
projects/macosx/framework/Examples/FlashVideoDownloader/FlashVideoDownloader.xcodeproj/project.pbxproj [new file with mode: 0644]
projects/macosx/framework/Examples/FlashVideoDownloader/FlashVideoDownloader_Prefix.pch [new file with mode: 0644]
projects/macosx/framework/Examples/FlashVideoDownloader/GradientBackgroundView.h [new file with mode: 0644]
projects/macosx/framework/Examples/FlashVideoDownloader/GradientBackgroundView.m [new file with mode: 0644]
projects/macosx/framework/Examples/FlashVideoDownloader/Info.plist [new file with mode: 0644]
projects/macosx/framework/Examples/FlashVideoDownloader/main.m [new file with mode: 0644]
projects/macosx/framework/Examples/iPodConverter/Controller.h [new file with mode: 0644]
projects/macosx/framework/Examples/iPodConverter/Controller.m [new file with mode: 0644]
projects/macosx/framework/Examples/iPodConverter/English.lproj/InfoPlist.strings [new file with mode: 0644]
projects/macosx/framework/Examples/iPodConverter/English.lproj/MainMenu.nib/classes.nib [new file with mode: 0644]
projects/macosx/framework/Examples/iPodConverter/English.lproj/MainMenu.nib/info.nib [new file with mode: 0644]
projects/macosx/framework/Examples/iPodConverter/English.lproj/MainMenu.nib/keyedobjects.nib [new file with mode: 0644]
projects/macosx/framework/Examples/iPodConverter/GradientBackgroundView.h [new file with mode: 0644]
projects/macosx/framework/Examples/iPodConverter/GradientBackgroundView.m [new file with mode: 0644]
projects/macosx/framework/Examples/iPodConverter/Info.plist [new file with mode: 0644]
projects/macosx/framework/Examples/iPodConverter/MovieReceiver.h [new file with mode: 0644]
projects/macosx/framework/Examples/iPodConverter/MovieReceiver.m [new file with mode: 0644]
projects/macosx/framework/Examples/iPodConverter/iPodConverter.xcodeproj/project.pbxproj [new file with mode: 0644]
projects/macosx/framework/Examples/iPodConverter/iPodConverter_Prefix.pch [new file with mode: 0644]
projects/macosx/framework/Examples/iPodConverter/main.m [new file with mode: 0644]
projects/macosx/framework/Examples/test/Controller.h [new file with mode: 0644]
projects/macosx/framework/Examples/test/Controller.m [new file with mode: 0644]
projects/macosx/framework/Examples/test/English.lproj/InfoPlist.strings [new file with mode: 0644]
projects/macosx/framework/Examples/test/English.lproj/MainMenu.nib/classes.nib [new file with mode: 0644]
projects/macosx/framework/Examples/test/English.lproj/MainMenu.nib/info.nib [new file with mode: 0644]
projects/macosx/framework/Examples/test/English.lproj/MainMenu.nib/keyedobjects.nib [new file with mode: 0644]
projects/macosx/framework/Examples/test/Info.plist [new file with mode: 0644]
projects/macosx/framework/Examples/test/main.m [new file with mode: 0644]
projects/macosx/framework/Examples/test/test.xcodeproj/project.pbxproj [new file with mode: 0644]
projects/macosx/framework/Examples/test/test_Prefix.pch [new file with mode: 0644]
projects/macosx/framework/Headers/Internal/VLCEventManager.h [new file with mode: 0644]
projects/macosx/framework/Headers/Internal/VLCLibVLCBridging.h [new file with mode: 0644]
projects/macosx/framework/Headers/Internal/VLCVideoCommon.h [new file with mode: 0644]
projects/macosx/framework/Headers/Public/VLCAudio.h [new file with mode: 0644]
projects/macosx/framework/Headers/Public/VLCKit.h [new file with mode: 0644]
projects/macosx/framework/Headers/Public/VLCLibrary.h [new file with mode: 0644]
projects/macosx/framework/Headers/Public/VLCMedia.h [new file with mode: 0644]
projects/macosx/framework/Headers/Public/VLCMediaDiscoverer.h [new file with mode: 0644]
projects/macosx/framework/Headers/Public/VLCMediaLibrary.h [new file with mode: 0644]
projects/macosx/framework/Headers/Public/VLCMediaList.h [new file with mode: 0644]
projects/macosx/framework/Headers/Public/VLCMediaListAspect.h [new file with mode: 0644]
projects/macosx/framework/Headers/Public/VLCMediaPlayer.h [new file with mode: 0644]
projects/macosx/framework/Headers/Public/VLCPlaylistDataSource.h [new file with mode: 0644]
projects/macosx/framework/Headers/Public/VLCServicesDiscoverer.h [new file with mode: 0644]
projects/macosx/framework/Headers/Public/VLCStreamOutput.h [new file with mode: 0644]
projects/macosx/framework/Headers/Public/VLCStreamSession.h [new file with mode: 0644]
projects/macosx/framework/Headers/Public/VLCTime.h [new file with mode: 0644]
projects/macosx/framework/Headers/Public/VLCVideoLayer.h [new file with mode: 0644]
projects/macosx/framework/Headers/Public/VLCVideoView.h [new file with mode: 0644]
projects/macosx/framework/Makefile [new file with mode: 0644]
projects/macosx/framework/Pre-Compile.sh [new file with mode: 0644]
projects/macosx/framework/Resources/Info.plist [new file with mode: 0644]
projects/macosx/framework/Resources/version.plist [new file with mode: 0644]
projects/macosx/framework/Sources/VLCAudio.m [new file with mode: 0644]
projects/macosx/framework/Sources/VLCEventManager.m [new file with mode: 0644]
projects/macosx/framework/Sources/VLCLibrary.m [new file with mode: 0644]
projects/macosx/framework/Sources/VLCMedia.m [new file with mode: 0644]
projects/macosx/framework/Sources/VLCMediaDiscoverer.m [new file with mode: 0644]
projects/macosx/framework/Sources/VLCMediaLibrary.m [new file with mode: 0644]
projects/macosx/framework/Sources/VLCMediaList.m [new file with mode: 0644]
projects/macosx/framework/Sources/VLCMediaListAspect.m [new file with mode: 0644]
projects/macosx/framework/Sources/VLCMediaPlayer.m [new file with mode: 0644]
projects/macosx/framework/Sources/VLCPlaylistDataSource.m [new file with mode: 0644]
projects/macosx/framework/Sources/VLCServicesDiscoverer.m [new file with mode: 0644]
projects/macosx/framework/Sources/VLCStreamOutput.m [new file with mode: 0644]
projects/macosx/framework/Sources/VLCStreamSession.m [new file with mode: 0644]
projects/macosx/framework/Sources/VLCTime.m [new file with mode: 0644]
projects/macosx/framework/Sources/VLCVideoCommon.m [new file with mode: 0644]
projects/macosx/framework/Sources/VLCVideoLayer.m [new file with mode: 0644]
projects/macosx/framework/Sources/VLCVideoView.m [new file with mode: 0644]
projects/macosx/framework/VLCKit.xcodeproj/project.pbxproj [new file with mode: 0644]
projects/macosx/framework/VLC_Prefix.pch [new file with mode: 0644]
projects/macosx/vlc_app/English.lproj/InfoPlist.strings [new file with mode: 0644]
projects/macosx/vlc_app/English.lproj/MainMenu.nib/classes.nib [new file with mode: 0644]
projects/macosx/vlc_app/English.lproj/MainMenu.nib/info.nib [new file with mode: 0644]
projects/macosx/vlc_app/English.lproj/MainMenu.nib/keyedobjects.nib [new file with mode: 0644]
projects/macosx/vlc_app/English.lproj/MainWindow.xib [new file with mode: 0644]
projects/macosx/vlc_app/Icons/applications-internet.png [new file with mode: 0644]
projects/macosx/vlc_app/Icons/dialog-error.png [new file with mode: 0644]
projects/macosx/vlc_app/Info.plist [new file with mode: 0644]
projects/macosx/vlc_app/Sources/ImageAndTextCell.h [new file with mode: 0644]
projects/macosx/vlc_app/Sources/ImageAndTextCell.m [new file with mode: 0644]
projects/macosx/vlc_app/Sources/VLCAppAdditions.h [new file with mode: 0644]
projects/macosx/vlc_app/Sources/VLCAppAdditions.m [new file with mode: 0644]
projects/macosx/vlc_app/Sources/VLCAppBindings.h [new file with mode: 0644]
projects/macosx/vlc_app/Sources/VLCAppBindings.m [new file with mode: 0644]
projects/macosx/vlc_app/Sources/VLCBrowsableVideoView.h [new file with mode: 0644]
projects/macosx/vlc_app/Sources/VLCBrowsableVideoView.m [new file with mode: 0644]
projects/macosx/vlc_app/Sources/VLCController.h [new file with mode: 0644]
projects/macosx/vlc_app/Sources/VLCController.m [new file with mode: 0644]
projects/macosx/vlc_app/Sources/VLCExceptionHandler.h [new file with mode: 0644]
projects/macosx/vlc_app/Sources/VLCExceptionHandler.m [new file with mode: 0644]
projects/macosx/vlc_app/Sources/VLCFullScreenControllerWindow.h [new file with mode: 0644]
projects/macosx/vlc_app/Sources/VLCFullScreenControllerWindow.m [new file with mode: 0644]
projects/macosx/vlc_app/Sources/VLCMainWindow.h [new file with mode: 0644]
projects/macosx/vlc_app/Sources/VLCMainWindow.m [new file with mode: 0644]
projects/macosx/vlc_app/Sources/VLCMediaArrayController.h [new file with mode: 0644]
projects/macosx/vlc_app/Sources/VLCMediaArrayController.m [new file with mode: 0644]
projects/macosx/vlc_app/Sources/VLCValueTransformer.h [new file with mode: 0644]
projects/macosx/vlc_app/Sources/VLCValueTransformer.m [new file with mode: 0644]
projects/macosx/vlc_app/VLC.xcodeproj/project.pbxproj [new file with mode: 0644]
projects/macosx/vlc_app/VLC_Prefix.pch [new file with mode: 0644]
projects/macosx/vlc_app/main.m [new file with mode: 0644]

diff --git a/extras/package/macosx/Framework/Examples/FlashVideoDownloader/Controller.h b/extras/package/macosx/Framework/Examples/FlashVideoDownloader/Controller.h
deleted file mode 100644 (file)
index 49c5f65..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Controller */
-
-#import <Cocoa/Cocoa.h>
-#import <VLCKit/VLCKit.h>
-
-@interface Controller : NSObject
-{
-    IBOutlet NSView * remoteURLView;
-    IBOutlet NSView * workingView;
-    IBOutlet NSWindow * window;
-    IBOutlet NSButton * openConvertedFileButton;
-
-    NSNumber * selectedStreamOutput;
-    NSString * remoteURLAsString;
-
-    VLCMedia * media;
-    VLCStreamSession * streamSession;
-    
-    NSString * outputFilePath;
-    NSString * outputFolderPath;
-}
-
-- (void)awakeFromNib;
-
-@property (retain) VLCMedia * media;
-@property (retain) VLCStreamSession * streamSession;
-@property (assign) NSNumber * selectedStreamOutput;
-@property (retain,readonly) NSString * outputFilePath;
-@property (retain,readonly) NSString * outputFolderPath;
-@property (retain) NSString * remoteURLAsString;
-
-- (IBAction)convert:(id)sender;
-- (IBAction)openConvertedFile:(id)sender;
-- (IBAction)openConvertedEnclosingFolder:(id)sender;
-- (IBAction)pickOutputFolderPath:(id)sender;
-@end
diff --git a/extras/package/macosx/Framework/Examples/FlashVideoDownloader/Controller.m b/extras/package/macosx/Framework/Examples/FlashVideoDownloader/Controller.m
deleted file mode 100644 (file)
index 80490a9..0000000
+++ /dev/null
@@ -1,252 +0,0 @@
-#import "Controller.h"
-
-
-/**********************************************************
- * First off, some value transformer to easily play with
- * bindings
- */
-@interface VLCFloat10000FoldTransformer : NSObject
-@end
-
-@implementation VLCFloat10000FoldTransformer
-
-+ (Class)transformedValueClass
-{
-    return [NSNumber class];
-}
-
-+ (BOOL)allowsReverseTransformation
-{
-    return YES;
-}
-
-- (id)transformedValue:(id)value
-{
-    if( !value ) return nil;
-    if(![value respondsToSelector: @selector(floatValue)])
-    {
-        [NSException raise: NSInternalInconsistencyException
-                    format: @"Value (%@) does not respond to -floatValue.",
-        [value class]];
-        return nil;
-    }
-    return [NSNumber numberWithFloat: [value floatValue]*10000.];
-}
-
-- (id)reverseTransformedValue:(id)value
-{
-    if( !value ) return nil;
-    if(![value respondsToSelector: @selector(floatValue)])
-    {
-        [NSException raise: NSInternalInconsistencyException
-                    format: @"Value (%@) does not respond to -floatValue.",
-        [value class]];
-        return nil;
-    }
-    return [NSNumber numberWithFloat: [value floatValue]/10000.];
-}
-@end
-
-
-/**********************************************************
- * @implementation Controller
- */
-@interface Controller ()
-@property (retain,readwrite) NSString * outputFolderPath;
-@end
-
-@implementation Controller
-- (id)init
-{
-    if(self = [super init])
-    {
-        [self bind:@"outputFolderPath" toObject:[NSUserDefaultsController sharedUserDefaultsController]
-              withKeyPath:@"values.outputFolderPath" options:nil]; 
-        [[[NSUserDefaultsController sharedUserDefaultsController] values] bind:@"outputFolderPath" toObject:self
-              withKeyPath:@"outputFolderPath" options:nil]; 
-        VLCFloat10000FoldTransformer *float100fold;
-        float100fold = [[[VLCFloat10000FoldTransformer alloc] init] autorelease];
-        [NSValueTransformer setValueTransformer:(id)float100fold forName:@"Float10000FoldTransformer"];
-        self.media = nil;
-        self.streamSession = nil;
-        selectedStreamOutput = [[NSNumber alloc] initWithInt:0];
-        self.remoteURLAsString = [NSString stringWithString:@"http://youtube.com/watch?v=IXpx2OEWBdA&feature=bz303"];
-        outputFilePath = nil;
-        if( !self.outputFolderPath || [self.outputFolderPath isKindOfClass:[NSNull class]])
-            self.outputFolderPath = [@"~/Movies/Flash Video Converted" stringByExpandingTildeInPath];
-    }
-    return self;
-}
-
-- (void)dealloc
-{
-    [outputFilePath release];
-    [remoteURLAsString release];
-    [streamSession release];
-    [media release];
-    [super dealloc];
-}
-
-@synthesize streamSession;
-@synthesize selectedStreamOutput;
-@synthesize media;
-@synthesize outputFolderPath;
-
-- (void)awakeFromNib
-{
-    [window setShowsResizeIndicator:NO];
-    [NSApp setDelegate: self];
-}
-
-- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
-{
-    [VLCLibrary sharedLibrary];
-}
-
-- (NSString *)remoteURLAsString
-{
-    return remoteURLAsString;
-}
-
-- (void)setRemoteURLAsString:(NSString *)newURLAsString
-{
-    [remoteURLAsString release];
-    remoteURLAsString = [[newURLAsString copy] retain];
-    media = [[newURLAsString copy] retain];
-    [self setMedia:[VLCMedia mediaWithPath:newURLAsString]];
-}
-
-+ (NSSet *)keyPathsForValuesAffectingOutputFilePath
-{
-    return [NSSet setWithObjects:@"media.metaDictionary.title", nil];
-}
-
-- (void)freezeOutputFilePath
-{
-    [outputFilePath release];
-    outputFilePath = nil;
-    outputFilePath = [self outputFilePath];
-    [outputFilePath retain];
-}
-
-- (NSString *)outputFilePath
-{
-    if(outputFilePath)
-        return [outputFilePath copy];
-    VLCMedia * aMedia = self.streamSession ? self.streamSession.media ? self.streamSession.media : self.media : self.media;
-    NSString * name = [[[aMedia metaDictionary] objectForKey:@"title"] lastPathComponent];
-    NSString * extension = [selectedStreamOutput intValue] == 2 ? @"mpeg" : @"mp4";
-    NSString * path = [NSString stringWithFormat:@"%@/%@.%@", self.outputFolderPath, name, extension ];
-    int i;
-    for( i = 0; [[NSFileManager defaultManager] fileExistsAtPath:path]; i ++)
-    {
-        path = [NSString stringWithFormat:@"%@/%@ %d.%@", self.outputFolderPath, name, i, extension ];
-        if( i > 256 )
-        {
-            /* Don't got too far */
-            /* FIXME: Be nicer with the user and give him a choice for the new name */
-            NSRunAlertPanelRelativeToWindow(@"File already exists",
-                [NSString stringWithFormat:
-                    @"File '%@', already exists. The old one will be deleted when the OK button will be pressed", path],
-                @"OK", nil, nil, window);
-            break;
-        }
-    }
-    return path;
-}
-
-
-- (IBAction)convert:(id)sender
-{
-    VLCStreamOutput * streamOutput;
-    [self.streamSession removeObserver:self forKeyPath:@"isComplete"];
-
-    self.streamSession = [VLCStreamSession streamSession];
-    [self freezeOutputFilePath];
-
-    if([selectedStreamOutput intValue] == 2)
-    {
-        streamOutput = [VLCStreamOutput mpeg2StreamOutputWithFilePath:[self outputFilePath]];
-    }
-    else if([selectedStreamOutput intValue] == 1)
-    {
-        streamOutput = [VLCStreamOutput mpeg4StreamOutputWithFilePath:[self outputFilePath]];
-    }
-    else
-        streamOutput = [VLCStreamOutput ipodStreamOutputWithFilePath:[self outputFilePath]];
-
-    /* Make sure we are exporting to a well known directory */
-    [[NSFileManager defaultManager] createDirectoryAtPath:self.outputFolderPath attributes:nil];
-
-    [self.streamSession setStreamOutput:streamOutput];
-    [self.streamSession setMedia:self.media];
-    [self.streamSession startStreaming];
-
-    [self.streamSession addObserver:self forKeyPath:@"isComplete" options:NSKeyValueObservingOptionNew context:nil];
-
-    /* Show the new view */
-    [[window contentView] addSubview:workingView];
-    NSRect frame = [workingView frame];
-    frame.origin.y -= NSHeight([window contentRectForFrameRect:[window frame]]) + 20.f;
-    [workingView setFrame:frame];
-    [[window animator] setFrame:NSMakeRect([window frame].origin.x, [window frame].origin.y-NSHeight([workingView frame]), NSWidth([window frame]), NSHeight([window frame])+NSHeight([workingView frame])) display:YES];
-}
-
-- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
-{
-    if([keyPath isEqualToString:@"isComplete"])
-    {
-        if([self.streamSession isComplete])
-        {
-            /* Notify the user */
-            [[NSSound soundNamed:@"Glass"] play];
-
-            /* Set the icon */
-            [openConvertedFileButton setImage:[[NSWorkspace sharedWorkspace] iconForFile:[self outputFilePath]]];
-            
-            /* Rename the link with a nicer name */
-            NSString * oldPath = [self outputFilePath];
-            [self freezeOutputFilePath];
-            [[NSFileManager defaultManager] moveItemAtPath:oldPath toPath:[self outputFilePath] error:NULL];
-        }
-        return;
-    }
-    [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
-}
-
-- (IBAction)openConvertedFile:(id)sender
-{
-    [[NSWorkspace sharedWorkspace] openFile:[self outputFilePath]];
-}
-
-- (IBAction)pickOutputFolderPath:(id)sender;
-{
-    NSOpenPanel * panel = [NSOpenPanel openPanel];
-    [panel setCanChooseFiles:NO];
-    [panel setCanChooseDirectories:YES];
-    [panel setAllowsMultipleSelection:NO];
-    [panel beginSheetForDirectory:self.outputFolderPath file:nil types:nil modalForWindow:[sender window] modalDelegate:self didEndSelector:@selector(openPanelDidEnd:returnCode:contextInfo:) contextInfo:nil];
-}
-
-- (void)openPanelDidEnd:(NSOpenPanel *)panel returnCode:(int)returnCode  contextInfo:(void  *)contextInfo
-{
-    if(returnCode != NSOKButton || ![[panel filenames] count])
-        return;
-    self.outputFolderPath = [[panel filenames] objectAtIndex:0];
-}
-
-- (IBAction)openConvertedEnclosingFolder:(id)sender
-{
-    [[NSWorkspace sharedWorkspace] selectFile:[self outputFilePath] inFileViewerRootedAtPath:[[self outputFilePath] stringByDeletingLastPathComponent]];
-}
-
-- (IBAction)cancel:(id)sender
-{
-    [self.streamSession stop];
-}
-
-@end
diff --git a/extras/package/macosx/Framework/Examples/FlashVideoDownloader/English.lproj/InfoPlist.strings b/extras/package/macosx/Framework/Examples/FlashVideoDownloader/English.lproj/InfoPlist.strings
deleted file mode 100644 (file)
index 997688e..0000000
Binary files a/extras/package/macosx/Framework/Examples/FlashVideoDownloader/English.lproj/InfoPlist.strings and /dev/null differ
diff --git a/extras/package/macosx/Framework/Examples/FlashVideoDownloader/English.lproj/MainMenu.nib/classes.nib b/extras/package/macosx/Framework/Examples/FlashVideoDownloader/English.lproj/MainMenu.nib/classes.nib
deleted file mode 100644 (file)
index 34e9141..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>IBClasses</key>
-       <array>
-               <dict>
-                       <key>CLASS</key>
-                       <string>GradientBackgroundView</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>SUPERCLASS</key>
-                       <string>NSImageView</string>
-               </dict>
-               <dict>
-                       <key>CLASS</key>
-                       <string>FirstResponder</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>SUPERCLASS</key>
-                       <string>NSObject</string>
-               </dict>
-               <dict>
-                       <key>ACTIONS</key>
-                       <dict>
-                               <key>convert</key>
-                               <string>id</string>
-                               <key>openConvertedEnclosingFolder</key>
-                               <string>id</string>
-                               <key>openConvertedFile</key>
-                               <string>id</string>
-                               <key>pickOutputFolderPath</key>
-                               <string>id</string>
-                       </dict>
-                       <key>CLASS</key>
-                       <string>Controller</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>OUTLETS</key>
-                       <dict>
-                               <key>openConvertedFileButton</key>
-                               <string>NSButton</string>
-                               <key>remoteURLView</key>
-                               <string>NSView</string>
-                               <key>titleView</key>
-                               <string>NSView</string>
-                               <key>window</key>
-                               <string>NSWindow</string>
-                               <key>workingView</key>
-                               <string>NSView</string>
-                       </dict>
-                       <key>SUPERCLASS</key>
-                       <string>NSObject</string>
-               </dict>
-       </array>
-       <key>IBVersion</key>
-       <string>1</string>
-</dict>
-</plist>
diff --git a/extras/package/macosx/Framework/Examples/FlashVideoDownloader/English.lproj/MainMenu.nib/info.nib b/extras/package/macosx/Framework/Examples/FlashVideoDownloader/English.lproj/MainMenu.nib/info.nib
deleted file mode 100644 (file)
index a10788a..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>IBFramework Version</key>
-       <string>629</string>
-       <key>IBLastKnownRelativeProjectPath</key>
-       <string>../../FlashVideoDownloader.xcodeproj</string>
-       <key>IBOldestOS</key>
-       <integer>5</integer>
-       <key>IBOpenObjects</key>
-       <array>
-               <integer>21</integer>
-               <integer>169</integer>
-               <integer>940</integer>
-               <integer>704</integer>
-       </array>
-       <key>IBSystem Version</key>
-       <string>9B18</string>
-       <key>targetFramework</key>
-       <string>IBCocoaFramework</string>
-</dict>
-</plist>
diff --git a/extras/package/macosx/Framework/Examples/FlashVideoDownloader/English.lproj/MainMenu.nib/keyedobjects.nib b/extras/package/macosx/Framework/Examples/FlashVideoDownloader/English.lproj/MainMenu.nib/keyedobjects.nib
deleted file mode 100644 (file)
index 91df7aa..0000000
Binary files a/extras/package/macosx/Framework/Examples/FlashVideoDownloader/English.lproj/MainMenu.nib/keyedobjects.nib and /dev/null differ
diff --git a/extras/package/macosx/Framework/Examples/FlashVideoDownloader/FlashVideoDownloader.xcodeproj/project.pbxproj b/extras/package/macosx/Framework/Examples/FlashVideoDownloader/FlashVideoDownloader.xcodeproj/project.pbxproj
deleted file mode 100644 (file)
index bba0256..0000000
+++ /dev/null
@@ -1,375 +0,0 @@
-// !$*UTF8*$!
-{
-       archiveVersion = 1;
-       classes = {
-       };
-       objectVersion = 42;
-       objects = {
-
-/* Begin PBXBuildFile section */
-               632A105C0D39148A00AFC99B /* VLCKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 632A0F710D38F71A00AFC99B /* VLCKit.framework */; };
-               632A122C0D3947D900AFC99B /* GradientBackgroundView.m in Sources */ = {isa = PBXBuildFile; fileRef = 632A122B0D3947D900AFC99B /* GradientBackgroundView.m */; };
-               6333027B0BD24CDB00193D7D /* Controller.m in Sources */ = {isa = PBXBuildFile; fileRef = 633302790BD24CDB00193D7D /* Controller.m */; };
-               8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 29B97318FDCFA39411CA2CEA /* MainMenu.nib */; };
-               8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
-               8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
-               8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXContainerItemProxy section */
-               632A0F700D38F71A00AFC99B /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 632A0F680D38F71A00AFC99B /* VLCKit.xcodeproj */;
-                       proxyType = 2;
-                       remoteGlobalIDString = 8DC2EF5B0486A6940098B216;
-                       remoteInfo = VLCKit;
-               };
-               632A0F780D38F72F00AFC99B /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 632A0F680D38F71A00AFC99B /* VLCKit.xcodeproj */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
-                       remoteInfo = VLCKit;
-               };
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXFileReference section */
-               089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-               1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
-               13E42FB307B3F0F600E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
-               29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-               29B97319FDCFA39411CA2CEA /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/MainMenu.nib; sourceTree = "<group>"; };
-               29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
-               29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
-               32CA4F630368D1EE00C91783 /* FlashVideoDownloader_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FlashVideoDownloader_Prefix.pch; sourceTree = "<group>"; };
-               632A0F680D38F71A00AFC99B /* VLCKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = VLCKit.xcodeproj; path = ../../VLCKit.xcodeproj; sourceTree = SOURCE_ROOT; };
-               632A122A0D3947D900AFC99B /* GradientBackgroundView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GradientBackgroundView.h; sourceTree = "<group>"; };
-               632A122B0D3947D900AFC99B /* GradientBackgroundView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GradientBackgroundView.m; sourceTree = "<group>"; };
-               633302780BD24CDB00193D7D /* Controller.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Controller.h; sourceTree = "<group>"; };
-               633302790BD24CDB00193D7D /* Controller.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = Controller.m; sourceTree = "<group>"; };
-               636836780D3999E5003A1400 /* Flash Video Downloader.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Flash Video Downloader.app"; sourceTree = BUILT_PRODUCTS_DIR; };
-               8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-               8D11072E0486CEB800E47090 /* Frameworks */ = {
-                       isa = PBXFrameworksBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               632A105C0D39148A00AFC99B /* VLCKit.framework in Frameworks */,
-                               8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-               080E96DDFE201D6D7F000001 /* Classes */ = {
-                       isa = PBXGroup;
-                       children = (
-                               632A122A0D3947D900AFC99B /* GradientBackgroundView.h */,
-                               632A122B0D3947D900AFC99B /* GradientBackgroundView.m */,
-                               633302780BD24CDB00193D7D /* Controller.h */,
-                               633302790BD24CDB00193D7D /* Controller.m */,
-                       );
-                       name = Classes;
-                       sourceTree = "<group>";
-               };
-               1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
-                       isa = PBXGroup;
-                       children = (
-                               1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
-                       );
-                       name = "Linked Frameworks";
-                       sourceTree = "<group>";
-               };
-               1058C7A2FEA54F0111CA2CBB /* Other Frameworks */ = {
-                       isa = PBXGroup;
-                       children = (
-                               29B97324FDCFA39411CA2CEA /* AppKit.framework */,
-                               13E42FB307B3F0F600E4EEF1 /* CoreData.framework */,
-                               29B97325FDCFA39411CA2CEA /* Foundation.framework */,
-                       );
-                       name = "Other Frameworks";
-                       sourceTree = "<group>";
-               };
-               19C28FACFE9D520D11CA2CBB /* Products */ = {
-                       isa = PBXGroup;
-                       children = (
-                               636836780D3999E5003A1400 /* Flash Video Downloader.app */,
-                       );
-                       name = Products;
-                       sourceTree = "<group>";
-               };
-               29B97314FDCFA39411CA2CEA /* test */ = {
-                       isa = PBXGroup;
-                       children = (
-                               632A0F680D38F71A00AFC99B /* VLCKit.xcodeproj */,
-                               080E96DDFE201D6D7F000001 /* Classes */,
-                               29B97315FDCFA39411CA2CEA /* Other Sources */,
-                               29B97317FDCFA39411CA2CEA /* Resources */,
-                               29B97323FDCFA39411CA2CEA /* Frameworks */,
-                               19C28FACFE9D520D11CA2CBB /* Products */,
-                       );
-                       name = test;
-                       sourceTree = "<group>";
-               };
-               29B97315FDCFA39411CA2CEA /* Other Sources */ = {
-                       isa = PBXGroup;
-                       children = (
-                               32CA4F630368D1EE00C91783 /* FlashVideoDownloader_Prefix.pch */,
-                               29B97316FDCFA39411CA2CEA /* main.m */,
-                       );
-                       name = "Other Sources";
-                       sourceTree = "<group>";
-               };
-               29B97317FDCFA39411CA2CEA /* Resources */ = {
-                       isa = PBXGroup;
-                       children = (
-                               8D1107310486CEB800E47090 /* Info.plist */,
-                               089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
-                               29B97318FDCFA39411CA2CEA /* MainMenu.nib */,
-                       );
-                       name = Resources;
-                       sourceTree = "<group>";
-               };
-               29B97323FDCFA39411CA2CEA /* Frameworks */ = {
-                       isa = PBXGroup;
-                       children = (
-                               1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
-                               1058C7A2FEA54F0111CA2CBB /* Other Frameworks */,
-                       );
-                       name = Frameworks;
-                       sourceTree = "<group>";
-               };
-               632A0F690D38F71A00AFC99B /* Products */ = {
-                       isa = PBXGroup;
-                       children = (
-                               632A0F710D38F71A00AFC99B /* VLCKit.framework */,
-                       );
-                       name = Products;
-                       sourceTree = "<group>";
-               };
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-               8D1107260486CEB800E47090 /* Flash Video Downloader */ = {
-                       isa = PBXNativeTarget;
-                       buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "Flash Video Downloader" */;
-                       buildPhases = (
-                               636836C00D399CF0003A1400 /* ShellScript */,
-                               8D1107290486CEB800E47090 /* Resources */,
-                               8D11072C0486CEB800E47090 /* Sources */,
-                               8D11072E0486CEB800E47090 /* Frameworks */,
-                       );
-                       buildRules = (
-                       );
-                       dependencies = (
-                               632A0F790D38F72F00AFC99B /* PBXTargetDependency */,
-                       );
-                       name = "Flash Video Downloader";
-                       productInstallPath = "$(HOME)/Applications";
-                       productName = test;
-                       productReference = 636836780D3999E5003A1400 /* Flash Video Downloader.app */;
-                       productType = "com.apple.product-type.application";
-               };
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-               29B97313FDCFA39411CA2CEA /* Project object */ = {
-                       isa = PBXProject;
-                       buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "FlashVideoDownloader" */;
-                       compatibilityVersion = "Xcode 2.4";
-                       hasScannedForEncodings = 1;
-                       mainGroup = 29B97314FDCFA39411CA2CEA /* test */;
-                       projectDirPath = "";
-                       projectReferences = (
-                               {
-                                       ProductGroup = 632A0F690D38F71A00AFC99B /* Products */;
-                                       ProjectRef = 632A0F680D38F71A00AFC99B /* VLCKit.xcodeproj */;
-                               },
-                       );
-                       projectRoot = "";
-                       targets = (
-                               8D1107260486CEB800E47090 /* Flash Video Downloader */,
-                       );
-               };
-/* End PBXProject section */
-
-/* Begin PBXReferenceProxy section */
-               632A0F710D38F71A00AFC99B /* VLCKit.framework */ = {
-                       isa = PBXReferenceProxy;
-                       fileType = wrapper.framework;
-                       path = VLCKit.framework;
-                       remoteRef = 632A0F700D38F71A00AFC99B /* PBXContainerItemProxy */;
-                       sourceTree = BUILT_PRODUCTS_DIR;
-               };
-/* End PBXReferenceProxy section */
-
-/* Begin PBXResourcesBuildPhase section */
-               8D1107290486CEB800E47090 /* Resources */ = {
-                       isa = PBXResourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */,
-                               8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXShellScriptBuildPhase section */
-               636836C00D399CF0003A1400 /* ShellScript */ = {
-                       isa = PBXShellScriptBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                       );
-                       inputPaths = (
-                       );
-                       outputPaths = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-                       shellPath = /bin/sh;
-                       shellScript = "if test \"$SYMROOT\" == \"$PROJECT_DIR/build\"\nthen\n\tVLCFRAMEWORK=\"$SRCROOT/../../build/$CONFIGURATION/VLCKit.framework\"\nelse\n\tVLCFRAMEWORK=\"$SYMROOT/$CONFIGURATION/VLCKit.framework\"\nfi\nmkdir -p \"$BUILT_PRODUCTS_DIR/$FRAMEWORKS_FOLDER_PATH\"\n/Developer/Library/PrivateFrameworks/DevToolsCore.framework/Resources/pbxcp -exclude .DS_Store -exclude CVS -exclude .svn -resolve-src-symlinks \"$VLCFRAMEWORK\" \"$BUILT_PRODUCTS_DIR/$FRAMEWORKS_FOLDER_PATH\"";
-                       showEnvVarsInLog = 0;
-               };
-/* End PBXShellScriptBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-               8D11072C0486CEB800E47090 /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               8D11072D0486CEB800E47090 /* main.m in Sources */,
-                               6333027B0BD24CDB00193D7D /* Controller.m in Sources */,
-                               632A122C0D3947D900AFC99B /* GradientBackgroundView.m in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXTargetDependency section */
-               632A0F790D38F72F00AFC99B /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       name = VLCKit;
-                       targetProxy = 632A0F780D38F72F00AFC99B /* PBXContainerItemProxy */;
-               };
-/* End PBXTargetDependency section */
-
-/* Begin PBXVariantGroup section */
-               089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = {
-                       isa = PBXVariantGroup;
-                       children = (
-                               089C165DFE840E0CC02AAC07 /* English */,
-                       );
-                       name = InfoPlist.strings;
-                       sourceTree = "<group>";
-               };
-               29B97318FDCFA39411CA2CEA /* MainMenu.nib */ = {
-                       isa = PBXVariantGroup;
-                       children = (
-                               29B97319FDCFA39411CA2CEA /* English */,
-                       );
-                       name = MainMenu.nib;
-                       sourceTree = "<group>";
-               };
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
-               C01FCF4B08A954540054247B /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               COPY_PHASE_STRIP = NO;
-                               FRAMEWORK_SEARCH_PATHS = (
-                                       "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
-                                       "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
-                               );
-                               FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../build/Release\"";
-                               FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../build/Debug\"";
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = 0;
-                               INFOPLIST_FILE = Info.plist;
-                               INSTALL_PATH = "$(HOME)/Applications";
-                               OTHER_LDFLAGS = (
-                                       "$(LD_FLAGS_LIBINTL)",
-                                       "$(LD_FLAGS_LIBVLC)",
-                                       "$(LD_FLAGS_LIBVLC_CONTROL)",
-                               );
-                               PRODUCT_NAME = "Flash Video Downloader";
-                               VLC_FRAMEWORK = "$(TARGET_BUILD_DIR)/VLC.framework";
-                               WRAPPER_EXTENSION = app;
-                               ZERO_LINK = YES;
-                       };
-                       name = Debug;
-               };
-               C01FCF4C08A954540054247B /* Release */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               ARCHS = "$(NATIVE_ARCH)";
-                               FRAMEWORK_SEARCH_PATHS = (
-                                       "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
-                                       "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
-                               );
-                               FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../build/Release\"";
-                               FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../build/Debug\"";
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-                               GCC_MODEL_TUNING = G5;
-                               INFOPLIST_FILE = Info.plist;
-                               INSTALL_PATH = "$(HOME)/Applications";
-                               OTHER_LDFLAGS = (
-                                       "$(LD_FLAGS_LIBINTL)",
-                                       "$(LD_FLAGS_LIBVLC)",
-                                       "$(LD_FLAGS_LIBVLC_CONTROL)",
-                               );
-                               PRODUCT_NAME = "Flash Video Downloader";
-                               VLC_FRAMEWORK = "$(TARGET_BUILD_DIR)/VLC.framework";
-                               WRAPPER_EXTENSION = app;
-                       };
-                       name = Release;
-               };
-               C01FCF4F08A954540054247B /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES;
-                               GCC_WARN_UNUSED_VARIABLE = YES;
-                               PREBINDING = NO;
-                       };
-                       name = Debug;
-               };
-               C01FCF5008A954540054247B /* Release */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               ARCHS = "$(NATIVE_ARCH)";
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES;
-                               GCC_WARN_UNUSED_VARIABLE = YES;
-                               PREBINDING = NO;
-                       };
-                       name = Release;
-               };
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-               C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "Flash Video Downloader" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               C01FCF4B08A954540054247B /* Debug */,
-                               C01FCF4C08A954540054247B /* Release */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Debug;
-               };
-               C01FCF4E08A954540054247B /* Build configuration list for PBXProject "FlashVideoDownloader" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               C01FCF4F08A954540054247B /* Debug */,
-                               C01FCF5008A954540054247B /* Release */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Debug;
-               };
-/* End XCConfigurationList section */
-       };
-       rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
-}
diff --git a/extras/package/macosx/Framework/Examples/FlashVideoDownloader/FlashVideoDownloader_Prefix.pch b/extras/package/macosx/Framework/Examples/FlashVideoDownloader/FlashVideoDownloader_Prefix.pch
deleted file mode 100644 (file)
index 0b05af7..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-//
-// Prefix header for all source files of the 'test' target in the 'test' project
-//
-
-#ifdef __OBJC__
-    #import <Cocoa/Cocoa.h>
-#endif
diff --git a/extras/package/macosx/Framework/Examples/FlashVideoDownloader/GradientBackgroundView.h b/extras/package/macosx/Framework/Examples/FlashVideoDownloader/GradientBackgroundView.h
deleted file mode 100644 (file)
index 0df4e0c..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-//  GradientBackgroundView.h
-//  iPodConverter
-//
-//  Created by Pierre d'Herbemont on 1/12/08.
-//  Copyright 2008 __MyCompanyName__. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-
-
-@interface GradientBackgroundView : NSImageView {
-
-}
-
-@end
diff --git a/extras/package/macosx/Framework/Examples/FlashVideoDownloader/GradientBackgroundView.m b/extras/package/macosx/Framework/Examples/FlashVideoDownloader/GradientBackgroundView.m
deleted file mode 100644 (file)
index afe2fbf..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-//  GradientBackgroundView.m
-//  iPodConverter
-//
-//  Created by Pierre d'Herbemont on 1/12/08.
-//  Copyright 2008 __MyCompanyName__. All rights reserved.
-//
-
-#import "GradientBackgroundView.h"
-
-/**********************************************************
- * Why not drawing something nice?
- */
-
-@implementation GradientBackgroundView
-- (void)awakeFromNib
-{
-    /* Buggy nib files... Force us to be on the back of the view hierarchy */
-    NSView * superView;
-    [self retain];
-    superView = [self superview];
-    [self removeFromSuperview];
-    [superView addSubview:self positioned: NSWindowBelow relativeTo:nil];
-}
-- (void)drawRect:(NSRect)rect
-{
-    
-    NSColor * topGradient = [NSColor colorWithCalibratedWhite:.12f alpha:1.0];
-    NSColor * bottomGradient   = [NSColor colorWithCalibratedWhite:0.55f alpha:0.9];
-       NSGradient * gradient = [[NSGradient alloc] initWithColorsAndLocations:bottomGradient, 0.f, bottomGradient, 0.1f, topGradient, 1.f, nil];
-    [gradient drawInRect:self.bounds angle:90.0];
-    [super drawRect:rect];
-}
-@end
diff --git a/extras/package/macosx/Framework/Examples/FlashVideoDownloader/Info.plist b/extras/package/macosx/Framework/Examples/FlashVideoDownloader/Info.plist
deleted file mode 100644 (file)
index e6cf83b..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>CFBundleDevelopmentRegion</key>
-       <string>English</string>
-       <key>CFBundleExecutable</key>
-       <string>Flash Video Downloader</string>
-       <key>CFBundleIconFile</key>
-       <string></string>
-       <key>CFBundleIdentifier</key>
-       <string>org.videolan.flashvideodownloader</string>
-       <key>CFBundleInfoDictionaryVersion</key>
-       <string>6.0</string>
-       <key>CFBundleName</key>
-       <string>Flash Video Downloader</string>
-       <key>CFBundlePackageType</key>
-       <string>APPL</string>
-       <key>CFBundleSignature</key>
-       <string>????</string>
-       <key>CFBundleVersion</key>
-       <string>1.0</string>
-       <key>NSMainNibFile</key>
-       <string>MainMenu</string>
-       <key>NSPrincipalClass</key>
-       <string>NSApplication</string>
-</dict>
-</plist>
diff --git a/extras/package/macosx/Framework/Examples/FlashVideoDownloader/main.m b/extras/package/macosx/Framework/Examples/FlashVideoDownloader/main.m
deleted file mode 100644 (file)
index da3a4ca..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-//  main.m
-//  test
-//
-//  Created by Pierre d'Herbemont on 13/04/07.
-//  Copyright __MyCompanyName__ 2007. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-#import <VLCKit/VLCKit.h>
-#include <stdio.h>
-
-int main(int argc, char *argv[])
-{
-    return NSApplicationMain(argc, (const char **) argv);
-}
diff --git a/extras/package/macosx/Framework/Examples/iPodConverter/Controller.h b/extras/package/macosx/Framework/Examples/iPodConverter/Controller.h
deleted file mode 100644 (file)
index 15449e2..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Controller */
-
-#import <Cocoa/Cocoa.h>
-#import <VLCKit/VLCKit.h>
-#import <VLCKit/VLCMediaPlayer.h>
-
-@interface Controller : NSObject
-{
-    IBOutlet NSView * conversionView;
-    IBOutlet NSWindow * window;
-    IBOutlet NSButton * openConvertedFileButton;
-
-    NSNumber * selectedStreamOutput;
-
-    VLCMedia * media;
-    VLCStreamSession * streamSession;
-}
-
-- (void)awakeFromNib;
-
-@property (retain) VLCMedia * media;
-@property (retain) VLCStreamSession * streamSession;
-@property (assign) NSNumber * selectedStreamOutput;
-@property (retain,readonly) NSString * outputFilePath;
-
-- (IBAction)convert:(id)sender;
-- (IBAction)openConvertedFile:(id)sender;
-- (IBAction)openConvertedEnclosingFolder:(id)sender;
-@end
diff --git a/extras/package/macosx/Framework/Examples/iPodConverter/Controller.m b/extras/package/macosx/Framework/Examples/iPodConverter/Controller.m
deleted file mode 100644 (file)
index 2826762..0000000
+++ /dev/null
@@ -1,152 +0,0 @@
-#import "Controller.h"
-
-
-/**********************************************************
- * First off, some value transformer to easily play with
- * bindings
- */
-@interface VLCFloat10000FoldTransformer : NSObject
-@end
-
-@implementation VLCFloat10000FoldTransformer
-
-+ (Class)transformedValueClass
-{
-    return [NSNumber class];
-}
-
-+ (BOOL)allowsReverseTransformation
-{
-    return YES;
-}
-
-- (id)transformedValue:(id)value
-{
-    if( !value ) return nil;
-    if(![value respondsToSelector: @selector(floatValue)])
-    {
-        [NSException raise: NSInternalInconsistencyException
-                    format: @"Value (%@) does not respond to -floatValue.",
-        [value class]];
-        return nil;
-    }
-    return [NSNumber numberWithFloat: [value floatValue]*10000.];
-}
-
-- (id)reverseTransformedValue:(id)value
-{
-    if( !value ) return nil;
-    if(![value respondsToSelector: @selector(floatValue)])
-    {
-        [NSException raise: NSInternalInconsistencyException
-                    format: @"Value (%@) does not respond to -floatValue.",
-        [value class]];
-        return nil;
-    }
-    return [NSNumber numberWithFloat: [value floatValue]/10000.];
-}
-@end
-
-
-/**********************************************************
- * @implementation Controller
- */
-
-@implementation Controller
-- (id)init
-{
-    if(self = [super init])
-    {
-        VLCFloat10000FoldTransformer *float100fold;
-        float100fold = [[[VLCFloat10000FoldTransformer alloc] init] autorelease];
-        [NSValueTransformer setValueTransformer:(id)float100fold forName:@"Float10000FoldTransformer"];
-        self.media = nil;
-        self.streamSession = nil;
-        selectedStreamOutput = [[NSNumber alloc] initWithInt:0];
-    }
-    return self;
-}
-
-@synthesize streamSession;
-@synthesize selectedStreamOutput;
-
-- (void)awakeFromNib
-{
-    [window setShowsResizeIndicator:NO];
-    [NSApp setDelegate: self];
-}
-
-- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
-{
-    [VLCLibrary sharedLibrary];
-}
-
-- (VLCMedia *)media
-{
-    return media;
-}
-
-- (void)setMedia:(VLCMedia *)newMedia
-{
-    [media release];
-    media = [newMedia retain];
-    NSRect newFrame = [window frameRectForContentRect:[conversionView frame]];
-    [[window animator] setFrame:NSMakeRect([window frame].origin.x, [window frame].origin.y+NSHeight([window frame])-NSHeight(newFrame), NSWidth(newFrame), NSHeight(newFrame)) display:YES];
-    [[window animator] setContentView:conversionView];
-    [window setMinSize:newFrame.size];
-    [window setMaxSize:NSMakeSize(10000., NSHeight(newFrame))];
-    [window setShowsResizeIndicator:YES];
-}
-
-+ (NSSet *)keyPathsForValuesAffectingOutputFilePath
-{
-    return [NSSet setWithObjects:@"media.metaDictionary.title", nil];
-}
-- (NSString *)outputFilePath
-{
-    return [NSString stringWithFormat:[@"~/Movies/iPod Converted/%@.mp4" stringByExpandingTildeInPath],
-                            [[self.media metaDictionary] objectForKey:@"title"]];
-}
-
-- (IBAction)convert:(id)sender
-{
-    self.streamSession = [VLCStreamSession streamSession];
-    if([selectedStreamOutput intValue] == 0)
-    {
-        [self.streamSession setStreamOutput:
-                                    [VLCStreamOutput ipodStreamOutputWithFilePath:
-                                        [self outputFilePath]
-                                    ]];
-    }
-    else
-    {
-        /* This doesn't really is useful for the iPod/iPhone...
-         * But one day we'll figure that out */
-        NSRunAlertPanelRelativeToWindow(@"Warning", @"We can't really stream to the iPod/iPhone for now...\n\nSo we're just streaming using the RTP protocol, and annoucing it via SAP.\n\n(Launch the SAP VLC service discovery module to see it).", @"OK", nil, nil, window);
-        [self.streamSession setStreamOutput:
-                                    [VLCStreamOutput rtpBroadcastStreamOutput]];
-    }
-
-
-    NSLog(@"Using %@", self.streamSession.streamOutput );
-
-    [self.streamSession setMedia:self.media];
-    [self.streamSession startStreaming];
-
-    [openConvertedFileButton setImage:[[NSWorkspace sharedWorkspace] iconForFile:[self outputFilePath]]];
-}
-
-- (IBAction)openConvertedFile:(id)sender
-{
-    [[NSWorkspace sharedWorkspace] openFile:[self outputFilePath]];
-}
-- (IBAction)openConvertedEnclosingFolder:(id)sender
-{
-    [[NSWorkspace sharedWorkspace] openFile:[[self outputFilePath] stringByDeletingLastPathComponent]];
-
-}
-@end
diff --git a/extras/package/macosx/Framework/Examples/iPodConverter/English.lproj/InfoPlist.strings b/extras/package/macosx/Framework/Examples/iPodConverter/English.lproj/InfoPlist.strings
deleted file mode 100644 (file)
index 997688e..0000000
Binary files a/extras/package/macosx/Framework/Examples/iPodConverter/English.lproj/InfoPlist.strings and /dev/null differ
diff --git a/extras/package/macosx/Framework/Examples/iPodConverter/English.lproj/MainMenu.nib/classes.nib b/extras/package/macosx/Framework/Examples/iPodConverter/English.lproj/MainMenu.nib/classes.nib
deleted file mode 100644 (file)
index c053164..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>IBClasses</key>
-       <array>
-               <dict>
-                       <key>CLASS</key>
-                       <string>GradientBackgroundView</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>SUPERCLASS</key>
-                       <string>NSImageView</string>
-               </dict>
-               <dict>
-                       <key>CLASS</key>
-                       <string>FirstResponder</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>SUPERCLASS</key>
-                       <string>NSObject</string>
-               </dict>
-               <dict>
-                       <key>ACTIONS</key>
-                       <dict>
-                               <key>convert</key>
-                               <string>id</string>
-                               <key>openConvertedEnclosingFolder</key>
-                               <string>id</string>
-                               <key>openConvertedFile</key>
-                               <string>id</string>
-                       </dict>
-                       <key>CLASS</key>
-                       <string>Controller</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>OUTLETS</key>
-                       <dict>
-                               <key>conversionView</key>
-                               <string>NSView</string>
-                               <key>openConvertedFileButton</key>
-                               <string>NSButton</string>
-                               <key>window</key>
-                               <string>NSWindow</string>
-                       </dict>
-                       <key>SUPERCLASS</key>
-                       <string>NSObject</string>
-               </dict>
-               <dict>
-                       <key>CLASS</key>
-                       <string>MovieReceiver</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>OUTLETS</key>
-                       <dict>
-                               <key>controller</key>
-                               <string>Controller</string>
-                       </dict>
-                       <key>SUPERCLASS</key>
-                       <string>NSView</string>
-               </dict>
-       </array>
-       <key>IBVersion</key>
-       <string>1</string>
-</dict>
-</plist>
diff --git a/extras/package/macosx/Framework/Examples/iPodConverter/English.lproj/MainMenu.nib/info.nib b/extras/package/macosx/Framework/Examples/iPodConverter/English.lproj/MainMenu.nib/info.nib
deleted file mode 100644 (file)
index f887aaf..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>IBFramework Version</key>
-       <string>629</string>
-       <key>IBLastKnownRelativeProjectPath</key>
-       <string>../../iPodConverter.xcodeproj</string>
-       <key>IBOldestOS</key>
-       <integer>5</integer>
-       <key>IBOpenObjects</key>
-       <array>
-               <integer>317</integer>
-       </array>
-       <key>IBSystem Version</key>
-       <string>9B18</string>
-       <key>targetFramework</key>
-       <string>IBCocoaFramework</string>
-</dict>
-</plist>
diff --git a/extras/package/macosx/Framework/Examples/iPodConverter/English.lproj/MainMenu.nib/keyedobjects.nib b/extras/package/macosx/Framework/Examples/iPodConverter/English.lproj/MainMenu.nib/keyedobjects.nib
deleted file mode 100644 (file)
index f6fb976..0000000
Binary files a/extras/package/macosx/Framework/Examples/iPodConverter/English.lproj/MainMenu.nib/keyedobjects.nib and /dev/null differ
diff --git a/extras/package/macosx/Framework/Examples/iPodConverter/GradientBackgroundView.h b/extras/package/macosx/Framework/Examples/iPodConverter/GradientBackgroundView.h
deleted file mode 100644 (file)
index 0df4e0c..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-//  GradientBackgroundView.h
-//  iPodConverter
-//
-//  Created by Pierre d'Herbemont on 1/12/08.
-//  Copyright 2008 __MyCompanyName__. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-
-
-@interface GradientBackgroundView : NSImageView {
-
-}
-
-@end
diff --git a/extras/package/macosx/Framework/Examples/iPodConverter/GradientBackgroundView.m b/extras/package/macosx/Framework/Examples/iPodConverter/GradientBackgroundView.m
deleted file mode 100644 (file)
index afe2fbf..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-//  GradientBackgroundView.m
-//  iPodConverter
-//
-//  Created by Pierre d'Herbemont on 1/12/08.
-//  Copyright 2008 __MyCompanyName__. All rights reserved.
-//
-
-#import "GradientBackgroundView.h"
-
-/**********************************************************
- * Why not drawing something nice?
- */
-
-@implementation GradientBackgroundView
-- (void)awakeFromNib
-{
-    /* Buggy nib files... Force us to be on the back of the view hierarchy */
-    NSView * superView;
-    [self retain];
-    superView = [self superview];
-    [self removeFromSuperview];
-    [superView addSubview:self positioned: NSWindowBelow relativeTo:nil];
-}
-- (void)drawRect:(NSRect)rect
-{
-    
-    NSColor * topGradient = [NSColor colorWithCalibratedWhite:.12f alpha:1.0];
-    NSColor * bottomGradient   = [NSColor colorWithCalibratedWhite:0.55f alpha:0.9];
-       NSGradient * gradient = [[NSGradient alloc] initWithColorsAndLocations:bottomGradient, 0.f, bottomGradient, 0.1f, topGradient, 1.f, nil];
-    [gradient drawInRect:self.bounds angle:90.0];
-    [super drawRect:rect];
-}
-@end
diff --git a/extras/package/macosx/Framework/Examples/iPodConverter/Info.plist b/extras/package/macosx/Framework/Examples/iPodConverter/Info.plist
deleted file mode 100644 (file)
index ae2b7e5..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>CFBundleDevelopmentRegion</key>
-       <string>English</string>
-       <key>CFBundleExecutable</key>
-       <string>iPodConverter</string>
-       <key>CFBundleIconFile</key>
-       <string></string>
-       <key>CFBundleIdentifier</key>
-       <string>org.videolan.ipodconverter</string>
-       <key>CFBundleInfoDictionaryVersion</key>
-       <string>6.0</string>
-       <key>CFBundleName</key>
-       <string>${PRODUCT_NAME}</string>
-       <key>CFBundlePackageType</key>
-       <string>APPL</string>
-       <key>CFBundleSignature</key>
-       <string>????</string>
-       <key>CFBundleVersion</key>
-       <string>1.0</string>
-       <key>NSMainNibFile</key>
-       <string>MainMenu</string>
-       <key>NSPrincipalClass</key>
-       <string>NSApplication</string>
-</dict>
-</plist>
diff --git a/extras/package/macosx/Framework/Examples/iPodConverter/MovieReceiver.h b/extras/package/macosx/Framework/Examples/iPodConverter/MovieReceiver.h
deleted file mode 100644 (file)
index d91476a..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-//  MovieReceiver.h
-//  iPodConverter
-//
-//  Created by Pierre d'Herbemont on 1/12/08.
-//  Copyright 2008 __MyCompanyName__. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-#import "Controller.h"
-
-@interface MovieReceiver : NSView {
-    IBOutlet Controller * controller;
-}
-
-@end
diff --git a/extras/package/macosx/Framework/Examples/iPodConverter/MovieReceiver.m b/extras/package/macosx/Framework/Examples/iPodConverter/MovieReceiver.m
deleted file mode 100644 (file)
index b791fd4..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-//  MovieReceiver.m
-//  iPodConverter
-//
-//  Created by Pierre d'Herbemont on 1/12/08.
-//  Copyright 2008 __MyCompanyName__. All rights reserved.
-//
-
-#import "MovieReceiver.h"
-
-/**********************************************************
- * This handles drag-and-drop in the main window
- */
-
-@implementation MovieReceiver
-- (void)awakeFromNib
-{
-    [self registerForDraggedTypes:[NSArray arrayWithObjects:NSFilenamesPboardType, NSURLPboardType, nil]];
-
-}
-- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
-{
-    return NSDragOperationGeneric;
-}
-- (NSDragOperation)performDragOperation:(id <NSDraggingInfo>)sender
-{
-    NSPasteboard *pboard = [sender draggingPasteboard];
-
-    if ( [[pboard types] containsObject:NSFilenamesPboardType] )
-    {
-        NSArray *files = [pboard propertyListForType:NSFilenamesPboardType];
-        for( NSString * filename in files )
-        {
-            [controller setMedia:[VLCMedia mediaWithPath:filename]];
-        }
-    }
-    return YES;
-
-    return NSDragOperationGeneric;
-}
-@end
diff --git a/extras/package/macosx/Framework/Examples/iPodConverter/iPodConverter.xcodeproj/project.pbxproj b/extras/package/macosx/Framework/Examples/iPodConverter/iPodConverter.xcodeproj/project.pbxproj
deleted file mode 100644 (file)
index 98a1c30..0000000
+++ /dev/null
@@ -1,381 +0,0 @@
-// !$*UTF8*$!
-{
-       archiveVersion = 1;
-       classes = {
-       };
-       objectVersion = 42;
-       objects = {
-
-/* Begin PBXBuildFile section */
-               632A105C0D39148A00AFC99B /* VLCKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 632A0F710D38F71A00AFC99B /* VLCKit.framework */; };
-               632A121B0D3945EA00AFC99B /* MovieReceiver.m in Sources */ = {isa = PBXBuildFile; fileRef = 632A121A0D3945EA00AFC99B /* MovieReceiver.m */; };
-               632A122C0D3947D900AFC99B /* GradientBackgroundView.m in Sources */ = {isa = PBXBuildFile; fileRef = 632A122B0D3947D900AFC99B /* GradientBackgroundView.m */; };
-               6333027B0BD24CDB00193D7D /* Controller.m in Sources */ = {isa = PBXBuildFile; fileRef = 633302790BD24CDB00193D7D /* Controller.m */; };
-               8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 29B97318FDCFA39411CA2CEA /* MainMenu.nib */; };
-               8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
-               8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
-               8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXContainerItemProxy section */
-               632A0F700D38F71A00AFC99B /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 632A0F680D38F71A00AFC99B /* VLCKit.xcodeproj */;
-                       proxyType = 2;
-                       remoteGlobalIDString = 8DC2EF5B0486A6940098B216;
-                       remoteInfo = VLCKit;
-               };
-               632A0F780D38F72F00AFC99B /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 632A0F680D38F71A00AFC99B /* VLCKit.xcodeproj */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
-                       remoteInfo = VLCKit;
-               };
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXFileReference section */
-               089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-               1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
-               13E42FB307B3F0F600E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
-               29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-               29B97319FDCFA39411CA2CEA /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/MainMenu.nib; sourceTree = "<group>"; };
-               29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
-               29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
-               32CA4F630368D1EE00C91783 /* test_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = test_Prefix.pch; sourceTree = "<group>"; };
-               632A0F680D38F71A00AFC99B /* VLCKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = VLCKit.xcodeproj; path = ../../VLCKit.xcodeproj; sourceTree = SOURCE_ROOT; };
-               632A12190D3945EA00AFC99B /* MovieReceiver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MovieReceiver.h; sourceTree = "<group>"; };
-               632A121A0D3945EA00AFC99B /* MovieReceiver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MovieReceiver.m; sourceTree = "<group>"; };
-               632A122A0D3947D900AFC99B /* GradientBackgroundView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GradientBackgroundView.h; sourceTree = "<group>"; };
-               632A122B0D3947D900AFC99B /* GradientBackgroundView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GradientBackgroundView.m; sourceTree = "<group>"; };
-               633302780BD24CDB00193D7D /* Controller.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Controller.h; sourceTree = "<group>"; };
-               633302790BD24CDB00193D7D /* Controller.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = Controller.m; sourceTree = "<group>"; };
-               636836780D3999E5003A1400 /* iPodConverter.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iPodConverter.app; sourceTree = BUILT_PRODUCTS_DIR; };
-               8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-               8D11072E0486CEB800E47090 /* Frameworks */ = {
-                       isa = PBXFrameworksBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               632A105C0D39148A00AFC99B /* VLCKit.framework in Frameworks */,
-                               8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-               080E96DDFE201D6D7F000001 /* Classes */ = {
-                       isa = PBXGroup;
-                       children = (
-                               632A122A0D3947D900AFC99B /* GradientBackgroundView.h */,
-                               632A122B0D3947D900AFC99B /* GradientBackgroundView.m */,
-                               632A12190D3945EA00AFC99B /* MovieReceiver.h */,
-                               632A121A0D3945EA00AFC99B /* MovieReceiver.m */,
-                               633302780BD24CDB00193D7D /* Controller.h */,
-                               633302790BD24CDB00193D7D /* Controller.m */,
-                       );
-                       name = Classes;
-                       sourceTree = "<group>";
-               };
-               1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
-                       isa = PBXGroup;
-                       children = (
-                               1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
-                       );
-                       name = "Linked Frameworks";
-                       sourceTree = "<group>";
-               };
-               1058C7A2FEA54F0111CA2CBB /* Other Frameworks */ = {
-                       isa = PBXGroup;
-                       children = (
-                               29B97324FDCFA39411CA2CEA /* AppKit.framework */,
-                               13E42FB307B3F0F600E4EEF1 /* CoreData.framework */,
-                               29B97325FDCFA39411CA2CEA /* Foundation.framework */,
-                       );
-                       name = "Other Frameworks";
-                       sourceTree = "<group>";
-               };
-               19C28FACFE9D520D11CA2CBB /* Products */ = {
-                       isa = PBXGroup;
-                       children = (
-                               636836780D3999E5003A1400 /* iPodConverter.app */,
-                       );
-                       name = Products;
-                       sourceTree = "<group>";
-               };
-               29B97314FDCFA39411CA2CEA /* test */ = {
-                       isa = PBXGroup;
-                       children = (
-                               632A0F680D38F71A00AFC99B /* VLCKit.xcodeproj */,
-                               080E96DDFE201D6D7F000001 /* Classes */,
-                               29B97315FDCFA39411CA2CEA /* Other Sources */,
-                               29B97317FDCFA39411CA2CEA /* Resources */,
-                               29B97323FDCFA39411CA2CEA /* Frameworks */,
-                               19C28FACFE9D520D11CA2CBB /* Products */,
-                       );
-                       name = test;
-                       sourceTree = "<group>";
-               };
-               29B97315FDCFA39411CA2CEA /* Other Sources */ = {
-                       isa = PBXGroup;
-                       children = (
-                               32CA4F630368D1EE00C91783 /* test_Prefix.pch */,
-                               29B97316FDCFA39411CA2CEA /* main.m */,
-                       );
-                       name = "Other Sources";
-                       sourceTree = "<group>";
-               };
-               29B97317FDCFA39411CA2CEA /* Resources */ = {
-                       isa = PBXGroup;
-                       children = (
-                               8D1107310486CEB800E47090 /* Info.plist */,
-                               089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
-                               29B97318FDCFA39411CA2CEA /* MainMenu.nib */,
-                       );
-                       name = Resources;
-                       sourceTree = "<group>";
-               };
-               29B97323FDCFA39411CA2CEA /* Frameworks */ = {
-                       isa = PBXGroup;
-                       children = (
-                               1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
-                               1058C7A2FEA54F0111CA2CBB /* Other Frameworks */,
-                       );
-                       name = Frameworks;
-                       sourceTree = "<group>";
-               };
-               632A0F690D38F71A00AFC99B /* Products */ = {
-                       isa = PBXGroup;
-                       children = (
-                               632A0F710D38F71A00AFC99B /* VLCKit.framework */,
-                       );
-                       name = Products;
-                       sourceTree = "<group>";
-               };
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-               8D1107260486CEB800E47090 /* iPodConverter */ = {
-                       isa = PBXNativeTarget;
-                       buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "iPodConverter" */;
-                       buildPhases = (
-                               636836C00D399CF0003A1400 /* ShellScript */,
-                               8D1107290486CEB800E47090 /* Resources */,
-                               8D11072C0486CEB800E47090 /* Sources */,
-                               8D11072E0486CEB800E47090 /* Frameworks */,
-                       );
-                       buildRules = (
-                       );
-                       dependencies = (
-                               632A0F790D38F72F00AFC99B /* PBXTargetDependency */,
-                       );
-                       name = iPodConverter;
-                       productInstallPath = "$(HOME)/Applications";
-                       productName = test;
-                       productReference = 636836780D3999E5003A1400 /* iPodConverter.app */;
-                       productType = "com.apple.product-type.application";
-               };
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-               29B97313FDCFA39411CA2CEA /* Project object */ = {
-                       isa = PBXProject;
-                       buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "iPodConverter" */;
-                       compatibilityVersion = "Xcode 2.4";
-                       hasScannedForEncodings = 1;
-                       mainGroup = 29B97314FDCFA39411CA2CEA /* test */;
-                       projectDirPath = "";
-                       projectReferences = (
-                               {
-                                       ProductGroup = 632A0F690D38F71A00AFC99B /* Products */;
-                                       ProjectRef = 632A0F680D38F71A00AFC99B /* VLCKit.xcodeproj */;
-                               },
-                       );
-                       projectRoot = "";
-                       targets = (
-                               8D1107260486CEB800E47090 /* iPodConverter */,
-                       );
-               };
-/* End PBXProject section */
-
-/* Begin PBXReferenceProxy section */
-               632A0F710D38F71A00AFC99B /* VLCKit.framework */ = {
-                       isa = PBXReferenceProxy;
-                       fileType = wrapper.framework;
-                       path = VLCKit.framework;
-                       remoteRef = 632A0F700D38F71A00AFC99B /* PBXContainerItemProxy */;
-                       sourceTree = BUILT_PRODUCTS_DIR;
-               };
-/* End PBXReferenceProxy section */
-
-/* Begin PBXResourcesBuildPhase section */
-               8D1107290486CEB800E47090 /* Resources */ = {
-                       isa = PBXResourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */,
-                               8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXShellScriptBuildPhase section */
-               636836C00D399CF0003A1400 /* ShellScript */ = {
-                       isa = PBXShellScriptBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                       );
-                       inputPaths = (
-                       );
-                       outputPaths = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-                       shellPath = /bin/sh;
-                       shellScript = "if test \"$SYMROOT\" == \"$PROJECT_DIR/build\"\nthen\n\tVLCFRAMEWORK=\"$SRCROOT/../../build/$CONFIGURATION/VLCKit.framework\"\nelse\n\tVLCFRAMEWORK=\"$SYMROOT/$CONFIGURATION/VLCKit.framework\"\nfi\nmkdir -p $BUILT_PRODUCTS_DIR/$FRAMEWORKS_FOLDER_PATH\n/Developer/Library/PrivateFrameworks/DevToolsCore.framework/Resources/pbxcp -exclude .DS_Store -exclude CVS -exclude .svn -resolve-src-symlinks $VLCFRAMEWORK $BUILT_PRODUCTS_DIR/$FRAMEWORKS_FOLDER_PATH";
-                       showEnvVarsInLog = 0;
-               };
-/* End PBXShellScriptBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-               8D11072C0486CEB800E47090 /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               8D11072D0486CEB800E47090 /* main.m in Sources */,
-                               6333027B0BD24CDB00193D7D /* Controller.m in Sources */,
-                               632A121B0D3945EA00AFC99B /* MovieReceiver.m in Sources */,
-                               632A122C0D3947D900AFC99B /* GradientBackgroundView.m in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXTargetDependency section */
-               632A0F790D38F72F00AFC99B /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       name = VLCKit;
-                       targetProxy = 632A0F780D38F72F00AFC99B /* PBXContainerItemProxy */;
-               };
-/* End PBXTargetDependency section */
-
-/* Begin PBXVariantGroup section */
-               089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = {
-                       isa = PBXVariantGroup;
-                       children = (
-                               089C165DFE840E0CC02AAC07 /* English */,
-                       );
-                       name = InfoPlist.strings;
-                       sourceTree = "<group>";
-               };
-               29B97318FDCFA39411CA2CEA /* MainMenu.nib */ = {
-                       isa = PBXVariantGroup;
-                       children = (
-                               29B97319FDCFA39411CA2CEA /* English */,
-                       );
-                       name = MainMenu.nib;
-                       sourceTree = "<group>";
-               };
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
-               C01FCF4B08A954540054247B /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               COPY_PHASE_STRIP = NO;
-                               FRAMEWORK_SEARCH_PATHS = (
-                                       "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
-                                       "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
-                               );
-                               FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../build/Release\"";
-                               FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../build/Debug\"";
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = 0;
-                               INFOPLIST_FILE = Info.plist;
-                               INSTALL_PATH = "$(HOME)/Applications";
-                               OTHER_LDFLAGS = (
-                                       "$(LD_FLAGS_LIBINTL)",
-                                       "$(LD_FLAGS_LIBVLC)",
-                                       "$(LD_FLAGS_LIBVLC_CONTROL)",
-                               );
-                               PRODUCT_NAME = iPodConverter;
-                               VLC_FRAMEWORK = "$(TARGET_BUILD_DIR)/VLC.framework";
-                               WRAPPER_EXTENSION = app;
-                               ZERO_LINK = YES;
-                       };
-                       name = Debug;
-               };
-               C01FCF4C08A954540054247B /* Release */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               ARCHS = "$(NATIVE_ARCH)";
-                               FRAMEWORK_SEARCH_PATHS = (
-                                       "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
-                                       "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
-                               );
-                               FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../build/Release\"";
-                               FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../build/Debug\"";
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-                               GCC_MODEL_TUNING = G5;
-                               INFOPLIST_FILE = Info.plist;
-                               INSTALL_PATH = "$(HOME)/Applications";
-                               OTHER_LDFLAGS = (
-                                       "$(LD_FLAGS_LIBINTL)",
-                                       "$(LD_FLAGS_LIBVLC)",
-                                       "$(LD_FLAGS_LIBVLC_CONTROL)",
-                               );
-                               PRODUCT_NAME = iPodConverter;
-                               VLC_FRAMEWORK = "$(TARGET_BUILD_DIR)/VLC.framework";
-                               WRAPPER_EXTENSION = app;
-                       };
-                       name = Release;
-               };
-               C01FCF4F08A954540054247B /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES;
-                               GCC_WARN_UNUSED_VARIABLE = YES;
-                               PREBINDING = NO;
-                       };
-                       name = Debug;
-               };
-               C01FCF5008A954540054247B /* Release */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               ARCHS = "$(NATIVE_ARCH)";
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES;
-                               GCC_WARN_UNUSED_VARIABLE = YES;
-                               PREBINDING = NO;
-                       };
-                       name = Release;
-               };
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-               C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "iPodConverter" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               C01FCF4B08A954540054247B /* Debug */,
-                               C01FCF4C08A954540054247B /* Release */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Debug;
-               };
-               C01FCF4E08A954540054247B /* Build configuration list for PBXProject "iPodConverter" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               C01FCF4F08A954540054247B /* Debug */,
-                               C01FCF5008A954540054247B /* Release */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Debug;
-               };
-/* End XCConfigurationList section */
-       };
-       rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
-}
diff --git a/extras/package/macosx/Framework/Examples/iPodConverter/iPodConverter_Prefix.pch b/extras/package/macosx/Framework/Examples/iPodConverter/iPodConverter_Prefix.pch
deleted file mode 100644 (file)
index 0b05af7..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-//
-// Prefix header for all source files of the 'test' target in the 'test' project
-//
-
-#ifdef __OBJC__
-    #import <Cocoa/Cocoa.h>
-#endif
diff --git a/extras/package/macosx/Framework/Examples/iPodConverter/main.m b/extras/package/macosx/Framework/Examples/iPodConverter/main.m
deleted file mode 100644 (file)
index da3a4ca..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-//  main.m
-//  test
-//
-//  Created by Pierre d'Herbemont on 13/04/07.
-//  Copyright __MyCompanyName__ 2007. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-#import <VLCKit/VLCKit.h>
-#include <stdio.h>
-
-int main(int argc, char *argv[])
-{
-    return NSApplicationMain(argc, (const char **) argv);
-}
diff --git a/extras/package/macosx/Framework/Examples/test/Controller.h b/extras/package/macosx/Framework/Examples/test/Controller.h
deleted file mode 100644 (file)
index b66bb5f..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Controller */
-
-#import <Cocoa/Cocoa.h>
-#import <VLC/VLC.h>
-#import <VLC/VLCMediaPlayer.h>
-
-@interface Controller : NSObject
-{
-    IBOutlet id window;
-    IBOutlet id playlistOutline;
-    IBOutlet id videoHolderView;
-
-    VLCVideoView * videoView;
-    VLCMediaList *playlist;
-    VLCMediaPlayer *player;
-    int mediaIndex;
-}
-- (void)awakeFromNib;
-
-- (void)setMediaIndex:(int)value;
-- (void)play:(id)sender;
-- (void)pause:(id)sender;
-
-@end
diff --git a/extras/package/macosx/Framework/Examples/test/Controller.m b/extras/package/macosx/Framework/Examples/test/Controller.m
deleted file mode 100644 (file)
index 2c669a8..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
-#import "Controller.h"
-
-static void *sleepForMe(void)
-{
-    while (1) sleep(60);
-}
-
-@implementation Controller
-
-- (void)awakeFromNib
-{
-//    atexit((void*)sleepForMe);    // Only used for memory leak debugging
-
-    [NSApp setDelegate:self];
-
-    // Allocate a VLCVideoView instance and tell it what area to occupy.
-    NSRect rect = NSMakeRect(0, 0, 0, 0);
-    rect.size = [videoHolderView frame].size;
-    
-    videoView = [[VLCVideoView alloc] initWithFrame:rect];
-    [videoHolderView addSubview:videoView];
-    [videoView setAutoresizingMask: NSViewHeightSizable|NSViewWidthSizable];
-    videoView.fillScreen = YES;
-    
-    playlist = [[VLCMediaList alloc] init];
-    [playlist addObserver:self forKeyPath:@"media" options:NSKeyValueObservingOptionNew context:nil];
-    
-    player = [[VLCMediaPlayer alloc] initWithVideoView:videoView];
-    mediaIndex = -1;
-
-    [playlistOutline registerForDraggedTypes:[NSArray arrayWithObjects:NSFilenamesPboardType, NSURLPboardType, nil]];
-    [playlistOutline setDoubleAction:@selector(changeAndPlay:)];
-}
-
-- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
-{
-}
-
-- (void)applicationWillTerminate:(NSNotification *)aNotification
-{
-    [playlist removeObserver:self forKeyPath:@"media"];
-    
-    [player pause];
-    [player setMedia:nil];
-    [player release];
-    [playlist release];
-    [videoView release];
-}
-
-- (void)changeAndPlay:(id)sender
-{
-    if ([playlistOutline selectedRow] != mediaIndex)
-    {
-               [self setMediaIndex:[playlistOutline selectedRow]];
-               if (![player isPlaying])
-                       [player play];
-    }
-}
-
-- (void)setMediaIndex:(int)value
-{
-    if ([playlist count] <= 0)
-               return;
-    
-    if (value < 0)
-               value = 0;
-    if (value > [playlist count] - 1)
-               value = [playlist count] - 1;
-    
-    mediaIndex = value;
-    [player setMedia:[playlist mediaAtIndex:mediaIndex]];
-}
-
-- (void)play:(id)sender
-{
-    [self setMediaIndex:mediaIndex+1];
-    if (![player isPlaying])
-    {
-               NSLog(@"%@ length = %@", [playlist mediaAtIndex:mediaIndex], [[playlist mediaAtIndex:mediaIndex] lengthWaitUntilDate:[NSDate dateWithTimeIntervalSinceNow:60]]);
-               [player play];
-    }
-}
-
-- (void)pause:(id)sender
-{
-    NSLog(@"Sending pause message to media player...");
-    [player pause];
-}
-
-- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
-{
-    if ([keyPath isEqualToString:@"media"] && object == playlist) {
-        [playlistOutline reloadData];
-    }
-}
-
-// NSTableView Implementation
-- (int)numberOfRowsInTableView:(NSTableView *)tableView
-{
-    return [playlist count];
-}
-
-- (id)tableView:(NSTableView *)tableView objectValueForTableColumn:(NSTableColumn *)tableColumn
-                       row:(int)row
-{
-    return [(VLCMedia *)[playlist mediaAtIndex:row].metaDictionary valueForKey:VLCMetaInformationTitle];
-}
-
-- (NSDragOperation)tableView:(NSTableView*)tv validateDrop:(id <NSDraggingInfo>)info 
-                                proposedRow:(int)row proposedDropOperation:(NSTableViewDropOperation)op
-{
-    return NSDragOperationEvery; /* This is for now */
-}
-
-- (BOOL)tableView:(NSTableView *)aTableView acceptDrop:(id <NSDraggingInfo>)info
-                         row:(int)row dropOperation:(NSTableViewDropOperation)operation
-{
-    int i;
-    NSArray *droppedItems = [[info draggingPasteboard] propertyListForType:NSFilenamesPboardType];
-    
-    for (i = 0; i < [droppedItems count]; i++)
-    {
-        NSString * filename = [droppedItems objectAtIndex:i];
-               VLCMedia * media = [VLCMedia mediaWithURL:[NSURL fileURLWithPath:filename]];
-               [playlist addMedia:media];
-    }
-    return YES;
-}    
-
-@end
diff --git a/extras/package/macosx/Framework/Examples/test/English.lproj/InfoPlist.strings b/extras/package/macosx/Framework/Examples/test/English.lproj/InfoPlist.strings
deleted file mode 100644 (file)
index 997688e..0000000
Binary files a/extras/package/macosx/Framework/Examples/test/English.lproj/InfoPlist.strings and /dev/null differ
diff --git a/extras/package/macosx/Framework/Examples/test/English.lproj/MainMenu.nib/classes.nib b/extras/package/macosx/Framework/Examples/test/English.lproj/MainMenu.nib/classes.nib
deleted file mode 100644 (file)
index c17b45c..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    IBClasses = (
-        {
-            ACTIONS = {pause = id; play = id; }; 
-            CLASS = Controller; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {playlistOutline = id; videoHolderView = id; window = id; }; 
-            SUPERCLASS = NSObject; 
-        }, 
-        {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
-        {CLASS = NSSegmentedControl; LANGUAGE = ObjC; SUPERCLASS = NSControl; }
-    ); 
-    IBVersion = 1; 
-}
\ No newline at end of file
diff --git a/extras/package/macosx/Framework/Examples/test/English.lproj/MainMenu.nib/info.nib b/extras/package/macosx/Framework/Examples/test/English.lproj/MainMenu.nib/info.nib
deleted file mode 100644 (file)
index 2209443..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>IBDocumentLocation</key>
-       <string>111 87 356 240 0 0 1440 878 </string>
-       <key>IBEditorPositions</key>
-       <dict>
-               <key>29</key>
-               <string>108 299 338 44 0 0 1440 878 </string>
-       </dict>
-       <key>IBFramework Version</key>
-       <string>446.1</string>
-       <key>IBOpenObjects</key>
-       <array>
-               <integer>29</integer>
-               <integer>21</integer>
-       </array>
-       <key>IBSystem Version</key>
-       <string>8R2218</string>
-</dict>
-</plist>
diff --git a/extras/package/macosx/Framework/Examples/test/English.lproj/MainMenu.nib/keyedobjects.nib b/extras/package/macosx/Framework/Examples/test/English.lproj/MainMenu.nib/keyedobjects.nib
deleted file mode 100644 (file)
index f67f4f5..0000000
Binary files a/extras/package/macosx/Framework/Examples/test/English.lproj/MainMenu.nib/keyedobjects.nib and /dev/null differ
diff --git a/extras/package/macosx/Framework/Examples/test/Info.plist b/extras/package/macosx/Framework/Examples/test/Info.plist
deleted file mode 100644 (file)
index cf9cf81..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>CFBundleDevelopmentRegion</key>
-       <string>English</string>
-       <key>CFBundleExecutable</key>
-       <string>${EXECUTABLE_NAME}</string>
-       <key>CFBundleIconFile</key>
-       <string></string>
-       <key>CFBundleIdentifier</key>
-       <string>com.yourcompany.test</string>
-       <key>CFBundleInfoDictionaryVersion</key>
-       <string>6.0</string>
-       <key>CFBundleName</key>
-       <string>${PRODUCT_NAME}</string>
-       <key>CFBundlePackageType</key>
-       <string>APPL</string>
-       <key>CFBundleSignature</key>
-       <string>????</string>
-       <key>CFBundleVersion</key>
-       <string>1.0</string>
-       <key>NSMainNibFile</key>
-       <string>MainMenu</string>
-       <key>NSPrincipalClass</key>
-       <string>NSApplication</string>
-</dict>
-</plist>
diff --git a/extras/package/macosx/Framework/Examples/test/main.m b/extras/package/macosx/Framework/Examples/test/main.m
deleted file mode 100644 (file)
index 618131d..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-//  main.m
-//  test
-//
-//  Created by Pierre d'Herbemont on 13/04/07.
-//  Copyright __MyCompanyName__ 2007. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-#import <VLC/VLC.h>
-#include <stdio.h>
-
-int main(int argc, char *argv[])
-{
-    return NSApplicationMain(argc, (const char **) argv);
-}
diff --git a/extras/package/macosx/Framework/Examples/test/test.xcodeproj/project.pbxproj b/extras/package/macosx/Framework/Examples/test/test.xcodeproj/project.pbxproj
deleted file mode 100644 (file)
index 92ca560..0000000
+++ /dev/null
@@ -1,347 +0,0 @@
-// !$*UTF8*$!
-{
-       archiveVersion = 1;
-       classes = {
-       };
-       objectVersion = 42;
-       objects = {
-
-/* Begin PBXBuildFile section */
-               6333027B0BD24CDB00193D7D /* Controller.m in Sources */ = {isa = PBXBuildFile; fileRef = 633302790BD24CDB00193D7D /* Controller.m */; };
-               8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 29B97318FDCFA39411CA2CEA /* MainMenu.nib */; };
-               8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
-               8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
-               8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
-               EFD5522C0CC6DF380074CEE1 /* VLC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EFD5522B0CC6DF190074CEE1 /* VLC.framework */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXContainerItemProxy section */
-               EF00D30D0CC6E0AC00209802 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = EFD552230CC6DF190074CEE1 /* VLC.xcodeproj */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
-                       remoteInfo = VLC;
-               };
-               EFD5522A0CC6DF190074CEE1 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = EFD552230CC6DF190074CEE1 /* VLC.xcodeproj */;
-                       proxyType = 2;
-                       remoteGlobalIDString = 8DC2EF5B0486A6940098B216;
-                       remoteInfo = VLC;
-               };
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXFileReference section */
-               089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-               1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
-               13E42FB307B3F0F600E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
-               29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-               29B97319FDCFA39411CA2CEA /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/MainMenu.nib; sourceTree = "<group>"; };
-               29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
-               29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
-               32CA4F630368D1EE00C91783 /* test_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = test_Prefix.pch; sourceTree = "<group>"; };
-               633302780BD24CDB00193D7D /* Controller.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Controller.h; sourceTree = "<group>"; };
-               633302790BD24CDB00193D7D /* Controller.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = Controller.m; sourceTree = "<group>"; };
-               8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
-               8D1107320486CEB800E47090 /* test.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = test.app; sourceTree = BUILT_PRODUCTS_DIR; };
-               EFD552230CC6DF190074CEE1 /* VLC.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = VLC.xcodeproj; path = ../../VLC.xcodeproj; sourceTree = SOURCE_ROOT; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-               8D11072E0486CEB800E47090 /* Frameworks */ = {
-                       isa = PBXFrameworksBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               EFD5522C0CC6DF380074CEE1 /* VLC.framework in Frameworks */,
-                               8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-               080E96DDFE201D6D7F000001 /* Classes */ = {
-                       isa = PBXGroup;
-                       children = (
-                               633302780BD24CDB00193D7D /* Controller.h */,
-                               633302790BD24CDB00193D7D /* Controller.m */,
-                       );
-                       name = Classes;
-                       sourceTree = "<group>";
-               };
-               1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
-                       isa = PBXGroup;
-                       children = (
-                               EFD552230CC6DF190074CEE1 /* VLC.xcodeproj */,
-                               1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
-                       );
-                       name = "Linked Frameworks";
-                       sourceTree = "<group>";
-               };
-               1058C7A2FEA54F0111CA2CBB /* Other Frameworks */ = {
-                       isa = PBXGroup;
-                       children = (
-                               29B97324FDCFA39411CA2CEA /* AppKit.framework */,
-                               13E42FB307B3F0F600E4EEF1 /* CoreData.framework */,
-                               29B97325FDCFA39411CA2CEA /* Foundation.framework */,
-                       );
-                       name = "Other Frameworks";
-                       sourceTree = "<group>";
-               };
-               19C28FACFE9D520D11CA2CBB /* Products */ = {
-                       isa = PBXGroup;
-                       children = (
-                               8D1107320486CEB800E47090 /* test.app */,
-                       );
-                       name = Products;
-                       sourceTree = "<group>";
-               };
-               29B97314FDCFA39411CA2CEA /* test */ = {
-                       isa = PBXGroup;
-                       children = (
-                               080E96DDFE201D6D7F000001 /* Classes */,
-                               29B97315FDCFA39411CA2CEA /* Other Sources */,
-                               29B97317FDCFA39411CA2CEA /* Resources */,
-                               29B97323FDCFA39411CA2CEA /* Frameworks */,
-                               19C28FACFE9D520D11CA2CBB /* Products */,
-                       );
-                       name = test;
-                       sourceTree = "<group>";
-               };
-               29B97315FDCFA39411CA2CEA /* Other Sources */ = {
-                       isa = PBXGroup;
-                       children = (
-                               32CA4F630368D1EE00C91783 /* test_Prefix.pch */,
-                               29B97316FDCFA39411CA2CEA /* main.m */,
-                       );
-                       name = "Other Sources";
-                       sourceTree = "<group>";
-               };
-               29B97317FDCFA39411CA2CEA /* Resources */ = {
-                       isa = PBXGroup;
-                       children = (
-                               8D1107310486CEB800E47090 /* Info.plist */,
-                               089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
-                               29B97318FDCFA39411CA2CEA /* MainMenu.nib */,
-                       );
-                       name = Resources;
-                       sourceTree = "<group>";
-               };
-               29B97323FDCFA39411CA2CEA /* Frameworks */ = {
-                       isa = PBXGroup;
-                       children = (
-                               1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
-                               1058C7A2FEA54F0111CA2CBB /* Other Frameworks */,
-                       );
-                       name = Frameworks;
-                       sourceTree = "<group>";
-               };
-               EFD552240CC6DF190074CEE1 /* Products */ = {
-                       isa = PBXGroup;
-                       children = (
-                               EFD5522B0CC6DF190074CEE1 /* VLC.framework */,
-                       );
-                       name = Products;
-                       sourceTree = "<group>";
-               };
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-               8D1107260486CEB800E47090 /* test */ = {
-                       isa = PBXNativeTarget;
-                       buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "test" */;
-                       buildPhases = (
-                               8D1107290486CEB800E47090 /* Resources */,
-                               8D11072C0486CEB800E47090 /* Sources */,
-                               8D11072E0486CEB800E47090 /* Frameworks */,
-                       );
-                       buildRules = (
-                       );
-                       dependencies = (
-                               EF00D30E0CC6E0AC00209802 /* PBXTargetDependency */,
-                       );
-                       name = test;
-                       productInstallPath = "$(HOME)/Applications";
-                       productName = test;
-                       productReference = 8D1107320486CEB800E47090 /* test.app */;
-                       productType = "com.apple.product-type.application";
-               };
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-               29B97313FDCFA39411CA2CEA /* Project object */ = {
-                       isa = PBXProject;
-                       buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "test" */;
-                       compatibilityVersion = "Xcode 2.4";
-                       hasScannedForEncodings = 1;
-                       mainGroup = 29B97314FDCFA39411CA2CEA /* test */;
-                       projectDirPath = "";
-                       projectReferences = (
-                               {
-                                       ProductGroup = EFD552240CC6DF190074CEE1 /* Products */;
-                                       ProjectRef = EFD552230CC6DF190074CEE1 /* VLC.xcodeproj */;
-                               },
-                       );
-                       projectRoot = "";
-                       targets = (
-                               8D1107260486CEB800E47090 /* test */,
-                       );
-               };
-/* End PBXProject section */
-
-/* Begin PBXReferenceProxy section */
-               EFD5522B0CC6DF190074CEE1 /* VLC.framework */ = {
-                       isa = PBXReferenceProxy;
-                       fileType = wrapper.framework;
-                       path = VLC.framework;
-                       remoteRef = EFD5522A0CC6DF190074CEE1 /* PBXContainerItemProxy */;
-                       sourceTree = BUILT_PRODUCTS_DIR;
-               };
-/* End PBXReferenceProxy section */
-
-/* Begin PBXResourcesBuildPhase section */
-               8D1107290486CEB800E47090 /* Resources */ = {
-                       isa = PBXResourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */,
-                               8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-               8D11072C0486CEB800E47090 /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               8D11072D0486CEB800E47090 /* main.m in Sources */,
-                               6333027B0BD24CDB00193D7D /* Controller.m in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXTargetDependency section */
-               EF00D30E0CC6E0AC00209802 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       name = VLC;
-                       targetProxy = EF00D30D0CC6E0AC00209802 /* PBXContainerItemProxy */;
-               };
-/* End PBXTargetDependency section */
-
-/* Begin PBXVariantGroup section */
-               089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = {
-                       isa = PBXVariantGroup;
-                       children = (
-                               089C165DFE840E0CC02AAC07 /* English */,
-                       );
-                       name = InfoPlist.strings;
-                       sourceTree = "<group>";
-               };
-               29B97318FDCFA39411CA2CEA /* MainMenu.nib */ = {
-                       isa = PBXVariantGroup;
-                       children = (
-                               29B97319FDCFA39411CA2CEA /* English */,
-                       );
-                       name = MainMenu.nib;
-                       sourceTree = "<group>";
-               };
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
-               C01FCF4B08A954540054247B /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               COPY_PHASE_STRIP = NO;
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = 0;
-                               INFOPLIST_FILE = Info.plist;
-                               INSTALL_PATH = "$(HOME)/Applications";
-                               LD_FLAGS_LIBINTL = "-dylib_file @loader_path/../lib/vlc_libintl.dylib:$(VLC_FRAMEWORK)/lib/vlc_libintl.dylib";
-                               LD_FLAGS_LIBVLC = "-dylib_file @loader_path/lib/libvlc.dylib:$(VLC_FRAMEWORK)/lib/libvlc.dylib -dylib_file @loader_path/../lib/libvlc.dylib:$(VLC_FRAMEWORK)/lib/libvlc.dylib";
-                               LD_FLAGS_LIBVLC_CONTROL = "-dylib_file @loader_path/lib/libvlc-control.dylib:$(VLC_FRAMEWORK)/lib/libvlc-control.dylib";
-                               OTHER_LDFLAGS = (
-                                       "$(LD_FLAGS_LIBINTL)",
-                                       "$(LD_FLAGS_LIBVLC)",
-                                       "$(LD_FLAGS_LIBVLC_CONTROL)",
-                               );
-                               PRODUCT_NAME = test;
-                               SYMROOT = ../../build;
-                               VLC_FRAMEWORK = "$(TARGET_BUILD_DIR)/VLC.framework";
-                               WRAPPER_EXTENSION = app;
-                               ZERO_LINK = YES;
-                       };
-                       name = Debug;
-               };
-               C01FCF4C08A954540054247B /* Release */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               ARCHS = "$(NATIVE_ARCH)";
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-                               GCC_MODEL_TUNING = G5;
-                               INFOPLIST_FILE = Info.plist;
-                               INSTALL_PATH = "$(HOME)/Applications";
-                               LD_FLAGS_LIBINTL = "-dylib_file @loader_path/../lib/vlc_libintl.dylib:$(VLC_FRAMEWORK)/lib/vlc_libintl.dylib";
-                               LD_FLAGS_LIBVLC = "-dylib_file @loader_path/lib/libvlc.dylib:$(VLC_FRAMEWORK)/lib/libvlc.dylib -dylib_file @loader_path/../lib/libvlc.dylib:$(VLC_FRAMEWORK)/lib/libvlc.dylib";
-                               LD_FLAGS_LIBVLC_CONTROL = "-dylib_file @loader_path/lib/libvlc-control.dylib:$(VLC_FRAMEWORK)/lib/libvlc-control.dylib";
-                               OTHER_LDFLAGS = (
-                                       "$(LD_FLAGS_LIBINTL)",
-                                       "$(LD_FLAGS_LIBVLC)",
-                                       "$(LD_FLAGS_LIBVLC_CONTROL)",
-                               );
-                               PRODUCT_NAME = test;
-                               SYMROOT = ../../build;
-                               VLC_FRAMEWORK = "$(TARGET_BUILD_DIR)/VLC.framework";
-                               WRAPPER_EXTENSION = app;
-                       };
-                       name = Release;
-               };
-               C01FCF4F08A954540054247B /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES;
-                               GCC_WARN_UNUSED_VARIABLE = YES;
-                               PREBINDING = NO;
-                       };
-                       name = Debug;
-               };
-               C01FCF5008A954540054247B /* Release */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               ARCHS = "$(NATIVE_ARCH)";
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES;
-                               GCC_WARN_UNUSED_VARIABLE = YES;
-                               PREBINDING = NO;
-                       };
-                       name = Release;
-               };
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-               C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "test" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               C01FCF4B08A954540054247B /* Debug */,
-                               C01FCF4C08A954540054247B /* Release */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Debug;
-               };
-               C01FCF4E08A954540054247B /* Build configuration list for PBXProject "test" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               C01FCF4F08A954540054247B /* Debug */,
-                               C01FCF5008A954540054247B /* Release */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Debug;
-               };
-/* End XCConfigurationList section */
-       };
-       rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
-}
diff --git a/extras/package/macosx/Framework/Examples/test/test_Prefix.pch b/extras/package/macosx/Framework/Examples/test/test_Prefix.pch
deleted file mode 100644 (file)
index 0b05af7..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-//
-// Prefix header for all source files of the 'test' target in the 'test' project
-//
-
-#ifdef __OBJC__
-    #import <Cocoa/Cocoa.h>
-#endif
diff --git a/extras/package/macosx/Framework/Headers/Internal/VLCEventManager.h b/extras/package/macosx/Framework/Headers/Internal/VLCEventManager.h
deleted file mode 100644 (file)
index a5dd3cf..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-/*****************************************************************************
- * VLCEventManager.h: VLC.framework VLCEventManager header
- *****************************************************************************
- * Copyright (C) 2007 Pierre d'Herbemont
- * Copyright (C) 2007 the VideoLAN team
- * $Id$
- *
- * Authors: Pierre d'Herbemont <pdherbemont # videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import <Cocoa/Cocoa.h>
-#import <pthread.h>
-
-/**
- * The VLCEventManager class provides a safe way for inter-thread communications.
- */
-@interface VLCEventManager : NSObject
-{
-    NSMutableArray * messageQueue;      //< Holds a queue of messages.
-    pthread_t        dispatcherThread;  //< Thread responsible for dispatching messages.
-    pthread_mutex_t  queueLock;         //< Queue lock.
-    pthread_cond_t   signalData;        //< Data lock.
-}
-
-/* Factories */
-/**
- * Returns the shared VLCEventManager.  There should only be one instance of this class.
- * \return Shared event manager.
- */
-+ (id)sharedManager;
-
-/* Operations */
-/**
- * Sends a message to the target's delegate on the main thread.
- * \discussion The main thread is the one in which the main run loop is run, which usually 
- * means the one in which the NSApplication object receives events. The method is performed 
- * when the main thread runs the run loop in one of the common run loop modes (as specified 
- * in the CFRunLoop documentation).
- *
- * The receiver is retained until the call is finished.
- * \param aTarget The target object who's delegate should receive the specified message.
- * \param aSelector A selector that identifies the method to invoke. The method should not 
- * have a significant return value and should take a single argument of type NSNotification, 
- * or no arguments.
- *
- * See ÒSelectorsÓ for a description of the SEL type.
- * \param aNotificiationName The name of the notification that should be sent to the 
- * distributed notification center.
- */
-- (void)callOnMainThreadDelegateOfObject:(id)aTarget 
-                      withDelegateMethod:(SEL)aSelector 
-                    withNotificationName:(NSString *)aNotificationName;
-
-/**
- * Sends a message to the target on the main thread.
- * \discussion The main thread is the one in which the main run loop is run, which usually 
- * means the one in which the NSApplication object receives events. The method is performed 
- * when the main thread runs the run loop in one of the common run loop modes (as specified 
- * in the CFRunLoop documentation).
- *
- * The receiver and arg are retained until the call is finished.
- * \param aTarget The target object who should receive the specified message.
- * \param aSelector A selector that identifies the method to invoke. The method should not 
- * have a significant return value and should take a single argument of type id, 
- * or no arguments.
- *
- * See ÒSelectorsÓ for a description of the SEL type.
- * \param arg The argument to pass in the message.  Pass nil if the method does not take an 
- * argument.
- * distributed notification center.
- */
-- (void)callOnMainThreadObject:(id)aTarget 
-                    withMethod:(SEL)aSelector 
-          withArgumentAsObject:(id)arg;
-@end
diff --git a/extras/package/macosx/Framework/Headers/Internal/VLCLibVLCBridging.h b/extras/package/macosx/Framework/Headers/Internal/VLCLibVLCBridging.h
deleted file mode 100644 (file)
index cc94d51..0000000
+++ /dev/null
@@ -1,182 +0,0 @@
-/*****************************************************************************
-* VLCLibVLCbridging.h: VLC.framework VLCLibVLCBridging (Private) header
-*****************************************************************************
-* Copyright (C) 2007 Pierre d'Herbemont
-* Copyright (C) 2007 the VideoLAN team
-* $Id$
-*
-* Authors: Pierre d'Herbemont <pdherbemont # videolan.org>
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
-*****************************************************************************/
-
-#import "VLCLibrary.h"
-#import "VLCMediaListAspect.h"
-#import "VLCStreamOutput.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 
- * pointer.
- */
-+ (id)mediaListWithLibVLCMediaList:(void *)p_new_mlist;
-
-/* Initializers */
-/**
- * Initializes 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
- * pointer.
- */
-- (id)initWithLibVLCMediaList:(void *)p_new_mlist;
-
-/* Properties */
-@property (readonly) void * libVLCMediaList;    //< LibVLC media list pointer.
-@end
-
-/**
- * Bridges functionality between libvlc and VLCMedia implementation.
- */
-@interface VLCMedia (LibVLCBridging)
-/* Factories */
-/**
- * Manufactures new object wrapped around specified media descriptor.
- * \param md LibVLC media descriptor pointer.
- * \return Newly created media instance using specified descriptor.
- */
-+ (id)mediaWithLibVLCMediaDescriptor:(void *)md;
-
-/* Initializers */
-/**
- * Initializes new object wrapped around specified media descriptor.
- * \param md LibVLC media descriptor pointer.
- * \return Newly created media instance using specified descriptor.
- */
-- (id)initWithLibVLCMediaDescriptor:(void *)md;
-
-+ (id)mediaWithMedia:(VLCMedia *)media andLibVLCOptions:(NSDictionary *)options;
-
-/**
- * Returns the receiver's internal media descriptor pointer.
- * \return The receiver's internal media descriptor pointer.
- */
-@property (readonly) void * libVLCMediaDescriptor;
-@end
-
-/**
- * Bridges functionality between VLCMedia and VLCMediaPlayer
- */
-@interface VLCMedia (VLCMediaPlayerBridging)
-/**
- * Set's the length of the media object.  This value becomes available once the
- * media object is being played.
- * \param value
- */
-- (void)setLength:(VLCTime *)value;
-
-
-@end
-
-/**
- * Bridges functionality between VLCLibrary and LibVLC core.
- */
-@interface VLCLibrary (VLCLibVLCBridging)
-/**
- * Shared singleton instance of libvlc library instance.
- * \return libvlc pointer of library instance.
- */
-+ (void *)sharedInstance;
-
-/**
- * Instance of libvlc library instance.
- * \return libvlc pointer of library instance.
- */
-@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 
- * with the VLCAudio instance.  TODO: Each media player instance should have it's
- * own audio instance...not each library instance.
- */
-- (void)setAudio:(VLCAudio *)value;
-@end
-
-/**
- * Bridges functionality between VLCAudio and VLCLibrary.
- */
-@interface VLCAudio (VLCAudioBridging)
-/* Initializers */
-/**
- * Initializes a new object using the specified library instance.
- * \return Newly created audio object using specified VLCLibrary instance.
- */
-- (id)initWithLibrary:(VLCLibrary *)library;
-@end
-
-@interface VLCStreamOutput (LibVLCBridge)
-- (NSString *)representedLibVLCOptions;
-@end
diff --git a/extras/package/macosx/Framework/Headers/Internal/VLCVideoCommon.h b/extras/package/macosx/Framework/Headers/Internal/VLCVideoCommon.h
deleted file mode 100644 (file)
index d482ba0..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/*****************************************************************************
- * VLCVideoCommon.h: VLC.framework VLCVideoCommon header
- *****************************************************************************
- * Copyright (C) 2007 Pierre d'Herbemont
- * Copyright (C) 2007 the VideoLAN team
- * $Id: VLCVideoCommon.h 23915 2007-12-28 22:20:19Z pdherbemont $
- *
- * Authors: Pierre d'Herbemont <pdherbemont # videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import <QuartzCore/QuartzCore.h>
-
-@interface VLCVideoLayoutManager : NSObject
-{
-    CGSize originalVideoSize;
-    BOOL  fillScreenEntirely;
-}
-@property BOOL  fillScreenEntirely;
-@property CGSize originalVideoSize;
-
-+ (id)layoutManager;
-
-@end
diff --git a/extras/package/macosx/Framework/Headers/Public/VLCAudio.h b/extras/package/macosx/Framework/Headers/Public/VLCAudio.h
deleted file mode 100644 (file)
index cb2b80f..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-/*****************************************************************************
- * VLCAudio.h: VLC.framework VLCAudio header
- *****************************************************************************
- * Copyright (C) 2007 Faustino E. Osuna
- * Copyright (C) 2007 the VideoLAN team
- * $Id$
- *
- * Authors: Faustino E. Osuna <enrique.osuna # gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import <Cocoa/Cocoa.h>
-
-/* Notification Messages */
-/**
- * Standard notification messages that are emitted by VLCAudio object.
- */
-extern NSString * VLCMediaPlayerVolumeChanged;
-
-@class VLCLibrary;
-
-/**
- * TODO: Documentation VLCAudio
- */
-@interface VLCAudio : NSObject 
-{
-    VLCLibrary * library;   //< Library to control audio for
-}
-
-/* Properties */
-- (void)setMute:(BOOL)value;
-
-@property (setter=setMute:) BOOL isMuted;
-@property (assign) int volume;
-@end
diff --git a/extras/package/macosx/Framework/Headers/Public/VLCKit.h b/extras/package/macosx/Framework/Headers/Public/VLCKit.h
deleted file mode 100644 (file)
index 8a0769e..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-/*****************************************************************************
- * VLC.h: VLC.framework main header
- *****************************************************************************
- * Copyright (C) 2007 Pierre d'Herbemont
- * Copyright (C) 2007 the VideoLAN team
- * $Id$
- *
- * Authors: Pierre d'Herbemont <pdherbemont # videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#ifndef VLC_FRAMEWORK_VLC_H
-#define VLC_FRAMEWORK_VLC_H
-
-#import <VLCKit/VLCLibrary.h>
-#import <VLCKit/VLCMedia.h>
-#import <VLCKit/VLCMediaLibrary.h>
-#import <VLCKit/VLCMediaList.h>
-#import <VLCKit/VLCMediaListAspect.h>
-#import <VLCKit/VLCMediaDiscoverer.h>
-#import <VLCKit/VLCMediaPlayer.h>
-#import <VLCKit/VLCTime.h>
-#import <VLCKit/VLCVideoView.h>
-#import <VLCKit/VLCVideoLayer.h>
-#import <VLCKit/VLCStreamSession.h>
-#import <VLCKit/VLCStreamOutput.h>
-
-@class VLCMedia;
-@class VLCMediaLibrary;
-@class VLCMediaList;
-@class VLCTime;
-@class VLCVideoView;
-
-#endif /* VLC_FRAMEWORK_VLC_H */
diff --git a/extras/package/macosx/Framework/Headers/Public/VLCLibrary.h b/extras/package/macosx/Framework/Headers/Public/VLCLibrary.h
deleted file mode 100644 (file)
index f1ff8c5..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-/*****************************************************************************
- * VLCLibrary.h: VLC.framework VLCLibrary implementation
- *****************************************************************************
- * Copyright (C) 2007 Pierre d'Herbemont
- * Copyright (C) 2007 the VideoLAN team
- * $Id$
- *
- * Authors: Pierre d'Herbemont <pdherbemont # videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import <Cocoa/Cocoa.h>
-#import "VLCAudio.h"
-#import "VLCMediaList.h"
-#import "VLCMedia.h"
-
-@class VLCAudio;
-
-/**
- * VLCLibrary object.
- * TODO: Documentation VLCLibrary
- */
-@interface VLCLibrary : NSObject 
-{
-    void * instance;
-    VLCAudio * audio;
-}
-
-/* Factories */
-/**
- * TODO: Documentation + [VLCLibrary sharedLibrary]
- */
-+ (VLCLibrary *)sharedLibrary;
-
-/* Properties */
-/**
- * TODO: Documentation VLCLibrary.audio
- */
-@property (readonly) VLCAudio * audio;
-@end
diff --git a/extras/package/macosx/Framework/Headers/Public/VLCMedia.h b/extras/package/macosx/Framework/Headers/Public/VLCMedia.h
deleted file mode 100644 (file)
index bb00a99..0000000
+++ /dev/null
@@ -1,228 +0,0 @@
-/*****************************************************************************
- * VLCMedia.h: VLC.framework VLCMedia header
- *****************************************************************************
- * Copyright (C) 2007 Pierre d'Herbemont
- * Copyright (C) 2007 the VideoLAN team
- * $Id$
- *
- * Authors: Pierre d'Herbemont <pdherbemont # videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import <Cocoa/Cocoa.h>
-#import "VLCMediaList.h"
-#import "VLCTime.h"
-
-/* Meta Dictionary Keys */
-/**
- * Standard dictionary keys for retreiving meta data.
- */
-extern NSString * VLCMetaInformationTitle;          /* NSString */
-extern NSString * VLCMetaInformationArtist;         /* NSString */
-extern NSString * VLCMetaInformationGenre;          /* NSString */
-extern NSString * VLCMetaInformationCopyright;      /* NSString */
-extern NSString * VLCMetaInformationAlbum;          /* NSString */
-extern NSString * VLCMetaInformationTrackNumber;    /* NSString */
-extern NSString * VLCMetaInformationDescription;    /* NSString */
-extern NSString * VLCMetaInformationRating;         /* NSString */
-extern NSString * VLCMetaInformationDate;           /* NSString */
-extern NSString * VLCMetaInformationSetting;        /* NSString */
-extern NSString * VLCMetaInformationURL;            /* NSString */
-extern NSString * VLCMetaInformationLanguage;       /* NSString */
-extern NSString * VLCMetaInformationNowPlaying;     /* NSString */
-extern NSString * VLCMetaInformationPublisher;      /* NSString */
-extern NSString * VLCMetaInformationEncodedBy;      /* NSString */
-extern NSString * VLCMetaInformationArtworkURL;     /* NSString */
-extern NSString * VLCMetaInformationArtwork;        /* NSImage  */
-extern NSString * VLCMetaInformationTrackID;        /* NSString */
-
-/* Notification Messages */
-/**
- * Available notification messages.
- */
-extern NSString * VLCMediaMetaChanged;  //< Notification message for when the media's meta data has changed
-
-// Forward declarations, supresses compiler error messages
-@class VLCMediaList;
-@class VLCMedia;
-
-typedef enum VLCMediaState
-{
-    VLCMediaStateNothingSpecial,        //< Nothing
-    VLCMediaStateBuffering,             //< Stream is buffering
-    VLCMediaStatePlaying,               //< Stream is playing
-    VLCMediaStateError,                 //< Can't be played because an error occured
-} VLCMediaState;
-
-/**
- * Informal protocol declaration for VLCMedia delegates.  Allows data changes to be
- * trapped.
- */
-@protocol VLCMediaDelegate
-// TODO: SubItemAdded/SubItemRemoved implementation.  Not sure if we really want to implement this.
-///**
-// * Delegate method called whenever a sub item has been added to the specified VLCMedia.
-// * \param aMedia The media resource that has received the new sub item.
-// * \param childMedia The new sub item added.
-// * \param index Location of the new subitem in the aMedia's sublist.
-// */
-// - (void)media:(VLCMedia *)media addedSubItem:(VLCMedia *)childMedia atIndex:(int)index;
-
-///**
-// * Delegate method called whenever a sub item has been removed from the specified VLCMedia.
-// * \param aMedia The media resource that has had a sub item removed from.
-// * \param childMedia The sub item removed.
-// * \param index The previous location of the recently removed sub item.
-// */
-// - (void)media:(VLCMedia *)aMedia removedSubItem:(VLCMedia *)childMedia atIndex:(int)index;
-
-/**
- * Delegate method called whenever the meta has changed for the receiver.
- * \param aMedia The media resource whose meta data has been changed.
- * \param oldValue The old meta data value.
- * \param key The key of the value that was changed.
- */
-- (void)media:(VLCMedia *)aMedia metaValueChangedFrom:(id)oldValue forKey:(NSString *)key;
-@end
-
-/**
- * Defines files and streams as a managed object.  Each media object can be 
- * administered seperately.  VLCMediaPlayer or VLCMediaControl must be used 
- * to execute the appropriate playback functions.
- * \see VLCMediaPlayer
- * \see VLCMediaControl
- */
-@interface VLCMedia : NSObject
-{
-    void *                p_md;              //< Internal media descriptor instance
-    NSURL *               url;               //< URL for this media resource
-    VLCMediaList *        subitems;          //< Sub list of items
-    VLCTime *             length;            //< Duration of the media
-    NSMutableDictionary * metaDictionary;    //< Meta data storage
-    id                    delegate;          //< Delegate object
-    BOOL                  preparsed;         //< Value used to determine of the file has been preparsed
-    VLCMediaState         state;
-}
-
-/* Object Factories */
-/**
- * Manufactures a new VLCMedia object using the URL specified.
- * \param anURL URL to media to be accessed.
- * \return A new VLCMedia object, only if there were no errors.  This object 
- * will be automatically released.
- * \see initWithMediaURL
- */
-+ (id)mediaWithURL:(NSURL *)anURL;
-
-/**
- * Manufactures a new VLCMedia object using the path specified.
- * \param aPath Path to the media to be accessed.
- * \return A new VLCMedia object, only if there were no errors.  This object 
- * will be automatically released.
- * \see initWithPath
- */
-+ (id)mediaWithPath:(NSString *)aPath;
-
-/**
- * TODO
- * \param aName TODO
- * \return a new VLCMedia object, only if there were no errors.  This object
- * will be automatically released.
- * \see initAsNodeWithName
- */
-+ (id)mediaAsNodeWithName:(NSString *)aName;
-
-/* Initializers */
-/**
- * Initializes a new VLCMedia object to use the specified URL.  
- * \param aPath Path to media to be accessed.
- * \return A new VLCMedia object, only if there were no errors.
- */
-- (id)initWithURL:(NSURL *)anURL;
-
-/**
- * Initializes a new VLCMedia object to use the specified path.  
- * \param aPath Path to media to be accessed.
- * \return A new VLCMedia object, only if there were no errors.
- */
-- (id)initWithPath:(NSString *)aPath;
-
-/**
- * TODO
- * \param aName TODO
- * \return A new VLCMedia object, only if there were no errors.
- */
-- (id)initAsNodeWithName:(NSString *)aName;
-
-/**
- * Returns an NSComparisonResult value that indicates the lexical ordering of 
- * the receiver and a given meda.
- * \param media The media with which to compare with the receiver.
- * \return NSOrderedAscending if the URL of the receiver precedes media in 
- * lexical ordering, NSOrderedSame if the URL of the receiver and media are 
- * equivalent in lexical value, and NSOrderedDescending if the URL of the 
- * receiver follows media. If media is nil, returns NSOrderedDescending.
- */
-- (NSComparisonResult)compare:(VLCMedia *)media;
-
-/* Properties */
-/**
- * Receiver's delegate.
- */
-@property (assign) id delegate;
-
-/**
- * A VLCTime object describing the length of the media resource, only if it is
- * available.  Use lengthWaitUntilDate: to wait for a specified length of time.
- * \see lengthWaitUntilDate
- */
-@property (readonly) VLCTime * length;
-
-/**
- * Returns a VLCTime object describing the length of the media resource,
- * however, this is a blocking operation and will wait until the preparsing is
- * completed before returning anything.
- * \param aDate Time for operation to wait until, if there are no results
- * before specified date then nil is returned.
- * \return The length of the media resource, nil if it couldn't wait for it.
- */
-- (VLCTime *)lengthWaitUntilDate:(NSDate *)aDate;
-
-/**
- * Determines if the media has already been preparsed. 
- */
-@property (readonly) BOOL isPreparsed;
-
-/**
- * The URL for the receiver's media resource.
- */
-@property (readonly) NSURL * url;
-
-/**
- * The receiver's sub list.
- */
-@property (readonly) VLCMediaList * subitems;
-
-/**
- * The receiver's meta data as a NSDictionary object.
- */
-@property (readonly) NSDictionary * metaDictionary;
-
-/**
- * The receiver's state, such as Playing, Error, NothingSpecial, Buffering.
- */
-@property (readonly) VLCMediaState state;
-@end
diff --git a/extras/package/macosx/Framework/Headers/Public/VLCMediaDiscoverer.h b/extras/package/macosx/Framework/Headers/Public/VLCMediaDiscoverer.h
deleted file mode 100644 (file)
index 2041ffa..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-/*****************************************************************************
- * VLCMediaDiscoverer.h: VLC.framework VLCMediaDiscoverer header
- *****************************************************************************
- * Copyright (C) 2007 Pierre d'Herbemont
- * Copyright (C) 2007 the VideoLAN team
- * $Id$
- *
- * Authors: Pierre d'Herbemont <pdherbemont # videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import <Cocoa/Cocoa.h>
-#import <VLCKit/VLCMediaList.h>
-
-@class VLCMediaList;
-
-/**
- * TODO: Documentation VLCMediaDiscoverer
- */
-@interface VLCMediaDiscoverer : NSObject
-{
-    NSString * localizedName;       //< TODO: Documentation VLCMediaDiscoverer.localizedName
-    VLCMediaList * discoveredMedia; //< TODO: Documentation VLCMediaDiscoverer.discoveredMedia
-    void * mdis;                    //< TODO: Documentation VLCMediaDiscoverer.mdis
-    BOOL running;                   //< TODO: Documentation VLCMediaDiscoverer.running
-}
-
-/**
- * Maintains a list of available media discoverers.  This list is populated as new media
- * discoverers are created.
- * \return A list of available media discoverers.
- */
-+ (NSArray *)availableMediaDiscoverer;
-
-/* Initializers */
-/**
- * Initializes new object with specified name.
- * \param aSerchName Name of the service for this VLCMediaDiscoverer object.
- * \returns Newly created media discoverer.
- */
-- (id)initWithName:(NSString *)aServiceName;
-
-/**
- * TODO: Documentation VLCMediaDiscoverer.discoveredMedia
- */
-@property (readonly) VLCMediaList * discoveredMedia;
-
-/**
- * TODO: Documentation VLCMediaDiscoverer.localizedName
- */
-@property (readonly) NSString * localizedName;
-
-/**
- * TODO: Documentation VLCMediaDiscoverer.isRunning
- */
-@property (readonly) BOOL isRunning;
-@end
diff --git a/extras/package/macosx/Framework/Headers/Public/VLCMediaLibrary.h b/extras/package/macosx/Framework/Headers/Public/VLCMediaLibrary.h
deleted file mode 100644 (file)
index 1381677..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/*****************************************************************************
- * VLCMediaDiscoverer.h: VLC.framework VLCMediaDiscoverer header
- *****************************************************************************
- * Copyright (C) 2007 Pierre d'Herbemont
- * Copyright (C) 2007 the VideoLAN team
- * $Id$
- *
- * Authors: Pierre d'Herbemont <pdherbemont # videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import <Cocoa/Cocoa.h>
-#import "VLCMediaList.h"
-
-@class VLCMediaList;
-
-/**
- * TODO: Documentation
- */
-@interface VLCMediaLibrary : NSObject
-{
-    void * mlib;
-    VLCMediaList * allMedia;
-}
-/* Singleton */
-+ (id)sharedMediaLibrary;
-
-/* Properties */
-@property (readonly) VLCMediaList * allMedia;
-@end
diff --git a/extras/package/macosx/Framework/Headers/Public/VLCMediaList.h b/extras/package/macosx/Framework/Headers/Public/VLCMediaList.h
deleted file mode 100644 (file)
index 2d17312..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-/*****************************************************************************
- * VLCMediaList.h: VLC.framework VLCMediaList header
- *****************************************************************************
- * Copyright (C) 2007 Pierre d'Herbemont
- * Copyright (C) 2007 the VideoLAN team
- * $Id: VLCMediaList.h 21564 2007-08-29 21:09:27Z pdherbemont $
- *
- * Authors: Pierre d'Herbemont <pdherbemont # videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import "VLCMedia.h"
-
-/* Notification Messages */
-extern NSString * VLCMediaListItemAdded;
-extern NSString * VLCMediaListItemDeleted;
-
-@class VLCMedia;
-@class VLCMediaList;
-@class VLCMediaListAspect;
-
-/**
- * TODO: Documentation VLCMediaListDelegate
- */
-@protocol VLCMediaListDelegate
-/**
- * TODO: Documentation - [VLCMediaListDelegate mediaList:mediaAdded:atIndex:]
- */
-- (void)mediaList:(VLCMediaList *)aMediaList mediaAdded:(VLCMedia *)media atIndex:(int)index;
-
-/**
- * TODO: Documentation - [VLCMediaListDelegate mediaList:mediaRemovedAtIndex:]
- */
-- (void)mediaList:(VLCMediaList *)aMediaList mediaRemovedAtIndex:(int)index;
-@end
-
-/**
- * TODO: Documentation VLCMediaList
- */
-@interface VLCMediaList : NSObject
-{
-    void * p_mlist;                                 //< Internal instance of media list
-    id <VLCMediaListDelegate,NSObject> delegate;    //< Delegate object
-    /* We need that private copy because of Cocoa Bindings, that need to be working on first thread */
-    NSMutableArray * cachedMedia;                   //< Private copy of media objects.
-    VLCMediaListAspect * flatAspect;                //< TODO: Documentation VLCMediaList.flatAspect
-    VLCMediaListAspect * hierarchicalAspect;        //< TODO: Documentation VLCMediaList.hierarchicalAspect
-    VLCMediaListAspect * hierarchicalNodeAspect;    //< TODO: Documentation VLCMediaList.hierarchicalNodeAspect
-}
-
-/* Operations */
-/**
- * TODO: Documentation - [VLCMediaList lock]
- */
-- (void)lock;
-
-/**
- * TODO: Documentation - [VLCMediaList unlock]
- */
-- (void)unlock;
-
-/**
- * TODO: Documentation - [VLCMediaList addMedia:]
- */
-- (int)addMedia:(VLCMedia *)media;
-
-/**
- * TODO: Documentation - [VLCMediaList insertMedia:atIndex:]
- */
-- (void)insertMedia:(VLCMedia *)media atIndex:(int)index;
-
-/**
- * TODO: Documentation - [VLCMediaList removeMediaAtIndex:]
- */
-- (void)removeMediaAtIndex:(int)index;
-
-/**
- * TODO: Documentation - [VLCMediaList mediaAtIndex:]
- */
-- (VLCMedia *)mediaAtIndex:(int)index;
-
-/**
- * TODO: Documentation - [VLCMediaList indexOfMedia:]
- */
-- (int)indexOfMedia:(VLCMedia *)media;
-
-/* Properties */
-/**
- * TODO: Documentation VLCMediaList.count
- */
-@property (readonly) int count;
-
-/**
- * TODO: Documentation VLCMediaList.delegate
- */
-@property (assign) id delegate;
-
-/**
- * TODO: Documentation VLCMediaList.isReadOnly
- */
-@property (readonly) BOOL isReadOnly;
-
-/* Media list aspect */
-/**
- * TODO: Documentation VLCMediaList.hierarchicalAspect
- */
-@property (readonly) VLCMediaListAspect * hierarchicalAspect;
-
-/**
- * TODO: Documentation VLCMediaList.hierarchicalNodeAspect
- */
-@property (readonly) VLCMediaListAspect * hierarchicalNodeAspect;
-
-/**
- * TODO: Documentation VLCMediaList.flatAspect
- */
-@property (readonly) VLCMediaListAspect * flatAspect;
-@end
diff --git a/extras/package/macosx/Framework/Headers/Public/VLCMediaListAspect.h b/extras/package/macosx/Framework/Headers/Public/VLCMediaListAspect.h
deleted file mode 100644 (file)
index e810b13..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-/*****************************************************************************
- * VLCMediaLisAspect.h: VLC.framework VLCMediaLisAspect header
- *****************************************************************************
- * Copyright (C) 2007 Pierre d'Herbemont
- * Copyright (C) 2007 the VideoLAN team
- * $Id: VLCMediaList.h 21564 2007-08-29 21:09:27Z pdherbemont $
- *
- * Authors: Pierre d'Herbemont <pdherbemont # videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import "VLCMediaList.h"
-
-@class VLCMedia;
-@class VLCMediaList;
-
-@interface VLCMediaListAspectNode : NSObject
-{
-    VLCMedia * media;
-    VLCMediaListAspect * children;
-}
-@property (retain) VLCMedia * media;
-@property (retain) VLCMediaListAspect * children;
-- (BOOL)isLeaf;
-@end
-
-@interface VLCMediaListAspect : NSObject
-{
-    void * p_mlv;                //< Internal instance of media list view
-    NSMutableArray * cachedNode;
-    VLCMediaList * parentMediaList;
-    BOOL ownHisMediaList;
-}
-- (VLCMedia *)mediaAtIndex:(int)index;
-- (VLCMediaListAspectNode *)nodeAtIndex:(int)index;
-- (int)count;
-
-- (VLCMediaList *)parentMediaList;
-@end
diff --git a/extras/package/macosx/Framework/Headers/Public/VLCMediaPlayer.h b/extras/package/macosx/Framework/Headers/Public/VLCMediaPlayer.h
deleted file mode 100644 (file)
index eac63e6..0000000
+++ /dev/null
@@ -1,218 +0,0 @@
-/*****************************************************************************
- * VLCMediaPlayer.h: VLC.framework VLCMediaPlayer header
- *****************************************************************************
- * Copyright (C) 2007 Pierre d'Herbemont
- * Copyright (C) 2007 the VideoLAN team
- * $Id$
- *
- * Authors: Pierre d'Herbemont <pdherbemont # videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import <Cocoa/Cocoa.h>
-#import "VLCMedia.h"
-#import "VLCVideoView.h"
-#import "VLCVideoLayer.h"
-#import "VLCTime.h"
-#import "VLCAudio.h"
-
-/* Notification Messages */
-extern NSString * VLCMediaPlayerTimeChanged;
-extern NSString * VLCMediaPlayerStateChanged;
-
-/**
- * TODO: Documentation VLCMediaPlayerState
- */
-typedef enum VLCMediaPlayerState
-{
-    VLCMediaPlayerStateStopped,        //< Player has stopped
-    VLCMediaPlayerStateOpening,        //< Stream is opening
-    VLCMediaPlayerStateBuffering,      //< Stream is buffering
-    VLCMediaPlayerStateEnded,          //< Stream has ended
-    VLCMediaPlayerStateError,          //< Player has generated an error
-    VLCMediaPlayerStatePlaying,        //< Stream is playing
-    VLCMediaPlayerStatePaused          //< Stream is paused
-} VLCMediaPlayerState;
-
-/**
- * TODO: Documentation extern NSString * VLCMediaPlayerStateToString(VLCMediaPlayerState)
- */
-extern NSString * VLCMediaPlayerStateToString(VLCMediaPlayerState state);
-
-/**
- * Formal protocol declaration for playback delegates.  Allows playback messages
- * to be trapped by delegated objects.
- */
-@protocol VLCMediaPlayerDelegate
-/**
- * TODO: Documentation - [VLCMediaPlayerDelegate ]
- */
-- (void)mediaPlayerTimeChanged:(NSNotification *)aNotification;
-
-/**
- * TODO: Documentation - [VLCMediaPlayerDelegate ]
- */
-- (void)mediaPlayerStateChanged:(NSNotification *)aNotification;
-@end
-
-// TODO: Should we use medialist_player or our own flavor of media player?
-@interface VLCMediaPlayer : NSObject 
-{
-    id delegate;                        //< Object delegate
-
-    void * instance;                    //  Internal
-    VLCMedia * media;                   //< Current media being played
-    VLCTime * cachedTime;
-    VLCMediaPlayerState cachedState;
-    float position;
-}
-
-/* Initializers */
-- (id)initWithVideoView:(VLCVideoView *)aVideoView;
-- (id)initWithVideoLayer:(VLCVideoLayer *)aVideoLayer;
-
-/* Properties */
-- (void)setDelegate:(id)value;
-- (id)delegate;
-
-/* Video View Options */
-// TODO: Should be it's own object?
-
-- (void)setVideoView:(VLCVideoView *)aVideoView;
-- (void)setVideoLayer:(VLCVideoLayer *)aVideoLayer;
-
-@property (retain) id drawable; /* The videoView or videoLayer */
-
-- (void)setVideoAspectRatio:(char *)value;
-- (char *)videoAspectRatio;
-- (void)setVideoSubTitles:(int)value;
-- (int)videoSubTitles;
-
-- (void)setVideoCropGeometry:(char *)value;
-- (char *)videoCropGeometry;
-
-- (void)setVideoTeleText:(int)value;
-- (int)videoTeleText;
-
-@property float rate;
-
-@property (readonly) VLCAudio * audio;
-
-/* Video Information */
-- (NSSize)videoSize;
-- (BOOL)hasVideoOut;
-- (float)framesPerSecond;
-
-/**
- * Sets the current position (or time) of the feed.
- * \param value New time to set the current position to.  If time is [VLCTime nullTime], 0 is assumed.
- */
-- (void)setTime:(VLCTime *)value;
-
-/** 
- * Returns the current position (or time) of the feed.
- * \return VLCTIme object with current time.
- */
-- (VLCTime *)time;
-
-- (void)setChapter:(int)value;
-- (int)chapter;
-- (int)countOfChapters;
-
-/* Audio Options */
-- (void)setAudioTrack:(int)value;
-- (int)audioTrack;
-- (int)countOfAudioTracks;
-
-- (void)setAudioChannel:(int)value;
-- (int)audioChannel;
-
-/* Media Options */
-- (void)setMedia:(VLCMedia *)value;
-- (VLCMedia *)media;
-
-/* Playback Operations */
-/**
- * Plays a media resource using the currently selected media controller (or 
- * default controller.  If feed was paused then the feed resumes at the position 
- * it was paused in.
- * \return A Boolean determining whether the stream was played or not.
- */
-- (BOOL)play;
-
-/**
- * Toggle's the pause state of the feed.
- */
-- (void)pause;
-
-/**
- * Stop the playing.
- */
-- (void)stop;
-
-/**
- * Fast forwards through the feed at the standard 1x rate.
- */
-- (void)fastForward;
-
-/**
- * Fast forwards through the feed at the rate specified.
- * \param rate Rate at which the feed should be fast forwarded.
- */
-- (void)fastForwardAtRate:(float)rate;
-
-/**
- * Rewinds through the feed at the standard 1x rate.
- */
-- (void)rewind;
-
-/**
- * Rewinds through the feed at the rate specified.
- * \param rate Rate at which the feed should be fast rewound.
- */
-- (void)rewindAtRate:(float)rate;
-
-/* Playback Information */
-/**
- * Playback state flag identifying that the stream is currently playing.
- * \return TRUE if the feed is playing, FALSE if otherwise.
- */
-- (BOOL)isPlaying;
-
-/**
- * Playback state flag identifying wheather the stream will play.
- * \return TRUE if the feed is ready for playback, FALSE if otherwise.
- */
-- (BOOL)willPlay;
-
-/**
- * Playback's current state.
- * \see VLCMediaState
- */
-- (VLCMediaPlayerState)state;
-
-/**
- * Returns the receiver's position in the reading. 
- * \return A number between 0 and 1. indicating the position
- */
-- (float)position;
-- (void)setPosition:(float)newPosition;
-
-- (BOOL)isSeekable;
-
-- (BOOL)canPause;
-
-@end
diff --git a/extras/package/macosx/Framework/Headers/Public/VLCPlaylistDataSource.h b/extras/package/macosx/Framework/Headers/Public/VLCPlaylistDataSource.h
deleted file mode 100644 (file)
index 67c0ef8..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-/*****************************************************************************
- * VLCPlaylistDataSource.h: VLC.framework VLCPlaylistDataSource header
- *****************************************************************************
- * Copyright (C) 2007 Pierre d'Herbemont
- * Copyright (C) 2007 the VideoLAN team
- * $Id$
- *
- * Authors: Pierre d'Herbemont <pdherbemont # videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import <VLC/VLCPlaylist.h>
-#import <VLC/VLCVideoView.h>
-
-/* This class can be used as a data source for an NSOutlineView
- * it will display the playlist content. If provided the videoView
- * will automatically be associated to the given playlist, and actions
- * in the outlineView will trigger the videoView, visual feedback of the
- * current item in the videoview will be displayed in the outlineview
- */
-@interface VLCPlaylistDataSource : NSObject
-{
-    VLCPlaylist  * playlist;
-    VLCVideoView * videoView;
-    
-    NSOutlineView *outlineView;
-}
-- (id)initWithPlaylist:(VLCPlaylist *)aPlaylist;
-- (id)initWithPlaylist:(VLCPlaylist *)aPlaylist videoView:(VLCVideoView *)aVideoView;
-
-- (VLCPlaylist *)playlist;
-- (VLCVideoView *)videoView;
-@end
-
-/* It could be really useful to use that, this probably need to be reviewed to see
- * if it really belongs here */
-@interface VLCPlaylistDataSource (OutlineViewDataSource)
-- (id)outlineView:(NSOutlineView *)outlineView child:(int)index ofItem:(id)item;
-- (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item;
-- (int)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item;
-- (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item;
-@end
-
-@interface VLCPlaylistDataSource (OutlineViewDataSourceDropping)
-- (BOOL)outlineView:(NSOutlineView *)outlineView acceptDrop:(id <NSDraggingInfo>)info item:(id)item childIndex:(int)index;
-- (NSDragOperation)outlineView:(NSOutlineView *)outlineView validateDrop:(id <NSDraggingInfo>)info proposedItem:(id)item proposedChildIndex:(int)index;
-@end
-
-
diff --git a/extras/package/macosx/Framework/Headers/Public/VLCServicesDiscoverer.h b/extras/package/macosx/Framework/Headers/Public/VLCServicesDiscoverer.h
deleted file mode 100644 (file)
index ebd439b..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*****************************************************************************
- * VLCMediaDiscoverer.h: VLC.framework VLCMediaDiscoverer header
- *****************************************************************************
- * Copyright (C) 2007 Pierre d'Herbemont
- * Copyright (C) 2007 the VideoLAN team
- * $Id$
- *
- * Authors: Pierre d'Herbemont <pdherbemont # videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import <Cocoa/Cocoa.h>
-
-@interface VLCServicesDiscoverer : NSObject
-{
-    NSArray * services;
-}
-+ (id)sharedDiscoverer;
-- (id)init;
-- (NSArray *)services;
-@end
diff --git a/extras/package/macosx/Framework/Headers/Public/VLCStreamOutput.h b/extras/package/macosx/Framework/Headers/Public/VLCStreamOutput.h
deleted file mode 100644 (file)
index 5d9f7fe..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-//  VLCStreamOutput.h
-//  VLCKit
-//
-//  Created by Pierre d'Herbemont on 1/12/08.
-//  Copyright 2008 __MyCompanyName__. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-
-extern NSString * VLCDefaultStreamOutputRTSP;
-extern NSString * VLCDefaultStreamOutputRTP;
-extern NSString * VLCDefaultStreamOutputRTP;
-
-@interface VLCStreamOutput : NSObject {
-    NSMutableDictionary * options;
-}
-
-- (id)initWithOptionDictionary:(NSDictionary *)dictionary;
-+ (id)streamOutputWithOptionDictionary:(NSDictionary *)dictionary;
-
-+ (id)rtpBroadcastStreamOutputWithSAPAnnounce:(NSString *)announceName;
-+ (id)rtpBroadcastStreamOutput;
-+ (id)ipodStreamOutputWithFilePath:(NSString *)filePath;
-+ (id)streamOutputWithFilePath:(NSString *)filePath;
-+ (id)mpeg2StreamOutputWithFilePath:(NSString *)filePath;
-+ (id)mpeg4StreamOutputWithFilePath:(NSString *)filePath;
-
-@end
diff --git a/extras/package/macosx/Framework/Headers/Public/VLCStreamSession.h b/extras/package/macosx/Framework/Headers/Public/VLCStreamSession.h
deleted file mode 100644 (file)
index 3e087a4..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-//  VLCStreamSession.h
-//  VLCKit
-//
-//  Created by Pierre d'Herbemont on 1/12/08.
-//  Copyright 2008 __MyCompanyName__. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-#import <VLCKit/VLCStreamOutput.h>
-#import <VLCKit/VLCMediaPlayer.h>
-#import <VLCKit/VLCMedia.h>
-
-
-@interface VLCStreamSession : VLCMediaPlayer {
-    VLCStreamOutput * streamOutput;
-    VLCMedia * originalMedia;
-    int reattemptedConnections;
-    BOOL isComplete;
-}
-
-+ (id)streamSession;
-
-@property (retain) VLCMedia * media;
-@property (retain) VLCStreamOutput * streamOutput;
-@property (readonly) BOOL isComplete;
-
-- (void)startStreaming;
-@end
diff --git a/extras/package/macosx/Framework/Headers/Public/VLCTime.h b/extras/package/macosx/Framework/Headers/Public/VLCTime.h
deleted file mode 100644 (file)
index c2b9619..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-/*****************************************************************************
- * VLCTime.h: VLC.framework VLCTime header
- *****************************************************************************
- * Copyright (C) 2007 Pierre d'Herbemont
- * Copyright (C) 2007 the VideoLAN team
- * $Id$
- *
- * Authors: Pierre d'Herbemont <pdherbemont # videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import <Cocoa/Cocoa.h>
-
-/**
- * Provides an object to define VLCMedia's time.
- */
-@interface VLCTime : NSObject
-{
-    NSNumber * value;       //< Holds, in seconds, the VLCTime value
-}
-
-/* Factories */
-+ (VLCTime *)nullTime;
-+ (VLCTime *)timeWithNumber:(NSNumber *)aNumber;
-//+ (VLCTime *)timeWithString:(NSString *)aString;
-
-/* Initializers */
-- (id)initWithNumber:(NSNumber *)aNumber;
-//- (id)initWithString:(NSString *)aString;
-
-/* Properties */
-@property (readonly) NSNumber * numberValue;
-@property (readonly) NSString * stringValue;
-
-/* Comparitors */
-- (NSComparisonResult)compare:(VLCTime *)aTime;
-@end
diff --git a/extras/package/macosx/Framework/Headers/Public/VLCVideoLayer.h b/extras/package/macosx/Framework/Headers/Public/VLCVideoLayer.h
deleted file mode 100644 (file)
index 790b438..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/*****************************************************************************
- * VLCVideoLayer.h: VLC.framework VLCVideoLayer header
- *****************************************************************************
- * Copyright (C) 2007 Pierre d'Herbemont
- * Copyright (C) 2007 the VideoLAN team
- * $Id: VLCVideoView.h 23915 2007-12-28 22:20:19Z pdherbemont $
- *
- * Authors: Pierre d'Herbemont <pdherbemont # videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import <QuartzCore/QuartzCore.h>
-
-@interface VLCVideoLayer : CALayer
-{
-    BOOL hasVideo;
-}
-@property (readonly) BOOL hasVideo;
-@property BOOL fillScreen;
-@end
diff --git a/extras/package/macosx/Framework/Headers/Public/VLCVideoView.h b/extras/package/macosx/Framework/Headers/Public/VLCVideoView.h
deleted file mode 100644 (file)
index 38796f5..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * VLCVideoView.h: VLC.framework VLCVideoView header
- *****************************************************************************
- * Copyright (C) 2007 Pierre d'Herbemont
- * Copyright (C) 2007 the VideoLAN team
- * $Id$
- *
- * Authors: Pierre d'Herbemont <pdherbemont # videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import <Cocoa/Cocoa.h>
-#import <QuartzCore/QuartzCore.h>
-
-@interface VLCVideoView : NSView
-{
-    id delegate;
-    NSColor * backColor;
-    BOOL stretchesVideo;
-    id layoutManager;
-    BOOL hasVideo;
-}
-
-@property (assign) id delegate;
-@property (copy) NSColor *backColor;
-@property BOOL fillScreen;
-@property (readonly) BOOL hasVideo;
-@end
diff --git a/extras/package/macosx/Framework/Makefile b/extras/package/macosx/Framework/Makefile
deleted file mode 100644 (file)
index 8472959..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-all:
-       xcodebuild
-
-clean:
-       xcodebuild clean
\ No newline at end of file
diff --git a/extras/package/macosx/Framework/Pre-Compile.sh b/extras/package/macosx/Framework/Pre-Compile.sh
deleted file mode 100644 (file)
index c8a54b6..0000000
+++ /dev/null
@@ -1,157 +0,0 @@
-if test "${ACTION}" = ""; then
-    # Debug --
-    TARGET_BUILD_DIR="."
-    FULL_PRODUCT_NAME="VLCKit.framework"
-    CONTENTS_FOLDER_PATH="${FULL_PRODUCT_NAME}/Versions/A"
-    VLC_BUILD_DIR="../../.."
-    VLC_SRC_DIR="../../.."
-    ACTION="build"
-    rm -fr ${FULL_PRODUCT_NAME}
-    # Debug --
-fi
-
-# Hack to use that script with the current VLC-release.app
-if test "${ACTION}" = "VLC-release.app"; then
-    TARGET_BUILD_DIR="${build_dir}"
-    FULL_PRODUCT_NAME="VLC-release.app"
-    CONTENTS_FOLDER_PATH="${FULL_PRODUCT_NAME}/Contents/MacOS"
-    VLC_BUILD_DIR="${build_dir}"
-    VLC_SRC_DIR="${src_dir}"
-    ACTION="build"
-fi
-
-if test "${ACTION}" = "build"; then    
-    vlc_config="${VLC_SRC_DIR}/vlc-config"
-    lib="lib"
-    modules="modules"
-    share="share"
-    target="${TARGET_BUILD_DIR}/${CONTENTS_FOLDER_PATH}"
-    target_lib="${target}/${lib}"            # Should we consider using a different well-known folder like shared resources?
-    target_modules="${target}/${modules}"    # Should we consider using a different well-known folder like shared resources?
-    target_share="${target}/${share}"    # Should we consider using a different well-known folder like shared resources?
-    linked_libs=" "
-    
-    ##########################
-    # @function install_library(src_lib, dest_dir, type, lib_install_prefix, destination_name)
-    # @description Installs the specified library into the destination folder, automatically changes the references to dependencies
-    # @param src_lib     source library to copy to the destination directory
-    # @param dest_dir    destination directory where the src_lib should be copied to
-    install_library() {    
-        if [ ${3} = "library" ]; then
-            install_name="@loader_path/lib"
-        elif [ ${3} = "module" ]; then
-            install_name="@loader_path/modules"
-        fi
-        
-        if [ "${5}" != "" ]; then
-            lib_dest="${2}/${5}"
-        else
-            lib_dest="${2}/`basename ${1}`"
-        fi
-
-        if [ "${4}" != "" ]; then
-            lib_install_prefix="${4}"
-        else
-            lib_install_prefix="@loader_path/../lib"
-        fi
-        
-        if test -e ${1} && ((! test -e ${lib_dest}) || test ${1} -nt ${lib_dest} ); then
-            
-            mkdir -p ${2}
-
-            # Lets copy the library from the source folder to our new destination folder
-            install -m 644 ${1} ${lib_dest}
-
-            # Update the dynamic library so it will know where to look for the other libraries
-            echo "Installing ${3} `basename ${lib_dest}`"
-
-            if [ "${3}" != "bin" ]; then
-                # Change the reference of libvlc.1 stored in the usr directory to libvlc.dylib in the framework's library directory
-                install_name_tool -id "${install_name}/`basename ${lib_dest}`" ${lib_dest} > /dev/null
-            fi
-    
-            # Iterate through each installed library and modify the references to other dynamic libraries to match the framework's library directory
-            for linked_lib in `otool -L ${lib_dest}  | grep '(' | sed 's/\((.*)\)//'`; do
-                name=`basename ${linked_lib}`
-                case "${linked_lib}" in
-                    */vlc_install_dir/lib/* | */extras/contrib/lib/*)
-                        if test -e ${linked_lib}; then
-                            install_name_tool -change ${linked_lib} "${lib_install_prefix}/${name}" ${lib_dest}
-                            linked_libs="${linked_libs} ${ref_lib}"
-
-                            install_library ${linked_lib} ${target_lib} "library"
-                        fi
-                        ;;
-                    *)
-                        ;;
-                esac
-            done
-         fi
-    }
-    # @function install_library
-    ##########################
-
-    ##########################
-    # Build the modules folder (Same as VLCKit.framework/modules in Makefile)
-    echo "Building modules folder..."
-    # Figure out what modules are available to install
-    for module in `top_builddir="${VLC_BUILD_DIR}" ${vlc_config} --target plugin` ; do
-        # Check to see that the reported module actually exists
-        if test -n ${module}; then
-            module_src="`dirname ${module}`/.libs/`basename ${module}`.dylib"
-            install_library ${module_src} ${target_modules} "module"
-        fi
-    done
-    # Build the modules folder
-    ##########################
-
-    ##########################
-    # Create a symbolic link in the root of the framework
-    mkdir -p ${target_lib}
-    mkdir -p ${target_modules}
-    
-    pushd `pwd` > /dev/null 
-    cd ${TARGET_BUILD_DIR}/${FULL_PRODUCT_NAME}
-    
-    ln -sf Versions/Current/${lib} .
-    ln -sf Versions/Current/${modules} .
-    
-    popd > /dev/null 
-    # Create a symbolic link in the root of the framework
-    ##########################
-    
-    ##########################
-    # Build the library folder
-    echo "Building library folder..."
-    for linked_lib in ${linked_libs} ; do
-        case "${linked_lib}" in
-            */extras/contrib/lib/*.dylib)
-                if test -e ${linked_lib}; then
-                    install_library ${linked_lib} ${target_lib} "library"
-                fi
-                ;;
-            */vlc_install_dir/lib/*.dylib)
-                if test -e ${linked_lib}; then
-                    install_library ${linked_lib} ${target_lib} "library"
-                fi
-                ;;
-        esac
-    done
-
-    install_library "${VLC_BUILD_DIR}/src/.libs/libvlc-control.dylib" ${target_lib} "library"
-    install_library "${VLC_BUILD_DIR}/src/.libs/libvlc.dylib" ${target_lib} "library"
-
-    ##########################
-    # Hack for VLC-release.app
-    if [ "$FULL_PRODUCT_NAME" = "VLC-release.app" ] ; then
-        install_library "${VLC_BUILD_DIR}/.libs/vlc" "${target}" "bin" "@loader_path/lib"
-    fi
-
-    ##########################
-    # Build the share folder
-    echo "Building share folder..."
-    pbxcp="/Developer/Library/PrivateFrameworks/DevToolsCore.framework/Resources/pbxcp -exclude .DS_Store -exclude CVS -exclude .svn -resolve-src-symlinks"
-    mkdir -p ${target_share}
-    $pbxcp ${VLC_BUILD_DIR}/share/luameta ${target_share}
-    $pbxcp ${VLC_BUILD_DIR}/share/luaplaylist ${target_share}
-fi
diff --git a/extras/package/macosx/Framework/Resources/Info.plist b/extras/package/macosx/Framework/Resources/Info.plist
deleted file mode 100644 (file)
index 0d1afdd..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>CFBundleDevelopmentRegion</key>
-       <string>English</string>
-       <key>CFBundleExecutable</key>
-       <string>Quartz</string>
-       <key>CFBundleIdentifier</key>
-       <string>org.videolan.vlckitframework</string>
-       <key>CFBundleInfoDictionaryVersion</key>
-       <string>6.0</string>
-       <key>CFBundleName</key>
-       <string>VLC</string>
-       <key>CFBundlePackageType</key>
-       <string>FMWK</string>
-       <key>CFBundleShortVersionString</key>
-       <string>0.1</string>
-       <key>CFBundleVersion</key>
-       <string>0.1</string>
-</dict>
-</plist>
diff --git a/extras/package/macosx/Framework/Resources/version.plist b/extras/package/macosx/Framework/Resources/version.plist
deleted file mode 100644 (file)
index 2d08db5..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>CFBundleShortVersionString</key>
-       <string>0.1</string>
-       <key>CFBundleVersion</key>
-       <string>0.1</string>
-       <key>ProjectName</key>
-       <string>VLC</string>
-</dict>
-</plist>
diff --git a/extras/package/macosx/Framework/Sources/VLCAudio.m b/extras/package/macosx/Framework/Sources/VLCAudio.m
deleted file mode 100644 (file)
index e81a03b..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-/*****************************************************************************
- * VLCAudio.m: VLC.framework VLCAudio implementation
- *****************************************************************************
- * Copyright (C) 2007 Faustino E. Osuna
- * Copyright (C) 2007 the VideoLAN team
- * $Id$
- *
- * Authors: Faustino E. Osuna <enrique.osuna # gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import "VLCAudio.h"
-#import "VLCLibVLCBridging.h"
-
-/* Notification Messages */
-NSString * VLCMediaPlayerVolumeChanged = @"VLCMediaPlayerVolumeChanged"; 
-
-/* libvlc event callback */
-// TODO: Callbacks
-
-@implementation VLCAudio
-
-- (id)init
-{
-    return nil;
-}
-
-- (id)initWithLibrary:(VLCLibrary *)aLibrary
-{
-    if (![library audio] && (self = [super init]))
-    {
-        library = aLibrary;
-        [library setAudio:self];
-    }
-    return self;
-}
-
-- (void)setMute:(BOOL)value
-{
-    libvlc_audio_set_mute([library instance], value, NULL);
-}
-
-- (BOOL)isMuted
-{
-    libvlc_exception_t ex;
-    libvlc_exception_init(&ex);
-    BOOL result = libvlc_audio_get_mute([library instance], &ex);
-    catch_exception(&ex);
-    
-    return result;
-}
-
-- (void)setVolume:(int)value
-{
-    if (value < 0)
-        value = 0;
-    else if (value > 200)
-        value = 200;
-    libvlc_audio_set_volume([library instance], value, NULL);
-}
-
-- (int)volume
-{
-    libvlc_exception_t ex;
-    libvlc_exception_init(&ex);
-    int result = libvlc_audio_get_volume([library instance], &ex);
-    catch_exception(&ex);
-    return result;
-}
-@end
diff --git a/extras/package/macosx/Framework/Sources/VLCEventManager.m b/extras/package/macosx/Framework/Sources/VLCEventManager.m
deleted file mode 100644 (file)
index 87d881b..0000000
+++ /dev/null
@@ -1,305 +0,0 @@
-/*****************************************************************************
- * VLCEventManager.h: VLC.framework VLCEventManager implementation
- * This is used to communicate in a sound way accross threads.
- *****************************************************************************
- * Copyright (C) 2007 Pierre d'Herbemont
- * Copyright (C) 2007 the VideoLAN team
- * $Id$
- *
- * Authors: Pierre d'Herbemont <pdherbemont # videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import "VLCEventManager.h"
-#import <pthread.h>
-
-/**
- * Defines the type of interthread message on the queue.
- */
-typedef enum
-{
-    VLCNotification,                //< Standard NSNotification.
-    VLCObjectMethodWithObjectArg,   //< Method with an object argument.
-    VLCObjectMethodWithArrayArg     //< Method with an array argument.
-} message_type_t;
-
-/**
- * Data structured used to enqueue messages onto the queue.
- */
-typedef struct {
-    id target;                      //< Target object that should receive the message (retained until method is called).
-    SEL sel;                        //< A selector that identifies the message to be sent to the target.
-    union u                         //< Object could either be a VLCNotification or other.
-    {
-        NSString * name;            //< Name to be used for NSNotification
-        id object;                  //< Object argument to pass to the target via the selector.
-    } u;
-    message_type_t type;            //< Type of queued message.
-} message_t;
-
-@interface VLCEventManager (Private)
-- (void)callDelegateOfObjectAndSendNotificationWithArgs:(NSData*)data;
-- (void)callObjectMethodWithArgs:(NSData*)data;
-- (void)callDelegateOfObject:(id) aTarget withDelegateMethod:(SEL)aSelector withNotificationName:(NSString *)aNotificationName;
-- (pthread_cond_t *)signalData;
-- (pthread_mutex_t *)queueLock;
-- (NSMutableArray *)messageQueue;
-@end
-
-/**
- * Provides a function for the main entry point for the dispatch thread.  It dispatches any messages that is queued.
- * \param user_data Pointer to the VLCEventManager instance that instiated this thread.
- */
-static void * EventDispatcherMainLoop(void * user_data)
-{
-    VLCEventManager * self = user_data;
-    
-    for(;;)
-    {
-        NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-        message_t * message, * message_newer = NULL;
-        NSData * dataMessage;
-        int i;
-
-        /* Sleep a bit not to flood the interface */
-        usleep(300);
-
-        /* Wait for some data */
-
-        pthread_mutex_lock( [self queueLock] );
-        /* Wait until we have something on the queue */
-        while( [[self messageQueue] count] <= 0 )
-        {
-            pthread_cond_wait( [self signalData], [self queueLock] );
-        }
-
-        //if( [[self messageQueue] count] % 100 == 0 || [[self messageQueue] count] < 100 )
-          //  NSLog(@"[EVENT_MANAGER] On the stack we have %d elements", [[self messageQueue] count]);
-
-        /* Get the first object off the queue. */
-        dataMessage = [[[self messageQueue] lastObject] retain];    // Released in 'call'
-        [[self messageQueue] removeLastObject];
-        message = (message_t *)[dataMessage bytes];
-        
-        /* Remove duplicate notifications. */
-        if( message->type == VLCNotification )
-        {
-            for( i = [[self messageQueue] count]-1; i >= 0; i-- )
-            {
-                message_newer = (message_t *)[(NSData *)[[self messageQueue] objectAtIndex:i] bytes];
-                if( message_newer->type == VLCNotification &&
-                    message_newer->target == message->target &&
-                   [message_newer->u.name isEqualToString:message->u.name] )
-                {
-                    [message_newer->target release];
-                    [message_newer->u.name release];
-                    [[self messageQueue] removeObjectAtIndex:i];
-                }
-            }
-        }
-        else if( message->type == VLCObjectMethodWithArrayArg )
-        {
-            NSMutableArray * newArg = nil;
-
-            /* Collapse messages that takes array arg by sending one bigger array */
-            for( i = [[self messageQueue] count]-1; i >= 0; i-- )
-            {
-                message_newer = (message_t *)[(NSData *)[[self messageQueue] objectAtIndex: i] bytes];
-                if( message_newer->type == VLCObjectMethodWithArrayArg &&
-                    message_newer->target == message->target && 
-                    message_newer->sel == message->sel )
-                {
-                    if(!newArg)
-                    {
-                        newArg = [NSMutableArray arrayWithArray:message->u.object];
-                        [message->u.object release];
-                    }
-                    
-                    [newArg addObjectsFromArray:message_newer->u.object];
-                    [message_newer->target release];
-                    [message_newer->u.object release];
-                    [[self messageQueue] removeObjectAtIndex:i];
-                }
-                /* It shouldn be a good idea not to collapse event with other kind of event in-between.
-                 * This could be particulary problematic when the same object receive two related events
-                 * (for instance Added and Removed).
-                 * Ignore for now only if target is the same */
-                else if( message_newer->target == message->target )
-                    break;
-            }
-            
-            if( newArg )
-                message->u.object = [newArg retain];
-        }
-        
-        pthread_mutex_unlock( [self queueLock] );
-
-        if( message->type == VLCNotification )
-            [self performSelectorOnMainThread:@selector(callDelegateOfObjectAndSendNotificationWithArgs:) 
-                                   withObject:dataMessage
-                                waitUntilDone: NO];
-        else
-            [self performSelectorOnMainThread:@selector(callObjectMethodWithArgs:) 
-                                   withObject:dataMessage
-                                waitUntilDone: YES];
-
-        [pool release];
-    }
-    return nil;
-}
-
-@implementation VLCEventManager
-+ (id)sharedManager
-{
-    static VLCEventManager * defaultManager = NULL;
-    
-    /* We do want a lock here to avoid leaks */
-    if ( !defaultManager )
-    {
-        defaultManager = [[VLCEventManager alloc] init];
-    }
-
-    return defaultManager;
-}
-
-- (void)dummy
-{
-    /* Put Cocoa in multithreaded mode by calling a dummy function */
-}
-
-- (id)init
-{
-    if( self = [super init] )
-    {
-        if(![NSThread isMultiThreaded])
-        {
-            [NSThread detachNewThreadSelector:@selector(dummy) toTarget:self withObject:nil];
-            NSAssert([NSThread isMultiThreaded], @"Can't put Cocoa in multithreaded mode");
-        }
-
-        pthread_mutex_init( &queueLock, NULL );
-        pthread_cond_init( &signalData, NULL );
-        pthread_create( &dispatcherThread, NULL, EventDispatcherMainLoop, self );
-        messageQueue = [[NSMutableArray alloc] initWithCapacity:10];
-    }
-    return self;
-}
-
-- (void)dealloc
-{
-    pthread_kill( dispatcherThread, SIGKILL );
-    pthread_join( dispatcherThread, NULL );
-
-    [messageQueue release];
-    [super dealloc];
-}
-
-- (void)callOnMainThreadDelegateOfObject:(id)aTarget withDelegateMethod:(SEL)aSelector withNotificationName: (NSString *)aNotificationName
-{
-    /* Don't send on main thread before this gets sorted out */
-//    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-    
-    message_t message = 
-    { 
-        [aTarget retain], 
-        aSelector, 
-        [aNotificationName retain], 
-        VLCNotification 
-    };
-
-//    if( [NSThread isMainThread] )
-//    {
-        [self callDelegateOfObjectAndSendNotificationWithArgs:[[NSData dataWithBytes:&message length:sizeof(message_t)] retain] /* released in the call */];
-//    } 
-//    else 
-//    {
-//        pthread_mutex_lock( [self queueLock] );
-//        [[self messageQueue] insertObject:[NSData dataWithBytes:&message length:sizeof(message_t)] atIndex:0];
-//        pthread_cond_signal( [self signalData] );
-//        pthread_mutex_unlock( [self queueLock] );
-//    }
-    
-//    [pool release];
-}
-
-- (void)callOnMainThreadObject:(id)aTarget withMethod:(SEL)aSelector withArgumentAsObject: (id)arg
-{
-    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-    message_t message = 
-    { 
-        [aTarget retain], 
-        aSelector, 
-        [arg retain], 
-        [arg isKindOfClass:[NSArray class]] ? VLCObjectMethodWithArrayArg : VLCObjectMethodWithObjectArg 
-    };
-
-    pthread_mutex_lock( [self queueLock] );
-    [[self messageQueue] insertObject:[NSData dataWithBytes:&message length:sizeof(message_t)] atIndex:0];
-    pthread_cond_signal( [self signalData] );
-    pthread_mutex_unlock( [self queueLock] );
-    
-    [pool release];
-}
-@end
-
-@implementation VLCEventManager (Private)
-- (void)callDelegateOfObjectAndSendNotificationWithArgs:(NSData*)data
-{
-    message_t * message = (message_t *)[data bytes];
-
-    [self callDelegateOfObject:message->target withDelegateMethod:message->sel withNotificationName:message->u.name];
-    [message->u.name release];
-    [message->target release];
-    [data release];
-}
-
-- (void)callObjectMethodWithArgs:(NSData*)data
-{
-    message_t * message = (message_t *)[data bytes];
-    void (*method)(id, SEL, id) = (void (*)(id, SEL, id))[message->target methodForSelector: message->sel];
-
-    method( message->target, message->sel, message->u.object);
-    [message->u.object release];
-    [message->target release];
-    [data release];
-}
-
-- (void)callDelegateOfObject:(id) aTarget withDelegateMethod:(SEL)aSelector withNotificationName: (NSString *)aNotificationName
-{
-    //    [[NSNotificationCenter defaultCenter] postNotification: [NSNotification notificationWithName:aNotificationName object:aTarget]];
-    
-    if (![aTarget delegate] || ![[aTarget delegate] respondsToSelector:aSelector])
-        return;
-    
-    void (*method)(id, SEL, id) = (void (*)(id, SEL, id))[[aTarget delegate] methodForSelector: aSelector];
-    method( [aTarget delegate], aSelector, [NSNotification notificationWithName:aNotificationName object:aTarget]);
-}
-
-- (NSMutableArray *)messageQueue
-{
-    return messageQueue;
-}
-
-- (pthread_cond_t *)signalData
-{
-    return &signalData;
-}
-
-- (pthread_mutex_t *)queueLock
-{
-    return &queueLock;
-}
-@end
diff --git a/extras/package/macosx/Framework/Sources/VLCLibrary.m b/extras/package/macosx/Framework/Sources/VLCLibrary.m
deleted file mode 100644 (file)
index 658690d..0000000
+++ /dev/null
@@ -1,132 +0,0 @@
-/*****************************************************************************
- * VLCLibrary.h: VLC.framework VLCLibrary implementation
- *****************************************************************************
- * Copyright (C) 2007 Pierre d'Herbemont
- * Copyright (C) 2007 the VideoLAN team
- * $Id$
- *
- * Authors: Pierre d'Herbemont <pdherbemont # videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import "VLCLibrary.h"
-#import "VLCLibVLCBridging.h"
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <vlc/vlc.h>
-#include <vlc/libvlc_structures.h>
-
-static VLCLibrary * sharedLibrary = nil;
-
-void __catch_exception( void * e, const char * function, const char * file, int line_number )
-{
-    libvlc_exception_t * ex = (libvlc_exception_t *)e;
-    if( libvlc_exception_raised( ex ) )
-    {
-        NSException* libvlcException = [NSException
-            exceptionWithName:@"LibVLCException"
-            reason:[NSString stringWithFormat:@"libvlc has thrown us an error: %s (%s:%d %s)", 
-                libvlc_exception_get_message( ex ), file, line_number, function]
-            userInfo:nil];
-        libvlc_exception_clear( ex );
-        @throw libvlcException;
-    }
-}
-
-static void * DestroySharedLibraryAtExit( void )
-{
-    /* Release the global object that may have been alloc-ed
-     * in -[VLCLibrary init] */
-    [sharedLibrary release];
-    sharedLibrary = nil;
-
-    return NULL;
-}
-
-@implementation VLCLibrary
-+ (VLCLibrary *)sharedLibrary
-{
-    if (!sharedLibrary) 
-    {
-        /* Initialize a shared instance */
-        sharedLibrary = [[self alloc] init];
-        
-        /* Make sure, this will get released at some point */
-        atexit( (void *)DestroySharedLibraryAtExit );
-    }
-    return [[sharedLibrary retain] autorelease];
-}
-
-- (id)init 
-{
-    if (self = [super init]) 
-    {
-        libvlc_exception_t ex;
-        libvlc_exception_init( &ex );
-        
-        const char * lib_vlc_params[] = { 
-            "-I", "dummy", "--vout=opengllayer", 
-            "--no-video-title-show", "--no-sout-keep", "-vvv"
-            //, "--control=motion", "--motion-use-rotate", "--video-filter=rotate"
-        };
-        
-        instance = (void *)libvlc_new( sizeof(lib_vlc_params)/sizeof(lib_vlc_params[0]), lib_vlc_params, &ex );
-        catch_exception( &ex );
-        
-        // Assignment unneeded, as the audio unit will do it for us
-        /*audio = */ [[VLCAudio alloc] initWithLibrary:self];
-    }
-    return self;
-}
-
-- (void)dealloc 
-{
-    if( instance ) 
-        libvlc_release( instance );
-    
-    if( self == sharedLibrary ) 
-        sharedLibrary = nil;
-    
-    instance = nil;
-    [audio release];
-    [super dealloc];
-}
-
-@synthesize audio;
-@end
-
-@implementation VLCLibrary (VLCLibVLCBridging)
-+ (void *)sharedInstance
-{
-    return [self sharedLibrary].instance;
-}
-
-- (void *)instance
-{
-    return instance;
-}
-@end
-
-@implementation VLCLibrary (VLCAudioBridging)
-- (void)setAudio:(VLCAudio *)value
-{
-    if (!audio)
-        audio = value;
-}
-@end
diff --git a/extras/package/macosx/Framework/Sources/VLCMedia.m b/extras/package/macosx/Framework/Sources/VLCMedia.m
deleted file mode 100644 (file)
index 0cb5819..0000000
+++ /dev/null
@@ -1,552 +0,0 @@
-/*****************************************************************************
- * VLCMedia.m: VLC.framework VLCMedia implementation
- *****************************************************************************
- * Copyright (C) 2007 Pierre d'Herbemont
- * Copyright (C) 2007 the VideoLAN team
- * $Id$
- *
- * Authors: Pierre d'Herbemont <pdherbemont # videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import "VLCMedia.h"
-#import "VLCMediaList.h"
-#import "VLCEventManager.h"
-#import "VLCLibrary.h"
-#import "VLCLibVLCBridging.h"
-#include <vlc/libvlc.h>
-
-/* Meta Dictionary Keys */
-NSString * VLCMetaInformationTitle          = @"title";
-NSString * VLCMetaInformationArtist         = @"artist";
-NSString * VLCMetaInformationGenre          = @"genre";
-NSString * VLCMetaInformationCopyright      = @"copyright";
-NSString * VLCMetaInformationAlbum          = @"album";
-NSString * VLCMetaInformationTrackNumber    = @"trackNumber";
-NSString * VLCMetaInformationDescription    = @"description";
-NSString * VLCMetaInformationRating         = @"rating";
-NSString * VLCMetaInformationDate           = @"date";
-NSString * VLCMetaInformationSetting        = @"setting";
-NSString * VLCMetaInformationURL            = @"url";
-NSString * VLCMetaInformationLanguage       = @"language";
-NSString * VLCMetaInformationNowPlaying     = @"nowPlaying";
-NSString * VLCMetaInformationPublisher      = @"publisher";
-NSString * VLCMetaInformationEncodedBy      = @"encodedBy";
-NSString * VLCMetaInformationArtworkURL     = @"artworkURL";
-NSString * VLCMetaInformationArtwork        = @"artwork";
-NSString * VLCMetaInformationTrackID        = @"trackID";
-
-/* Notification Messages */
-NSString * VLCMediaMetaChanged              = @"VLCMediaMetaChanged";
-
-/******************************************************************************
- * @property (readwrite)
- */
-@interface VLCMedia ()
-@property (readwrite) VLCMediaState state;
-@end
-
-/******************************************************************************
- * Interface (Private)
- */
-// TODO: Documentation
-@interface VLCMedia (Private)
-/* Statics */
-+ (libvlc_meta_t)stringToMetaType:(NSString *)string;
-+ (NSString *)metaTypeToString:(libvlc_meta_t)type;
-
-/* Initializers */
-- (void)initInternalMediaDescriptor;
-
-/* Operations */
-- (void)fetchMetaInformationFromLibVLCWithType:(NSString*)metaType;
-- (void)fetchMetaInformationForArtWorkWithURL:(NSString *)anURL;
-- (void)setArtwork:(NSImage *)art;
-
-/* Callback Methods */
-- (void)metaChanged:(NSString *)metaType;
-- (void)subItemAdded;
-- (void)setStateAsNumber:(NSNumber *)newStateAsNumber;
-@end
-
-static VLCMediaState libvlc_state_to_media_state[] =
-{
-    [libvlc_NothingSpecial] = VLCMediaStateNothingSpecial,
-    [libvlc_Stopped]        = VLCMediaStateNothingSpecial,
-    [libvlc_Opening]        = VLCMediaStateNothingSpecial,
-    [libvlc_Buffering]      = VLCMediaStateBuffering,
-    [libvlc_Ended]          = VLCMediaStateNothingSpecial,
-    [libvlc_Error]          = VLCMediaStateError,
-    [libvlc_Playing]        = VLCMediaStatePlaying,
-    [libvlc_Paused]         = VLCMediaStatePlaying,
-};
-
-static inline VLCMediaState LibVLCStateToMediaState( libvlc_state_t state )
-{
-    return libvlc_state_to_media_state[state];
-}
-
-/******************************************************************************
- * LibVLC Event Callback
- */
-static void HandleMediaMetaChanged(const libvlc_event_t * event, void * self)
-{
-    if( event->u.media_descriptor_meta_changed.meta_type == libvlc_meta_Publisher ||
-        event->u.media_descriptor_meta_changed.meta_type == libvlc_meta_NowPlaying )
-    {
-        /* Skip those meta. We don't really care about them for now.
-         * And they occure a lot */
-        return;
-    }
-    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-    [[VLCEventManager sharedManager] callOnMainThreadObject:self
-                                                 withMethod:@selector(metaChanged:)
-                                       withArgumentAsObject:[VLCMedia metaTypeToString:event->u.media_descriptor_meta_changed.meta_type]];
-    [pool release];
-}
-
-//static void HandleMediaDurationChanged(const libvlc_event_t * event, void * self)
-//{
-//    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-//    
-//    [[VLCEventManager sharedManager] callOnMainThreadObject:self
-//                                                 withMethod:@selector(setLength:)
-//                                       withArgumentAsObject:[VLCTime timeWithNumber:
-//                                           [NSNumber numberWithLongLong:event->u.media_descriptor_duration_changed.new_duration]]];
-//    [pool release];
-//}
-
-static void HandleMediaStateChanged(const libvlc_event_t * event, void * self)
-{
-    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-    
-    [[VLCEventManager sharedManager] callOnMainThreadObject:self
-                                                 withMethod:@selector(setStateAsNumber:)
-                                       withArgumentAsObject:[NSNumber numberWithInt:
-                                            LibVLCStateToMediaState(event->u.media_descriptor_state_changed.new_state)]];
-    [pool release];
-}
-
-static void HandleMediaSubItemAdded(const libvlc_event_t * event, void * self)
-{
-    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-    [[VLCEventManager sharedManager] callOnMainThreadObject:self
-                                                 withMethod:@selector(subItemAdded)
-                                       withArgumentAsObject:nil];
-    [pool release];
-}
-
-/******************************************************************************
- * Implementation
- */
-@implementation VLCMedia
-+ (id)mediaWithURL:(NSURL *)anURL;
-{
-    return [[[VLCMedia alloc] initWithURL:anURL] autorelease];
-}
-
-+ (id)mediaWithPath:(NSString *)aPath;
-{
-    return [[[VLCMedia alloc] initWithPath:aPath] autorelease];
-}
-
-+ (id)mediaAsNodeWithName:(NSString *)aName;
-{
-    return [[[VLCMedia alloc] initAsNodeWithName:aName] autorelease];
-}
-
-- (id)initWithURL:(NSURL *)anURL
-{
-    return [self initWithPath:[anURL path]];
-}
-
-- (id)initWithPath:(NSString *)aPath
-{        
-    if (self = [super init])
-    {
-        libvlc_exception_t ex;
-        libvlc_exception_init(&ex);
-        
-        p_md = libvlc_media_descriptor_new([VLCLibrary sharedInstance],
-                                           [aPath UTF8String],
-                                           &ex);
-        catch_exception(&ex);
-        
-        delegate = nil;
-        metaDictionary = [[NSMutableDictionary alloc] initWithCapacity:3];
-        
-        // This value is set whenever the demuxer figures out what the length is.
-        // TODO: Easy way to tell the length of the movie without having to instiate the demuxer.  Maybe cached info?
-        length = nil;
-
-        [self initInternalMediaDescriptor];
-    }
-    return self;
-}
-
-- (id)initAsNodeWithName:(NSString *)aName
-{        
-    if (self = [super init])
-    {
-        libvlc_exception_t ex;
-        libvlc_exception_init(&ex);
-        
-        p_md = libvlc_media_descriptor_new_as_node([VLCLibrary sharedInstance],
-                                                   [aName UTF8String],
-                                                   &ex);
-        catch_exception(&ex);
-
-        delegate = nil;
-        metaDictionary = [[NSMutableDictionary alloc] initWithCapacity:3];
-        
-        // This value is set whenever the demuxer figures out what the length is.
-        // TODO: Easy way to tell the length of the movie without having to instiate the demuxer.  Maybe cached info?
-        length = nil;
-        
-        [self initInternalMediaDescriptor];
-    }
-    return self;
-}
-
-- (void)release
-{
-    @synchronized(self)
-    {
-        if([self retainCount] <= 1)
-        {
-            /* We must make sure we won't receive new event after an upcoming dealloc
-             * We also may receive a -retain in some event callback that may occcur
-             * Before libvlc_event_detach. So this can't happen in dealloc */
-            libvlc_event_manager_t * p_em = libvlc_media_descriptor_event_manager(p_md, NULL);
-            libvlc_event_detach(p_em, libvlc_MediaDescriptorMetaChanged,     HandleMediaMetaChanged,     self, NULL);
-//            libvlc_event_detach(p_em, libvlc_MediaDescriptorDurationChanged, HandleMediaDurationChanged, self, NULL);
-            libvlc_event_detach(p_em, libvlc_MediaDescriptorStateChanged,    HandleMediaStateChanged,    self, NULL);
-            libvlc_event_detach(p_em, libvlc_MediaDescriptorSubItemAdded,    HandleMediaSubItemAdded,    self, NULL);
-        }
-        [super release];
-    }
-}
-
-- (void)dealloc
-{
-    // Testing to see if the pointer exists is not required, if the pointer is null
-    // then the release message is not sent to it.
-    delegate = nil;
-    [self setLength:nil];
-
-    [url release];
-    [subitems release];
-    [metaDictionary release];
-
-    libvlc_media_descriptor_release( p_md );
-
-    [super dealloc];
-}
-
-- (NSString *)description
-{
-    NSString * result = [metaDictionary objectForKey:VLCMetaInformationTitle];
-    return [NSString stringWithFormat:@"<%@ %p> %@", [self className], self, (result ? result : [url absoluteString])];
-}
-
-- (NSComparisonResult)compare:(VLCMedia *)media
-{
-    if (self == media)
-        return NSOrderedSame;
-    if (!media)
-        return NSOrderedDescending;
-    return p_md == [media libVLCMediaDescriptor] ? NSOrderedSame : NSOrderedAscending;
-}
-
-@synthesize delegate;
-
-- (VLCTime *)length
-{
-    if (!length) 
-    {
-        // Try figuring out what the length is
-        long long duration = libvlc_media_descriptor_get_duration( p_md, NULL );
-        if (duration > -1) 
-        {
-            [self setLength:[VLCTime timeWithNumber:[NSNumber numberWithLongLong:duration]]];
-            return [[length retain] autorelease];
-        } 
-    }
-    return [VLCTime nullTime];
-}
-
-- (VLCTime *)lengthWaitUntilDate:(NSDate *)aDate
-{
-    static const long long thread_sleep = 10000;
-
-    if (!length)
-    {
-        while (!length && ![self isPreparsed] && [aDate timeIntervalSinceNow] > 0)
-        {
-            usleep( thread_sleep );
-        }
-        
-        // So we're done waiting, but sometimes we trap the fact that the parsing
-        // was done before the length gets assigned, so lets go ahead and assign
-        // it ourselves.
-        if (!length)
-            return [self length];
-    }
-
-    return [[length retain] autorelease];
-}
-
-- (BOOL)isPreparsed
-{
-    return libvlc_media_descriptor_is_preparsed( p_md, NULL );
-}
-
-@synthesize url;
-@synthesize subitems;
-@synthesize metaDictionary;
-@synthesize state;
-
-@end
-
-/******************************************************************************
- * Implementation VLCMedia (LibVLCBridging)
- */
-@implementation VLCMedia (LibVLCBridging)
-
-+ (id)mediaWithLibVLCMediaDescriptor:(void *)md
-{
-    return [[[VLCMedia alloc] initWithLibVLCMediaDescriptor:md] autorelease];
-}
-
-- (id)initWithLibVLCMediaDescriptor:(void *)md
-{
-    if (self = [super init])
-    {
-        libvlc_exception_t ex;
-        libvlc_exception_init( &ex );
-                
-        libvlc_media_descriptor_retain( md );
-        p_md = md;
-        
-        metaDictionary = [[NSMutableDictionary alloc] initWithCapacity:3];
-        [self initInternalMediaDescriptor];
-    }
-    return self;
-}
-
-- (void *)libVLCMediaDescriptor 
-{
-    return p_md;
-}
-
-+ (id)mediaWithMedia:(VLCMedia *)media andLibVLCOptions:(NSDictionary *)options
-{
-    libvlc_media_descriptor_t * p_md;
-    p_md = libvlc_media_descriptor_duplicate( [media libVLCMediaDescriptor] );
-    for( NSString * key in [options allKeys] )
-    {
-        NSLog(@"Adding %@", [NSString stringWithFormat:@"--%@ %@", key, [options objectForKey:key]]);
-        libvlc_media_descriptor_add_option(p_md, [[NSString stringWithFormat:@"%@=#%@", key, [options objectForKey:key]] UTF8String], NULL);
-    }
-    return [VLCMedia mediaWithLibVLCMediaDescriptor:p_md];
-}
-
-@end
-
-/******************************************************************************
- * Implementation VLCMedia (Private)
- */
-@implementation VLCMedia (Private)
-
-+ (libvlc_meta_t)stringToMetaType:(NSString *)string
-{
-    static NSDictionary * stringToMetaDictionary = nil;
-    // TODO: Thread safe-ize
-    if( !stringToMetaDictionary )
-    {
-#define VLCStringToMeta( name ) [NSNumber numberWithInt: libvlc_meta_##name], VLCMetaInformation##name
-        stringToMetaDictionary =
-            [[NSDictionary dictionaryWithObjectsAndKeys:
-                VLCStringToMeta(Title),
-                VLCStringToMeta(Artist),
-                VLCStringToMeta(Genre),
-                VLCStringToMeta(Copyright),
-                VLCStringToMeta(Album),
-                VLCStringToMeta(TrackNumber),
-                VLCStringToMeta(Description),
-                VLCStringToMeta(Rating),
-                VLCStringToMeta(Date),
-                VLCStringToMeta(Setting),
-                VLCStringToMeta(URL),
-                VLCStringToMeta(Language),
-                VLCStringToMeta(NowPlaying),
-                VLCStringToMeta(Publisher),
-                VLCStringToMeta(ArtworkURL),
-                VLCStringToMeta(TrackID),
-                nil] retain];
-#undef VLCStringToMeta
-    }
-    NSNumber * number = [stringToMetaDictionary objectForKey:string];
-    return number ? [number intValue] : -1;
-}
-
-+ (NSString *)metaTypeToString:(libvlc_meta_t)type
-{
-#define VLCMetaToString( name, type )   if (libvlc_meta_##name == type) return VLCMetaInformation##name;
-    VLCMetaToString(Title, type);
-    VLCMetaToString(Artist, type);
-    VLCMetaToString(Genre, type);
-    VLCMetaToString(Copyright, type);
-    VLCMetaToString(Album, type);
-    VLCMetaToString(TrackNumber, type);
-    VLCMetaToString(Description, type);
-    VLCMetaToString(Rating, type);
-    VLCMetaToString(Date, type);
-    VLCMetaToString(Setting, type);
-    VLCMetaToString(URL, type);
-    VLCMetaToString(Language, type);
-    VLCMetaToString(NowPlaying, type);
-    VLCMetaToString(Publisher, type);
-    VLCMetaToString(ArtworkURL, type);
-    VLCMetaToString(TrackID, type);
-#undef VLCMetaToString
-    return nil;
-}
-
-- (void)initInternalMediaDescriptor
-{
-    libvlc_exception_t ex;
-    libvlc_exception_init( &ex );
-
-    char * p_url = libvlc_media_descriptor_get_mrl( p_md, &ex );
-    catch_exception( &ex );
-
-    url = [[NSURL URLWithString:[NSString stringWithUTF8String:p_url]] retain];
-    if( !url ) /* Attempt to interpret as a file path then */
-        url = [[NSURL fileURLWithPath:[NSString stringWithUTF8String:p_url]] retain];
-    free( p_url );
-
-    libvlc_media_descriptor_set_user_data( p_md, (void*)self, &ex );
-    catch_exception( &ex );
-
-    libvlc_event_manager_t * p_em = libvlc_media_descriptor_event_manager( p_md, &ex );
-    libvlc_event_attach(p_em, libvlc_MediaDescriptorMetaChanged,     HandleMediaMetaChanged,     self, &ex);
-//    libvlc_event_attach(p_em, libvlc_MediaDescriptorDurationChanged, HandleMediaDurationChanged, self, &ex);
-    libvlc_event_attach(p_em, libvlc_MediaDescriptorStateChanged,    HandleMediaStateChanged,    self, &ex);
-    libvlc_event_attach(p_em, libvlc_MediaDescriptorSubItemAdded,    HandleMediaSubItemAdded,    self, &ex);
-    catch_exception( &ex );
-    
-    libvlc_media_list_t * p_mlist = libvlc_media_descriptor_subitems( p_md, NULL );
-
-    if (!p_mlist)
-        subitems = nil;
-    else
-    {
-        subitems = [[VLCMediaList mediaListWithLibVLCMediaList:p_mlist] retain];
-        libvlc_media_list_release( p_mlist );
-    }
-
-    state = LibVLCStateToMediaState(libvlc_media_descriptor_get_state( p_md, NULL ));
-    /* Force VLCMetaInformationTitle, that will trigger preparsing
-     * And all the other meta will be added through the libvlc event system */
-    [self fetchMetaInformationFromLibVLCWithType: VLCMetaInformationTitle];
-}
-
-- (void)fetchMetaInformationFromLibVLCWithType:(NSString *)metaType
-{
-    char * psz_value = libvlc_media_descriptor_get_meta( p_md, [VLCMedia stringToMetaType:metaType], NULL);
-    NSString * newValue = psz_value ? [NSString stringWithUTF8String: psz_value] : nil;
-    NSString * oldValue = [metaDictionary valueForKey:metaType];
-    free(psz_value);
-
-    if ( !(newValue && oldValue && [oldValue compare:newValue] == NSOrderedSame) )
-    {
-        if ([metaType isEqualToString:VLCMetaInformationArtworkURL])
-        {
-            [NSThread detachNewThreadSelector:@selector(fetchMetaInformationForArtWorkWithURL:) 
-                                         toTarget:self
-                                       withObject:newValue];
-            return;
-        }
-
-        [metaDictionary setValue:newValue forKeyPath:metaType];
-    }
-}
-
-- (void)fetchMetaInformationForArtWorkWithURL:(NSString *)anURL
-{
-    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-    
-    // Go ahead and load up the art work
-    NSURL * artUrl = [NSURL URLWithString:[anURL stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
-    NSImage * art  = [[[NSImage alloc] initWithContentsOfURL:artUrl] autorelease]; 
-        
-    // If anything was found, lets save it to the meta data dictionary
-    if (art)
-    {
-        [self performSelectorOnMainThread:@selector(setArtwork:) withObject:art waitUntilDone:NO];
-    }
-
-    [pool release];
-}
-
-- (void)setArtwork:(NSImage *)art
-{
-    [metaDictionary setObject:art forKey:@"artwork"];
-}
-
-- (void)metaChanged:(NSString *)metaType
-{
-    [self fetchMetaInformationFromLibVLCWithType:metaType];
-}
-
-- (void)subItemAdded
-{
-    if( subitems )
-        return; /* Nothing to do */
-
-    libvlc_media_list_t * p_mlist = libvlc_media_descriptor_subitems( p_md, NULL );
-
-    NSAssert( p_mlist, @"The mlist shouldn't be nil, we are receiving a subItemAdded");
-
-    [self willChangeValueForKey:@"subitems"];
-    subitems = [[VLCMediaList mediaListWithLibVLCMediaList:p_mlist] retain];
-    [self didChangeValueForKey:@"subitems"];
-    libvlc_media_list_release( p_mlist );
-}
-
-- (void)setStateAsNumber:(NSNumber *)newStateAsNumber
-{
-    [self setState: [newStateAsNumber intValue]];
-}
-@end
-
-/******************************************************************************
- * Implementation VLCMedia (VLCMediaPlayerBridging)
- */
-
-@implementation VLCMedia (VLCMediaPlayerBridging)
-
-- (void)setLength:(VLCTime *)value
-{
-    if (length && value && [length compare:value] == NSOrderedSame)
-        return;
-        
-    [length release];       
-    length = value ? [value retain] : nil;
-}
-
-@end
diff --git a/extras/package/macosx/Framework/Sources/VLCMediaDiscoverer.m b/extras/package/macosx/Framework/Sources/VLCMediaDiscoverer.m
deleted file mode 100644 (file)
index 9957437..0000000
+++ /dev/null
@@ -1,178 +0,0 @@
-/*****************************************************************************
- * VLCMediaDiscoverer.m: VLC.framework VLCMediaDiscoverer implementation
- *****************************************************************************
- * Copyright (C) 2007 Pierre d'Herbemont
- * Copyright (C) 2007 the VideoLAN team
- * $Id$
- *
- * Authors: Pierre d'Herbemont <pdherbemont # videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import <Cocoa/Cocoa.h>
-#import "VLCMediaDiscoverer.h"
-#import "VLCLibrary.h"
-#import "VLCLibVLCBridging.h"
-#import "VLCEventManager.h"
-
-#include <vlc/libvlc.h>
-
-static NSMutableArray * availableMediaDiscoverer = nil;     // Global list of media discoverers
-
-/**
- * Declares call back functions to be used with libvlc event callbacks.
- */
-@interface VLCMediaDiscoverer (Private)
-/**
- * TODO: Documention
- */
-- (void)mediaDiscovererStarted;
-
-/**
- * TODO: Documention
- */
-- (void)mediaDiscovererEnded;
-@end
-
-/* libvlc event callback */
-static void HandleMediaDiscovererStarted(const libvlc_event_t * event, void * user_data)
-{
-    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-    id self = user_data;
-    [[VLCEventManager sharedManager] callOnMainThreadObject:self 
-                                                 withMethod:@selector(mediaDiscovererStarted) 
-                                       withArgumentAsObject:nil];
-    [pool release];
-}
-
-static void HandleMediaDiscovererEnded( const libvlc_event_t * event, void * user_data)
-{
-    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-    id self = user_data;
-    [[VLCEventManager sharedManager] callOnMainThreadObject:self 
-                                                 withMethod:@selector(mediaDiscovererEnded) 
-                                       withArgumentAsObject:nil];
-    [pool release];
-}
-
-@implementation VLCMediaDiscoverer
-+ (NSArray *)availableMediaDiscoverer
-{
-    if( !availableMediaDiscoverer )
-    {
-        availableMediaDiscoverer = [[NSArray arrayWithObjects:
-                                [[[VLCMediaDiscoverer alloc] initWithName:@"sap"] autorelease],
-                                [[[VLCMediaDiscoverer alloc] initWithName:@"shoutcast"] autorelease],
-                                [[[VLCMediaDiscoverer alloc] initWithName:@"shoutcasttv"] autorelease], nil] retain];
-    }
-    return availableMediaDiscoverer;
-}
-
-- (id)initWithName:(NSString *)aServiceName
-{
-    if (self = [super init])
-    {
-        libvlc_exception_t ex;
-        libvlc_exception_init( &ex );
-        localizedName = nil;
-        discoveredMedia = nil;
-        mdis = libvlc_media_discoverer_new_from_name( [VLCLibrary sharedInstance],
-                                                      [aServiceName UTF8String],
-                                                      &ex );
-        catch_exception( &ex );       
-
-        libvlc_event_manager_t * p_em = libvlc_media_discoverer_event_manager(mdis);
-        libvlc_event_attach(p_em, libvlc_MediaDiscovererStarted, HandleMediaDiscovererStarted, self, NULL);
-        libvlc_event_attach(p_em, libvlc_MediaDiscovererEnded,   HandleMediaDiscovererEnded,   self, NULL);
-        running = libvlc_media_discoverer_is_running(mdis);
-    }
-    return self;
-}
-
-- (void)release
-{
-    @synchronized(self)
-    {
-        if([self retainCount] <= 1)
-        {
-            /* We must make sure we won't receive new event after an upcoming dealloc
-             * We also may receive a -retain in some event callback that may occcur
-             * Before libvlc_event_detach. So this can't happen in dealloc */
-            libvlc_event_manager_t * p_em = libvlc_media_list_event_manager(mdis, NULL);
-            libvlc_event_detach(p_em, libvlc_MediaDiscovererStarted, HandleMediaDiscovererStarted, self, NULL);
-            libvlc_event_detach(p_em, libvlc_MediaDiscovererEnded,   HandleMediaDiscovererEnded,   self, NULL);
-        }
-        [super release];
-    }
-}
-
-- (void)dealloc
-{
-    [localizedName release];
-    [discoveredMedia release];
-    libvlc_media_discoverer_release( mdis );
-    [super dealloc];
-}
-
-- (VLCMediaList *) discoveredMedia
-{
-    if( discoveredMedia )
-        return discoveredMedia;
-
-    libvlc_media_list_t * p_mlist = libvlc_media_discoverer_media_list( mdis );
-    VLCMediaList * ret = [VLCMediaList mediaListWithLibVLCMediaList:p_mlist];
-    libvlc_media_list_release( p_mlist );
-
-    discoveredMedia = [ret retain];
-    return discoveredMedia;
-}
-
-- (NSString *)localizedName
-{
-    if ( localizedName )
-        return localizedName;
-    
-    char * name = libvlc_media_discoverer_localized_name( mdis );
-    if (name)
-    {
-        localizedName = [[NSString stringWithUTF8String:name] retain];
-        free( name );
-    }
-    return localizedName;
-}
-
-- (BOOL)isRunning
-{
-    return running;
-}
-@end
-
-@implementation VLCMediaDiscoverer (Private)
-- (void)mediaDiscovererStarted
-{
-    [self willChangeValueForKey:@"running"];
-    running = YES;
-    [self didChangeValueForKey:@"running"];
-}
-
-- (void)mediaDiscovererEnded
-{
-    [self willChangeValueForKey:@"running"];
-    running = NO;
-    [self didChangeValueForKey:@"running"];
-}
-@end
diff --git a/extras/package/macosx/Framework/Sources/VLCMediaLibrary.m b/extras/package/macosx/Framework/Sources/VLCMediaLibrary.m
deleted file mode 100644 (file)
index d850ee0..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-/*****************************************************************************
- * VLCMediaDiscoverer.m: VLC.framework VLCMediaDiscoverer implementation
- *****************************************************************************
- * Copyright (C) 2007 Pierre d'Herbemont
- * Copyright (C) 2007 the VideoLAN team
- * $Id$
- *
- * Authors: Pierre d'Herbemont <pdherbemont # videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import <Cocoa/Cocoa.h>
-#import "VLCMediaLibrary.h"
-#import "VLCLibrary.h"
-#import "VLCLibVLCBridging.h"
-
-#include <vlc/libvlc.h>
-
-@implementation VLCMediaLibrary
-+ (id)sharedMediaLibrary
-{
-    static VLCMediaLibrary * sharedMediaLibrary = nil;
-    if( !sharedMediaLibrary )
-    {
-        sharedMediaLibrary = [[VLCMediaLibrary alloc] init];
-    }
-    return sharedMediaLibrary;
-}
-
-- (id)init
-{
-    if (self = [super init])
-    {
-        libvlc_exception_t p_e;
-        libvlc_exception_init( &p_e );
-        mlib = libvlc_media_library_new( [VLCLibrary sharedInstance], &p_e );
-        catch_exception( &p_e );
-        
-        libvlc_media_library_load( mlib, &p_e );
-        catch_exception( &p_e );
-        
-        allMedia = nil;
-    }
-    return self;
-}
-
-- (void)dealloc
-{
-    [allMedia release];
-    
-    libvlc_media_library_release(mlib);
-    mlib = nil;     // make sure that the pointer is dead
-    
-    [super dealloc];
-}
-
-- (VLCMediaList *)allMedia
-{
-    if( !allMedia )
-    {
-        libvlc_media_list_t * p_mlist = libvlc_media_library_media_list( mlib, NULL );
-        allMedia = [[VLCMediaList mediaListWithLibVLCMediaList:p_mlist] retain];
-        libvlc_media_list_release(p_mlist);
-    }
-    return allMedia;
-}
-@end
diff --git a/extras/package/macosx/Framework/Sources/VLCMediaList.m b/extras/package/macosx/Framework/Sources/VLCMediaList.m
deleted file mode 100644 (file)
index 9fc4e2b..0000000
+++ /dev/null
@@ -1,346 +0,0 @@
-/*****************************************************************************
- * VLCMediaList.m: VLC.framework VLCMediaList implementation
- *****************************************************************************
- * Copyright (C) 2007 Pierre d'Herbemont
- * Copyright (C) 2007 the VideoLAN team
- * $Id$
- *
- * Authors: Pierre d'Herbemont <pdherbemont # videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import "VLCMediaList.h"
-#import "VLCLibrary.h"
-#import "VLCEventManager.h"
-#import "VLCLibVLCBridging.h"
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <vlc/vlc.h>
-#include <vlc/libvlc.h>
-
-/* Notification Messages */
-NSString * VLCMediaListItemAdded        = @"VLCMediaListItemAdded";
-NSString * VLCMediaListItemDeleted      = @"VLCMediaListItemDeleted";
-
-// TODO: Documentation
-@interface VLCMediaList (Private)
-/* Initializers */
-- (void)initInternalMediaList;
-
-/* Libvlc event bridges */
-- (void)mediaListItemAdded:(NSArray *)args;
-- (void)mediaListItemRemoved:(NSNumber *)index;
-@end
-
-/* libvlc event callback */
-static void HandleMediaListItemAdded(const libvlc_event_t * event, void * user_data)
-{
-    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-    id self = user_data;
-    [[VLCEventManager sharedManager] callOnMainThreadObject:self 
-                                                 withMethod:@selector(mediaListItemAdded:) 
-                                       withArgumentAsObject:[NSArray arrayWithObject:[NSDictionary dictionaryWithObjectsAndKeys:
-                                                          [VLCMedia mediaWithLibVLCMediaDescriptor:event->u.media_list_item_added.item], @"media",
-                                                          [NSNumber numberWithInt:event->u.media_list_item_added.index], @"index",
-                                                          nil]]];
-    [pool release];
-}
-
-static void HandleMediaListItemDeleted( const libvlc_event_t * event, void * user_data)
-{
-    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-    id self = user_data;
-    [[VLCEventManager sharedManager] callOnMainThreadObject:self 
-                                                 withMethod:@selector(mediaListItemRemoved:) 
-                                       withArgumentAsObject:[NSNumber numberWithInt:event->u.media_list_item_deleted.index]];
-    [pool release];
-}
-
-@implementation VLCMediaList
-- (id)init
-{
-    if (self = [super init])
-    {
-        // Create a new libvlc media list instance
-        libvlc_exception_t p_e;
-        libvlc_exception_init( &p_e );
-        p_mlist = libvlc_media_list_new( [VLCLibrary sharedInstance], &p_e );
-        catch_exception( &p_e );
-        
-        // Initialize internals to defaults
-        cachedMedia = [[NSMutableArray alloc] init];
-        delegate = flatAspect = hierarchicalAspect = hierarchicalNodeAspect = nil;
-        [self initInternalMediaList];
-    }
-    return self;
-}
-
-- (void)release
-{
-    @synchronized(self)
-    {
-        if([self retainCount] <= 1)
-        {
-            /* We must make sure we won't receive new event after an upcoming dealloc
-             * We also may receive a -retain in some event callback that may occcur
-             * Before libvlc_event_detach. So this can't happen in dealloc */
-            libvlc_event_manager_t * p_em = libvlc_media_list_event_manager(p_mlist, NULL);
-            libvlc_event_detach(p_em, libvlc_MediaListItemDeleted, HandleMediaListItemDeleted, self, NULL);
-            libvlc_event_detach(p_em, libvlc_MediaListItemAdded,   HandleMediaListItemAdded,   self, NULL);
-        }
-        [super release];
-    }
-}
-
-- (void)dealloc
-{
-    // Release allocated memory
-    delegate = nil;
-    
-    libvlc_media_list_release( p_mlist );
-    [cachedMedia release];
-    [flatAspect release];
-    [hierarchicalAspect release];
-    [hierarchicalNodeAspect release];
-    [super dealloc];
-}
-
-- (NSString *)description
-{
-    NSMutableString * content = [NSMutableString string];
-    int i;
-    for( i = 0; i < [self count]; i++)
-    {
-        [content appendFormat:@"%@\n", [self mediaAtIndex: i]];
-    }
-    return [NSString stringWithFormat:@"<%@ %p> {\n%@}", [self className], self, content];
-}
-
-- (void)lock
-{
-    libvlc_media_list_lock( p_mlist );
-}
-
-- (void)unlock
-{
-    libvlc_media_list_unlock( p_mlist );
-}
-
-- (int)addMedia:(VLCMedia *)media
-{
-    int index = [self count];
-    [self insertMedia:media atIndex:index];
-    return index;
-}
-
-- (void)insertMedia:(VLCMedia *)media atIndex: (int)index
-{
-    [media retain];
-
-    // Add it to the libvlc's medialist
-    libvlc_exception_t p_e;
-    libvlc_exception_init( &p_e );
-    libvlc_media_list_insert_media_descriptor( p_mlist, [media libVLCMediaDescriptor], index, &p_e );
-    catch_exception( &p_e );
-}
-
-- (void)removeMediaAtIndex:(int)index
-{
-    [[self mediaAtIndex:index] release];
-
-    // Remove it from the libvlc's medialist
-    libvlc_exception_t p_e;
-    libvlc_exception_init( &p_e );
-    libvlc_media_list_remove_index( p_mlist, index, &p_e );
-    catch_exception( &p_e );
-}
-
-- (VLCMedia *)mediaAtIndex:(int)index
-{
-    return [cachedMedia objectAtIndex:index];
-}
-
-- (int)indexOfMedia:(VLCMedia *)media
-{
-    libvlc_exception_t p_e;
-    libvlc_exception_init( &p_e );
-    int result = libvlc_media_list_index_of_item( p_mlist, [media libVLCMediaDescriptor], &p_e );
-    catch_exception( &p_e );
-    
-    return result;
-}
-
-/* KVC Compliance: For the @"media" key */
-- (int)countOfMedia
-{
-    return [self count];
-}
-
-- (id)objectInMediaAtIndex:(int)i
-{
-    return [self mediaAtIndex:i];
-}
-
-- (int)count
-{
-    return [cachedMedia count];
-}
-
-@synthesize delegate;
-
-- (BOOL)isReadOnly
-{
-    libvlc_exception_t p_e;
-    libvlc_exception_init( &p_e );
-    BOOL isReadOnly = libvlc_media_list_is_readonly( p_mlist );
-    catch_exception( &p_e );
-    
-    return isReadOnly;
-}
-
-/* Media list aspect */
-- (VLCMediaListAspect *)hierarchicalAspect
-{
-    if( hierarchicalAspect )
-        return hierarchicalAspect;
-    
-    libvlc_media_list_view_t * p_mlv = libvlc_media_list_hierarchical_view( p_mlist, NULL );
-    hierarchicalAspect = [[VLCMediaListAspect mediaListAspectWithLibVLCMediaListView:p_mlv andMediaList:self] retain];
-    libvlc_media_list_view_release( p_mlv );
-    return hierarchicalAspect;
-}
-
-- (VLCMediaListAspect *)hierarchicalNodeAspect
-{
-    if( hierarchicalNodeAspect )
-        return hierarchicalNodeAspect;
-    
-    libvlc_media_list_view_t * p_mlv = libvlc_media_list_hierarchical_node_view( p_mlist, NULL );
-    hierarchicalNodeAspect = [[VLCMediaListAspect mediaListAspectWithLibVLCMediaListView:p_mlv andMediaList:self] retain];
-    libvlc_media_list_view_release( p_mlv );
-    return hierarchicalNodeAspect;
-}
-
-- (VLCMediaListAspect *)flatAspect
-{
-    if( flatAspect )
-        return flatAspect;
-    
-    libvlc_media_list_view_t * p_mlv = libvlc_media_list_flat_view( p_mlist, NULL );
-    flatAspect = [[VLCMediaListAspect mediaListAspectWithLibVLCMediaListView:p_mlv andMediaList:self] retain];
-    libvlc_media_list_view_release( p_mlv );
-    return flatAspect;
-}
-
-@end
-
-@implementation VLCMediaList (LibVLCBridging)
-+ (id)mediaListWithLibVLCMediaList:(void *)p_new_mlist;
-{
-    return [[[VLCMediaList alloc] initWithLibVLCMediaList:p_new_mlist] autorelease];
-}
-
-- (id)initWithLibVLCMediaList:(void *)p_new_mlist;
-{
-    if( self = [super init] )
-    {
-        p_mlist = p_new_mlist;
-        libvlc_media_list_retain( p_mlist );
-        libvlc_media_list_lock( p_mlist );
-        cachedMedia = [[NSMutableArray alloc] initWithCapacity:libvlc_media_list_count( p_mlist, NULL )];
-
-        int i, count = libvlc_media_list_count( p_mlist, NULL );
-        for( i = 0; i < count; i++ )
-        {
-            libvlc_media_descriptor_t * p_md = libvlc_media_list_item_at_index( p_mlist, i, NULL );
-            [cachedMedia addObject:[VLCMedia mediaWithLibVLCMediaDescriptor:p_md]];
-            libvlc_media_descriptor_release(p_md);
-        }
-        [self initInternalMediaList];
-        libvlc_media_list_unlock(p_mlist);
-    }
-    return self;
-}
-
-- (void *)libVLCMediaList
-{
-    return p_mlist;
-}
-@end
-
-@implementation VLCMediaList (Private)
-- (void)initInternalMediaList
-{
-    // Add event callbacks
-    libvlc_exception_t p_e;
-    libvlc_exception_init( &p_e );
-
-    libvlc_event_manager_t * p_em = libvlc_media_list_event_manager( p_mlist, &p_e );
-    libvlc_event_attach( p_em, libvlc_MediaListItemAdded,   HandleMediaListItemAdded,   self, &p_e );
-    libvlc_event_attach( p_em, libvlc_MediaListItemDeleted, HandleMediaListItemDeleted, self, &p_e );
-    
-    catch_exception( &p_e );
-}
-
-- (void)mediaListItemAdded:(NSArray *)arrayOfArgs
-{
-    /* We hope to receive index in a nide range, that could change one day */
-    int start = [[[arrayOfArgs objectAtIndex: 0] objectForKey:@"index"] intValue];
-    int end = [[[arrayOfArgs objectAtIndex: [arrayOfArgs count]-1] objectForKey:@"index"] intValue];
-    NSRange range = NSMakeRange(start, end-start);
-
-    [self willChange:NSKeyValueChangeInsertion valuesAtIndexes:[NSIndexSet indexSetWithIndexesInRange:range] forKey:@"media"];
-    for( NSDictionary * args in arrayOfArgs )
-    {
-        int index = [[args objectForKey:@"index"] intValue];
-        VLCMedia * media = [args objectForKey:@"media"];
-        /* Sanity check */
-        if( index && index > [cachedMedia count] )
-            index = [cachedMedia count];
-        [cachedMedia insertObject:media atIndex:index];
-    }
-    [self didChange:NSKeyValueChangeInsertion valuesAtIndexes:[NSIndexSet indexSetWithIndexesInRange:range] forKey:@"media"];
-
-    // Post the notification
-//    [[NSNotificationCenter defaultCenter] postNotificationName:VLCMediaListItemAdded
-//                                                        object:self
-//                                                      userInfo:args];
-
-    // Let the delegate know that the item was added
-  //  if (delegate && [delegate respondsToSelector:@selector(mediaList:mediaAdded:atIndex:)])
-    //    [delegate mediaList:self mediaAdded:media atIndex:index];
-}
-
-- (void)mediaListItemRemoved:(NSNumber *)index
-{
-    [self willChange:NSKeyValueChangeInsertion valuesAtIndexes:[NSIndexSet indexSetWithIndex:[index intValue]] forKey:@"media"];
-    [cachedMedia removeObjectAtIndex:[index intValue]];
-    [self didChange:NSKeyValueChangeInsertion valuesAtIndexes:[NSIndexSet indexSetWithIndex:[index intValue]] forKey:@"media"];
-
-    // Post the notification
-    [[NSNotificationCenter defaultCenter] postNotificationName:VLCMediaListItemDeleted 
-                                                        object:self
-                                                      userInfo:[NSDictionary dictionaryWithObjectsAndKeys:
-                                                          index, @"index",
-                                                          nil]];
-
-    // Let the delegate know that the item is being removed
-    if (delegate && [delegate respondsToSelector:@selector(mediaList:mediaRemovedAtIndex:)])
-        [delegate mediaList:self mediaRemovedAtIndex:[index intValue]];
-}
-@end
diff --git a/extras/package/macosx/Framework/Sources/VLCMediaListAspect.m b/extras/package/macosx/Framework/Sources/VLCMediaListAspect.m
deleted file mode 100644 (file)
index aa7411b..0000000
+++ /dev/null
@@ -1,287 +0,0 @@
-/*****************************************************************************
- * VLCMediaList.m: VLC.framework VLCMediaList implementation
- *****************************************************************************
- * Copyright (C) 2007 Pierre d'Herbemont
- * Copyright (C) 2007 the VideoLAN team
- * $Id$
- *
- * Authors: Pierre d'Herbemont <pdherbemont # videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import "VLCMediaListAspect.h"
-#import "VLCLibrary.h"
-#import "VLCEventManager.h"
-#import "VLCLibVLCBridging.h"
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <vlc/vlc.h>
-#include <vlc/libvlc.h>
-
-// TODO: Documentation
-@interface VLCMediaListAspect (Private)
-/* Initializers */
-- (void)initInternalMediaListView;
-
-- (void)mediaListViewItemAdded:(NSArray *)args;
-- (void)mediaListViewItemRemoved:(NSNumber *)index;
-@end
-
-@implementation VLCMediaListAspectNode
-@synthesize media;
-@synthesize children;
-
-- (BOOL)isLeaf
-{
-    return self.children == NULL;
-}
-
--(void)dealloc
-{
-    [self.children release];
-    [super dealloc];
-}
-@end
-
-@implementation VLCMediaListAspect (KeyValueCodingCompliance)
-/* For the @"media" key */
-- (int) countOfMedia
-{
-    return [cachedNode count];
-}
-- (id) objectInMediaAtIndex:(int)i
-{
-    return [[cachedNode objectAtIndex:i] media];
-}
-/* For the @"node" key */
-- (int) countOfNode
-{
-    return [cachedNode count];
-}
-- (id) objectInNodeAtIndex:(int)i
-{
-    return [cachedNode objectAtIndex:i];
-}
-@end
-
-/* libvlc event callback */
-static void HandleMediaListViewItemAdded(const libvlc_event_t * event, void * user_data)
-{
-    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-    id self = user_data;
-    [[VLCEventManager sharedManager] callOnMainThreadObject:self 
-                                                 withMethod:@selector(mediaListViewItemAdded:) 
-                                       withArgumentAsObject:[NSArray arrayWithObject:[NSDictionary dictionaryWithObjectsAndKeys:
-                                                          [VLCMedia mediaWithLibVLCMediaDescriptor:event->u.media_list_item_added.item], @"media",
-                                                          [NSNumber numberWithInt:event->u.media_list_item_added.index], @"index",
-                                                          nil]]];
-    [pool release];
-}
-
-static void HandleMediaListViewItemDeleted( const libvlc_event_t * event, void * user_data)
-{
-    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-    id self = user_data;
-    [[VLCEventManager sharedManager] callOnMainThreadObject:self 
-                                                 withMethod:@selector(mediaListViewItemRemoved:) 
-                                       withArgumentAsObject:[NSNumber numberWithInt:event->u.media_list_item_deleted.index]];
-    [pool release];
-}
-
-@implementation VLCMediaListAspect
-- (void)dealloc
-{
-    // Release allocated memory
-    libvlc_media_list_view_release(p_mlv);
-    [cachedNode release];
-    if( ownHisMediaList )
-        [parentMediaList release];
-    [super dealloc];
-}
-- (NSString *)description
-{
-    NSMutableString * content = [NSMutableString string];
-    int i;
-    for( i = 0; i < [self count]; i++)
-    {
-        [content appendFormat:@"%@\n", [self mediaAtIndex: i]];
-    }
-    return [NSString stringWithFormat:@"<%@ %p> {\n%@}", [self className], self, content];
-}
-
-- (VLCMedia *)mediaAtIndex:(int)index
-{
-    libvlc_exception_t p_e;
-    libvlc_exception_init( &p_e );
-    libvlc_media_descriptor_t * p_md = libvlc_media_list_view_item_at_index( p_mlv, index, &p_e );
-    catch_exception( &p_e );
-    
-    // Returns local object for media descriptor, searchs for user data first.  If not found it creates a 
-    // new cocoa object representation of the media descriptor.
-    return [VLCMedia mediaWithLibVLCMediaDescriptor:p_md];
-}
-
-- (VLCMediaListAspect *)childrenAtIndex:(int)index
-{
-    libvlc_exception_t p_e;
-    libvlc_exception_init( &p_e );
-    libvlc_media_list_view_t * p_sub_mlv = libvlc_media_list_view_children_at_index( p_mlv, index, &p_e );
-    catch_exception( &p_e );
-
-    if( !p_sub_mlv )
-        return nil;
-
-    // Returns local object for media descriptor, searchs for user data first.  If not found it creates a 
-    // new cocoa object representation of the media descriptor.
-    return [VLCMediaListAspect mediaListAspectWithLibVLCMediaListView:p_sub_mlv];
-}
-
-- (VLCMediaListAspectNode *)nodeAtIndex:(int)index
-{
-    VLCMediaListAspectNode * node = [[[VLCMediaListAspectNode alloc] init] autorelease];
-    [node setMedia:[self mediaAtIndex: index]];
-    return node;
-}
-
-- (int)count
-{
-    libvlc_exception_t p_e;
-    libvlc_exception_init( &p_e );
-    int result = libvlc_media_list_view_count( p_mlv, &p_e );
-    catch_exception( &p_e );
-
-    return result;
-}
-
-- (VLCMediaList *)parentMediaList
-{
-    return parentMediaList;
-}
-@end
-
-@implementation VLCMediaListAspect (LibVLCBridging)
-+ (id)mediaListAspectWithLibVLCMediaListView:(libvlc_media_list_view_t *)p_new_mlv
-{
-    return [[[VLCMediaListAspect alloc] initWithLibVLCMediaListView:p_new_mlv andMediaList:nil] autorelease];
-}
-
-+ (id)mediaListAspectWithLibVLCMediaListView:(libvlc_media_list_view_t *)p_new_mlv andMediaList:(VLCMediaList *)mediaList;
-{
-    return [[[VLCMediaListAspect alloc] initWithLibVLCMediaListView:p_new_mlv andMediaList:mediaList] autorelease];
-}
-
-- (id)initWithLibVLCMediaListView:(libvlc_media_list_view_t *)p_new_mlv andMediaList:(VLCMediaList *)mediaList;
-{
-    if( self = [super init] )
-    {
-        p_mlv = p_new_mlv;
-        libvlc_media_list_view_retain(p_mlv);
-
-        /* parentMediaList isn't retained, because we need a mediaList to exists, and not the contrary */
-        parentMediaList = mediaList;
-        ownHisMediaList = NO;
-        if( !parentMediaList )
-        {
-            /* We have to create it then */
-            libvlc_media_list_view_retain(p_mlv);
-            libvlc_media_list_t * p_mlist = libvlc_media_list_view_parent_media_list(p_mlv, NULL);
-            parentMediaList = [[VLCMediaList mediaListWithLibVLCMediaList: p_mlist] retain];
-            libvlc_media_list_release( p_mlist );
-            /* This is an exception, and we owns it here */
-            ownHisMediaList = YES;
-        }
-
-        cachedNode = [[NSMutableArray alloc] initWithCapacity:libvlc_media_list_view_count(p_mlv, NULL)];
-        libvlc_media_list_t * p_mlist;
-        p_mlist = libvlc_media_list_view_parent_media_list( p_mlv, NULL );
-        libvlc_media_list_lock( p_mlist );
-        int i, count = libvlc_media_list_view_count(p_mlv, NULL);
-        for( i = 0; i < count; i++ )
-        {
-            libvlc_media_descriptor_t * p_md = libvlc_media_list_view_item_at_index(p_mlv, i, NULL);
-            libvlc_media_list_view_t * p_sub_mlv = libvlc_media_list_view_children_at_index(p_mlv, i, NULL);
-            VLCMediaListAspectNode * node = [[[VLCMediaListAspectNode alloc] init] autorelease];
-            [node setMedia:[VLCMedia mediaWithLibVLCMediaDescriptor: p_md]];
-            [node setChildren: p_sub_mlv ? [VLCMediaListAspect mediaListAspectWithLibVLCMediaListView: p_sub_mlv] : nil];
-            [cachedNode addObject:node];
-            libvlc_media_descriptor_release(p_md);
-            if( p_sub_mlv ) libvlc_media_list_view_release(p_sub_mlv);
-        }
-        [self initInternalMediaListView];
-        libvlc_media_list_unlock( p_mlist );
-        libvlc_media_list_release( p_mlist );
-    }
-    return self;
-}
-
-- (libvlc_media_list_view_t *)libVLCMediaListView
-{
-    return (libvlc_media_list_view_t *)p_mlv;
-}
-@end
-
-@implementation VLCMediaListAspect (Private)
-- (void)initInternalMediaListView
-{
-    libvlc_exception_t e;
-    libvlc_exception_init( &e );
-
-    libvlc_event_manager_t * p_em = libvlc_media_list_event_manager( p_mlv, &e );
-
-    /* Add internal callback */
-    libvlc_event_attach( p_em, libvlc_MediaListViewItemAdded,   HandleMediaListViewItemAdded,   self, &e );
-    libvlc_event_attach( p_em, libvlc_MediaListViewItemDeleted, HandleMediaListViewItemDeleted, self, &e );
-    catch_exception( &e );
-}
-
-- (void)mediaListViewItemAdded:(NSArray *)arrayOfArgs
-{
-    NSAssert([NSThread isMainThread], @"We are not on main thread");
-
-    /* We hope to receive index in a nide range, that could change one day */
-    int start = [[[arrayOfArgs objectAtIndex: 0] objectForKey:@"index"] intValue];
-    int end = [[[arrayOfArgs objectAtIndex: [arrayOfArgs count]-1] objectForKey:@"index"] intValue];
-    NSRange range = NSMakeRange(start, end-start);
-
-    [self willChange:NSKeyValueChangeInsertion valuesAtIndexes:[NSIndexSet indexSetWithIndexesInRange:range] forKey:@"media"];
-    [self willChange:NSKeyValueChangeInsertion valuesAtIndexes:[NSIndexSet indexSetWithIndexesInRange:range] forKey:@"node"];
-    for( NSDictionary * args in arrayOfArgs )
-    {
-        int index = [[args objectForKey:@"index"] intValue];
-        VLCMedia * media = [args objectForKey:@"media"];
-        VLCMediaListAspectNode * node = [[[VLCMediaListAspectNode alloc] init] autorelease];
-        [node setMedia:media];
-        [node setChildren:[self childrenAtIndex:index]];
-        /* Sanity check */
-        if( index && index > [cachedNode count] )
-            index = [cachedNode count];
-        [cachedNode insertObject:node atIndex:index];
-    }
-    [self didChange:NSKeyValueChangeInsertion valuesAtIndexes:[NSIndexSet indexSetWithIndexesInRange:range] forKey:@"node"];
-    [self didChange:NSKeyValueChangeInsertion valuesAtIndexes:[NSIndexSet indexSetWithIndexesInRange:range] forKey:@"media"];
-}
-
-- (void)mediaListViewItemRemoved:(NSNumber *)index
-{
-    [self willChange:NSKeyValueChangeInsertion valuesAtIndexes:[NSIndexSet indexSetWithIndex:[index intValue]] forKey:@"media"];
-    [self willChange:NSKeyValueChangeInsertion valuesAtIndexes:[NSIndexSet indexSetWithIndex:[index intValue]] forKey:@"node"];
-    [cachedNode removeObjectAtIndex:[index intValue]];
-    [self didChange:NSKeyValueChangeInsertion valuesAtIndexes:[NSIndexSet indexSetWithIndex:[index intValue]] forKey:@"node"];
-    [self didChange:NSKeyValueChangeInsertion valuesAtIndexes:[NSIndexSet indexSetWithIndex:[index intValue]] forKey:@"media"];
-}
-@end
diff --git a/extras/package/macosx/Framework/Sources/VLCMediaPlayer.m b/extras/package/macosx/Framework/Sources/VLCMediaPlayer.m
deleted file mode 100644 (file)
index 76214fe..0000000
+++ /dev/null
@@ -1,685 +0,0 @@
-/*****************************************************************************
- * VLCMediaPlayer.m: VLC.framework VLCMediaPlayer implementation
- *****************************************************************************
- * Copyright (C) 2007 Pierre d'Herbemont
- * Copyright (C) 2007 the VideoLAN team
- * $Id$
- *
- * Authors: Pierre d'Herbemont <pdherbemont # videolan.org>
- *          Faustion Osuna <enrique.osuna # gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import "VLCLibrary.h"
-#import "VLCMediaPlayer.h"
-#import "VLCEventManager.h"
-#import "VLCLibVLCBridging.h"
-#import "VLCVideoView.h"
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <vlc/vlc.h>
-
-/* Notification Messages */
-NSString * VLCMediaPlayerTimeChanged    = @"VLCMediaPlayerTimeChanged";
-NSString * VLCMediaPlayerStateChanged   = @"VLCMediaPlayerStateChanged";
-
-NSString * VLCMediaPlayerStateToString(VLCMediaPlayerState state)
-{
-    static NSString * stateToStrings[] = {
-        [VLCMediaPlayerStateStopped]      = @"VLCMediaPlayerStateStopped",
-        [VLCMediaPlayerStateOpening]      = @"VLCMediaPlayerStateOpening",
-        [VLCMediaPlayerStateBuffering]    = @"VLCMediaPlayerStateBuffering",
-        [VLCMediaPlayerStateEnded]        = @"VLCMediaPlayerStateEnded",
-        [VLCMediaPlayerStateError]        = @"VLCMediaPlayerStateError",
-        [VLCMediaPlayerStatePlaying]      = @"VLCMediaPlayerStatePlaying",
-        [VLCMediaPlayerStatePaused]       = @"VLCMediaPlayerStatePaused"
-    };
-    return stateToStrings[state];
-}
-
-/* libvlc event callback */
-static void HandleMediaInstanceVolumeChanged(const libvlc_event_t * event, void * self)
-{
-    [[VLCEventManager sharedManager] callOnMainThreadDelegateOfObject:self
-                                                   withDelegateMethod:@selector(mediaPlayerVolumeChanged:)
-                                                 withNotificationName:VLCMediaPlayerVolumeChanged];
-}
-
-static void HandleMediaTimeChanged(const libvlc_event_t * event, void * self)
-{
-    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-
-    [[VLCEventManager sharedManager] callOnMainThreadObject:self 
-                                                 withMethod:@selector(mediaPlayerTimeChanged:) 
-                                       withArgumentAsObject:[NSNumber numberWithLongLong:event->u.media_instance_time_changed.new_time]];
-
-    [[VLCEventManager sharedManager] callOnMainThreadDelegateOfObject:self
-                                                   withDelegateMethod:@selector(mediaPlayerTimeChanged:)
-                                                 withNotificationName:VLCMediaPlayerTimeChanged];
-    [pool release];
-}
-
-static void HandleMediaPositionChanged(const libvlc_event_t * event, void * self)
-{
-    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-
-    [[VLCEventManager sharedManager] callOnMainThreadObject:self 
-                                                 withMethod:@selector(mediaPlayerPositionChanged:) 
-                                       withArgumentAsObject:[NSNumber numberWithFloat:event->u.media_instance_position_changed.new_position]];
-    [pool release];
-}
-
-static void HandleMediaInstanceStateChanged(const libvlc_event_t * event, void * self)
-{
-    VLCMediaPlayerState newState;
-
-    if( event->type == libvlc_MediaInstancePlayed )
-        newState = VLCMediaPlayerStatePlaying;
-    else if( event->type == libvlc_MediaInstancePaused )
-        newState = VLCMediaPlayerStatePaused;
-    else if( event->type == libvlc_MediaInstanceReachedEnd )
-        newState = VLCMediaPlayerStateStopped;
-    else if( event->type == libvlc_MediaInstanceEncounteredError )
-        newState = VLCMediaPlayerStateError;
-    else
-    {
-        NSLog(@"%s: Unknown event", __FUNCTION__);
-        return;
-    }
-
-    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-
-    [[VLCEventManager sharedManager] callOnMainThreadObject:self 
-                                                 withMethod:@selector(mediaPlayerStateChanged:) 
-                                       withArgumentAsObject:[NSNumber numberWithInt:newState]];
-
-    [[VLCEventManager sharedManager] callOnMainThreadDelegateOfObject:self
-                                                   withDelegateMethod:@selector(mediaPlayerStateChanged:)
-                                                 withNotificationName:VLCMediaPlayerStateChanged];
-
-    [pool release];
-
-}
-
-
-// TODO: Documentation
-@interface VLCMediaPlayer (Private)
-- (id)initWithDrawable:(id)aDrawable;
-
-- (void)registerObservers;
-- (void)unregisterObservers;
-- (void)mediaPlayerTimeChanged:(NSNumber *)newTime;
-- (void)mediaPlayerPositionChanged:(NSNumber *)newTime;
-- (void)mediaPlayerStateChanged:(NSNumber *)newState;
-@end
-
-@implementation VLCMediaPlayer
-
-/* Bindings */
-+ (NSSet *)keyPathsForValuesAffectingValueForKey:(NSString *)key
-{
-    static NSDictionary * dict = nil;
-    NSSet * superKeyPaths;
-    if( !dict )
-    {
-        dict = [[NSDictionary dictionaryWithObjectsAndKeys:
-            [NSSet setWithObject:@"state"], @"playing",
-            [NSSet setWithObjects:@"state", @"media", nil], @"seekable",
-            [NSSet setWithObjects:@"state", @"media", nil], @"canPause",
-            [NSSet setWithObjects:@"state", @"media", nil], @"description",
-            nil] retain];
-    }
-    if( (superKeyPaths = [super keyPathsForValuesAffectingValueForKey: key]) )
-    {
-        NSMutableSet * ret = [NSMutableSet setWithSet:[dict objectForKey: key]];
-        [ret unionSet:superKeyPaths];
-        return ret;
-    }
-    return [dict objectForKey: key];
-}
-
-/* Contructor */
-- (id)init
-{
-    return [self initWithDrawable:nil];
-}
-
-- (id)initWithVideoView:(VLCVideoView *)aVideoView
-{
-    return [self initWithDrawable: aVideoView];
-}
-
-- (id)initWithVideoLayer:(VLCVideoLayer *)aVideoLayer
-{
-    return [self initWithDrawable: aVideoLayer];
-}
-
-- (void)release
-{
-    @synchronized(self)
-    {
-        if([self retainCount] <= 1)
-        {
-            /* We must make sure we won't receive new event after an upcoming dealloc
-             * We also may receive a -retain in some event callback that may occcur
-             * Before libvlc_event_detach. So this can't happen in dealloc */
-            [self unregisterObservers];
-        }
-        [super release];
-    }
-}
-
-- (void)dealloc
-{
-    // Always get rid of the delegate first so we can stop sending messages to it
-    // TODO: Should we tell the delegate that we're shutting down?
-    delegate = nil;
-
-    libvlc_media_instance_release((libvlc_media_instance_t *)instance);
-    
-    // Get rid of everything else
-    [media release];
-    [cachedTime release];
-
-    [super dealloc];
-}
-
-- (void)setDelegate:(id)value
-{
-    delegate = value;
-}
-
-- (id)delegate
-{
-    return delegate;
-}
-
-- (void)setVideoView:(VLCVideoView *)aVideoView
-{    
-    [self setDrawable: aVideoView];
-}
-
-- (void)setVideoLayer:(VLCVideoLayer *)aVideoLayer
-{
-    [self setDrawable: aVideoLayer];
-}
-
-- (void)setDrawable:(id)aDrawable
-{
-    // Make sure that this instance has been associated with the drawing canvas.
-    libvlc_exception_t ex;
-    libvlc_exception_init( &ex );
-    libvlc_media_instance_set_drawable ((libvlc_media_instance_t *)instance, 
-                                        (libvlc_drawable_t)aDrawable, 
-                                        &ex);
-    catch_exception( &ex );
-}
-
-- (id)drawable
-{
-    libvlc_exception_t ex;
-    libvlc_exception_init( &ex );
-    libvlc_drawable_t ret = libvlc_media_instance_get_drawable ((libvlc_media_instance_t *)instance, 
-                                        &ex);
-    catch_exception( &ex );
-    return (id)ret;
-}
-
-- (VLCAudio *)audio
-{
-    return [[VLCLibrary sharedLibrary] audio];
-}
-
-- (void)setVideoAspectRatio:(char *)value
-{
-    libvlc_video_set_aspect_ratio( instance, value, NULL );
-}
-
-- (char *)videoAspectRatio
-{
-    libvlc_exception_t ex;
-    libvlc_exception_init( &ex );
-    char * result = libvlc_video_get_aspect_ratio( instance, &ex );
-    catch_exception( &ex );
-    return result;
-}
-
-- (void)setVideoSubTitles:(int)value
-{
-    libvlc_video_set_spu( instance, value, NULL );
-}
-
-- (int)videoSubTitles
-{
-    libvlc_exception_t ex;
-    libvlc_exception_init( &ex );
-    int result = libvlc_video_get_spu( instance, &ex );
-    catch_exception( &ex );
-    return result;
-}
-
-- (void)setVideoCropGeometry:(char *)value
-{
-    libvlc_video_set_crop_geometry( instance, value, NULL );
-}
-
-- (char *)videoCropGeometry
-{
-    libvlc_exception_t ex;
-    libvlc_exception_init( &ex );
-    char * result = libvlc_video_get_crop_geometry( instance, &ex );
-    catch_exception( &ex );
-    return result;
-}
-
-- (void)setVideoTeleText:(int)value
-{
-    libvlc_video_set_teletext( instance, value, NULL );
-}
-
-- (int)videoTeleText
-{
-    libvlc_exception_t ex;
-    libvlc_exception_init( &ex );
-    int result = libvlc_video_get_teletext( instance, &ex );
-    catch_exception( &ex );
-    return result;
-}
-
-- (void)setRate:(float)value
-{
-    libvlc_media_instance_set_rate( instance, value, NULL );
-}
-
-- (float)rate
-{
-    libvlc_exception_t ex;
-    libvlc_exception_init( &ex );
-    float result = libvlc_media_instance_get_rate( instance, &ex );
-    catch_exception( &ex );
-    return result;
-}
-
-- (NSSize)videoSize
-{
-    libvlc_exception_t ex;
-    libvlc_exception_init( &ex );
-    NSSize result = NSMakeSize(libvlc_video_get_height((libvlc_media_instance_t *)instance, &ex),
-                               libvlc_video_get_width((libvlc_media_instance_t *)instance, &ex));
-    catch_exception( &ex );
-    return result;    
-}
-
-- (BOOL)hasVideoOut
-{
-    libvlc_exception_t ex;
-    libvlc_exception_init( &ex );
-    BOOL result = libvlc_media_instance_has_vout((libvlc_media_instance_t *)instance, &ex);
-    if (libvlc_exception_raised( &ex ))
-    {
-        libvlc_exception_clear( &ex );
-        return NO;
-    }
-    else
-        return result;
-}
-
-- (float)framesPerSecond
-{
-    libvlc_exception_t ex;
-    libvlc_exception_init( &ex );
-    float result = libvlc_media_instance_get_fps( (libvlc_media_instance_t *)instance, &ex );
-    catch_exception( &ex );
-    return result;
-}
-
-- (void)setTime:(VLCTime *)value
-{
-    libvlc_exception_t ex;
-    libvlc_exception_init( &ex );
-    // Time is managed in seconds, while duration is managed in microseconds
-    // TODO: Redo VLCTime to provide value numberAsMilliseconds, numberAsMicroseconds, numberAsSeconds, numberAsMinutes, numberAsHours
-    libvlc_media_instance_set_time( (libvlc_media_instance_t *)instance, 
-                                    (value ? [[value numberValue] longLongValue] / 1000 : 0),
-                                    &ex );
-    catch_exception( &ex );
-}
-
-- (VLCTime *)time
-{
-    return cachedTime;
-}
-
-- (void)setChapter:(int)value;
-{
-    libvlc_media_instance_set_chapter( instance, value, NULL );
-}
-
-- (int)chapter
-{
-    libvlc_exception_t ex;
-    libvlc_exception_init( &ex );
-    int result = libvlc_media_instance_get_chapter( instance, &ex );
-    catch_exception( &ex );
-    return result;
-}
-
-- (int)countOfChapters
-{
-    libvlc_exception_t ex;
-    libvlc_exception_init( &ex );
-    int result = libvlc_media_instance_get_chapter_count( instance, &ex );
-    catch_exception( &ex );
-    return result;
-}
-
-- (void)setAudioTrack:(int)value
-{
-    libvlc_audio_set_track( instance, value, NULL );
-}
-
-- (int)audioTrack
-{
-    libvlc_exception_t ex;
-    libvlc_exception_init( &ex );
-    int result = libvlc_audio_get_track( instance, &ex );
-    catch_exception( &ex );
-    return result;
-}
-
-- (int)countOfAudioTracks
-{
-    libvlc_exception_t ex;
-    libvlc_exception_init( &ex );
-    int result = libvlc_audio_get_track_count( instance, &ex );
-    catch_exception( &ex );
-    return result;
-}
-
-- (void)setAudioChannel:(int)value
-{
-    libvlc_audio_set_channel( instance, value, NULL );
-}
-
-- (int)audioChannel
-{
-    libvlc_exception_t ex;
-    libvlc_exception_init( &ex );
-    int result = libvlc_audio_get_channel( instance, &ex );
-    catch_exception( &ex );
-    return result;
-}
-
-- (void)setMedia:(VLCMedia *)value
-{
-    if (media != value)
-    {
-        if (media && [media compare:value] == NSOrderedSame)
-            return;
-        
-        [media release];
-        media = [value retain];
-
-        libvlc_exception_t ex;
-        libvlc_exception_init( &ex );
-        libvlc_media_instance_set_media_descriptor( instance, [media libVLCMediaDescriptor], &ex );
-        catch_exception( &ex );
-    }
-}
-
-- (VLCMedia *)media
-{
-    return media;
-}
-
-- (BOOL)play
-{    
-    libvlc_exception_t ex;
-    libvlc_exception_init( &ex );
-    libvlc_media_instance_play( (libvlc_media_instance_t *)instance, &ex );
-    catch_exception( &ex );
-    return YES;
-}
-
-- (void)pause
-{
-    if( [NSThread isMainThread] )
-    {
-        /* Hack because we create a dead lock here, when the vout is stopped
-         * and tries to recontact us on the main thread */
-        /* FIXME: to do this properly we need to do some locking. We may want 
-         * to move that to libvlc */
-        [self performSelectorInBackground:@selector(pause) withObject:nil];
-        return;
-    }
-
-    // Return if there is no media available or if the stream is not paused or 
-    // playing something else
-    if (!media || (![self isPlaying] && [self state] != VLCMediaPlayerStatePaused))
-        return;
-
-    // Should never get here.
-    if (!instance)
-        return;
-
-
-    // Pause the stream
-    libvlc_exception_t ex;
-    libvlc_exception_init( &ex );
-    libvlc_media_instance_pause( (libvlc_media_instance_t *)instance, &ex );
-    catch_exception( &ex );
-    
-    // TODO: Should we record the time in case the media instance is destroyed
-    // then rebuilt?
-}
-
-- (void)stop
-{
-    if( 0 && [NSThread isMainThread] )
-    {
-        /* Hack because we create a dead lock here, when the vout is stopped
-         * and tries to recontact us on the main thread */
-        /* FIXME: to do this properly we need to do some locking. We may want 
-         * to move that to libvlc */
-        [self performSelectorInBackground:@selector(stop) withObject:nil];
-        return;
-    }
-
-    // Return if there is no media available or if the system is not in play status 
-    // or pause status.
-    if (!media)
-        return;
-    
-    libvlc_exception_t ex;
-    libvlc_exception_init( &ex );
-    libvlc_media_instance_stop((libvlc_media_instance_t *)instance, &ex);
-    catch_exception( &ex );
-}
-
-- (void)fastForward
-{
-    [self fastForwardAtRate: 2.0];
-}
-
-- (void)fastForwardAtRate:(float)rate
-{
-    [self setRate:rate];
-}
-
-- (void)rewind
-{
-    [self rewindAtRate: 2.0];
-}
-
-- (void)rewindAtRate:(float)rate
-{
-    [self setRate: -rate];
-}
-
-+ (NSSet *)keyPathsForValuesAffectingIsPlaying
-{
-    return [NSSet setWithObjects:@"state", nil];
-}
-
-- (BOOL)isPlaying
-{
-    VLCMediaPlayerState state = [self state];
-    return ((state == VLCMediaPlayerStateOpening) || (state == VLCMediaPlayerStateBuffering) ||
-            (state == VLCMediaPlayerStatePlaying));
-}
-
-- (BOOL)willPlay
-{
-    libvlc_exception_t ex;
-    libvlc_exception_init( &ex );
-    BOOL ret = libvlc_media_instance_will_play( (libvlc_media_instance_t *)instance, &ex );
-    if (libvlc_exception_raised(&ex))
-    {
-        libvlc_exception_clear(&ex);
-        return NO;
-    }
-    else
-        return ret;
-}
-
-static const VLCMediaPlayerState libvlc_to_local_state[] =
-{
-    [libvlc_Stopped]    = VLCMediaPlayerStateStopped,
-    [libvlc_Opening]    = VLCMediaPlayerStateOpening,
-    [libvlc_Buffering]  = VLCMediaPlayerStateBuffering,
-    [libvlc_Playing]    = VLCMediaPlayerStatePlaying,
-    [libvlc_Paused]     = VLCMediaPlayerStatePaused,
-    [libvlc_Ended]      = VLCMediaPlayerStateEnded,
-    [libvlc_Error]      = VLCMediaPlayerStateError
-};
-
-- (VLCMediaPlayerState)state
-{
-    return cachedState;
-}
-
-- (float)position
-{
-    return position;
-}
-
-- (void)setPosition:(float)newPosition
-{
-    libvlc_exception_t ex;
-    libvlc_exception_init( &ex );
-    libvlc_media_instance_set_position( instance, newPosition, &ex );
-    catch_exception( &ex );
-}
-
-- (BOOL)isSeekable
-{
-    libvlc_exception_t ex;
-    libvlc_exception_init( &ex );
-    BOOL ret = libvlc_media_instance_is_seekable( instance, &ex );
-    catch_exception( &ex );
-    return ret;
-}
-
-- (BOOL)canPause
-{
-    libvlc_exception_t ex;
-    libvlc_exception_init( &ex );
-    BOOL ret = libvlc_media_instance_can_pause( instance, &ex );
-    catch_exception( &ex );
-    return ret;
-}
-
-
-@end
-
-@implementation VLCMediaPlayer (Private)
-- (id)initWithDrawable:(id)aDrawable
-{
-    if (self = [super init])
-    {
-        delegate = nil;
-        media = nil;
-        cachedTime = [[VLCTime nullTime] retain];
-        position = 0.0f;
-        cachedState = VLCMediaPlayerStateStopped;
-
-        // Create a media instance, it doesn't matter what library we start off with
-        // it will change depending on the media descriptor provided to the media
-        // instance
-        libvlc_exception_t ex;
-        libvlc_exception_init( &ex );
-        instance = (void *)libvlc_media_instance_new([VLCLibrary sharedInstance], &ex);
-        catch_exception( &ex );
-        
-        [self registerObservers];
-        
-        [self setDrawable:aDrawable];
-    }
-    return self;
-}
-
-- (void)registerObservers
-{
-    libvlc_exception_t ex;
-    libvlc_exception_init( &ex );
-
-    // Attach event observers into the media instance
-    libvlc_event_manager_t * p_em = libvlc_media_instance_event_manager( instance, &ex );
-    libvlc_event_attach( p_em, libvlc_MediaInstancePlayed,          HandleMediaInstanceStateChanged, self, &ex );
-    libvlc_event_attach( p_em, libvlc_MediaInstancePaused,          HandleMediaInstanceStateChanged, self, &ex );
-    libvlc_event_attach( p_em, libvlc_MediaInstanceReachedEnd,      HandleMediaInstanceStateChanged, self, &ex );
-    /* FIXME: We may want to turn that off when none is interested by that */
-    libvlc_event_attach( p_em, libvlc_MediaInstancePositionChanged, HandleMediaPositionChanged,      self, &ex );
-    libvlc_event_attach( p_em, libvlc_MediaInstanceTimeChanged,     HandleMediaTimeChanged,          self, &ex );
-    catch_exception( &ex );
-}
-
-- (void)unregisterObservers
-{
-    libvlc_event_manager_t * p_em = libvlc_media_instance_event_manager( instance, NULL );
-    libvlc_event_detach( p_em, libvlc_MediaInstancePlayed,          HandleMediaInstanceStateChanged, self, NULL );
-    libvlc_event_detach( p_em, libvlc_MediaInstancePaused,          HandleMediaInstanceStateChanged, self, NULL );
-    libvlc_event_detach( p_em, libvlc_MediaInstanceReachedEnd,      HandleMediaInstanceStateChanged, self, NULL );
-    libvlc_event_detach( p_em, libvlc_MediaInstancePositionChanged, HandleMediaPositionChanged,      self, NULL );
-    libvlc_event_detach( p_em, libvlc_MediaInstanceTimeChanged,     HandleMediaTimeChanged,          self, NULL );
-}
-
-- (void)mediaPlayerTimeChanged:(NSNumber *)newTime
-{
-    [self willChangeValueForKey:@"time"];
-    [cachedTime release];
-    cachedTime = [[VLCTime timeWithNumber:newTime] retain];
-    [self didChangeValueForKey:@"time"];
-}
-
-- (void)mediaPlayerPositionChanged:(NSNumber *)newPosition
-{
-    if( [newPosition floatValue] - position < 0.005 && position - [newPosition floatValue] < 0.005 )
-        return; /* Forget that, this is too much precision for our uses */
-    [self willChangeValueForKey:@"position"];
-    position = ((float)((int)([newPosition floatValue]*1000)))/1000.;
-    [self didChangeValueForKey:@"position"];
-}
-
-- (void)mediaPlayerStateChanged:(NSNumber *)newState
-{
-    [self willChangeValueForKey:@"state"];
-    cachedState = [newState intValue];
-    [self didChangeValueForKey:@"state"];
-}
-@end
diff --git a/extras/package/macosx/Framework/Sources/VLCPlaylistDataSource.m b/extras/package/macosx/Framework/Sources/VLCPlaylistDataSource.m
deleted file mode 100644 (file)
index 0a0f755..0000000
+++ /dev/null
@@ -1,178 +0,0 @@
-/*****************************************************************************
- * VLCPlaylistDataSource.m: VLC.framework VLCPlaylistDataSource implementation
- *****************************************************************************
- * Copyright (C) 2007 Pierre d'Herbemont
- * Copyright (C) 2007 the VideoLAN team
- * $Id$
- *
- * Authors: Pierre d'Herbemont <pdherbemont # videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import <VLC/VLCPlaylistDataSource.h>
-#import "VLCEventManager.h"
-
-@implementation VLCPlaylistDataSource
-
-- (id)init
-{
-    if (self = [super init])
-    {
-        playlist = nil;
-        videoView = nil;
-    }
-    return self;
-}
-
-- (id)initWithPlaylist:(VLCPlaylist *)aPlaylist
-{
-    if (self = [super init])
-    {
-
-        playlist = [aPlaylist retain];
-
-        [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(playlistDidChange:) name:VLCPlaylistItemAdded  object:nil];
-        [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(itemDidAddSubitem:) name:VLCMediaSubItemAdded  object:nil];
-        [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(itemDidChange:) name:VLCPlaylistItemChanged   object:nil];
-        videoView = nil;
-        outlineView = nil;
-
-    }
-    return self;
-}
-
-- (id)initWithPlaylist:(VLCPlaylist *)aPlaylist videoView:(VLCVideoView *)aVideoView;
-{
-    if (self = [super init])
-    {
-        playlist = [aPlaylist retain];
-
-        [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(playlistDidChange:) name:VLCPlaylistItemAdded object:nil];
-        [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(itemDidAddSubitem:) name:VLCMediaSubItemAdded object:nil];
-        [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(itemDidChange:) name:VLCPlaylistItemChanged   object:nil];
-
-        videoView = [aVideoView retain];
-        /* Will be automatically set if an outline view ask us data,
-         * be careful not to connect two outlineView to this object or this goes wrong. */
-        outlineView = nil;
-    }
-    return self;
-}
-
-- (void)dealloc
-{
-    [[NSNotificationCenter defaultCenter] removeObserver: self];
-
-    if (playlist)
-        [playlist release];
-    if (videoView)
-        [videoView release];
-
-    [super dealloc];
-}
-
-- (VLCPlaylist *)playlist
-{
-    return playlist;
-}
-
-- (VLCVideoView *)videoView
-{
-    return videoView;
-}
-@end
-
-
-
-@implementation VLCPlaylistDataSource (OutlineViewDataSource)
-- (BOOL)  outlineView: (NSOutlineView *)ov isItemExpandable: (id)item { return NO; }
-- (int)   outlineView: (NSOutlineView *)ov numberOfChildrenOfItem:(id)item { return 0; }
-- (id)    outlineView: (NSOutlineView *)ov child:(int)index ofItem:(id)item { return nil; }
-- (id)    outlineView: (NSOutlineView *)ov objectValueForTableColumn:(NSTableColumn*)col byItem:(id)item { return nil; }
-@end
-
-@implementation VLCPlaylistDataSource (TableViewDropping)
-/* Dummy implementation cause we need them */
-- (int)numberOfRowsInTableView:(NSTableView *)aTableView { return 0; }
-- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex {return nil;}
-
-- (NSDragOperation)tableView:(NSTableView*)tv validateDrop:(id <NSDraggingInfo>)info proposedRow:(int)row proposedDropOperation:(NSTableViewDropOperation)op
-{
-    return NSDragOperationEvery; /* This is for now */
-}
-
-- (BOOL)tableView:(NSTableView *)aTableView acceptDrop:(id <NSDraggingInfo>)info
-            row:(int)row dropOperation:(NSTableViewDropOperation)operation
-{
-    int i;
-    NSArray  * droppedItems = [[info draggingPasteboard] propertyListForType: NSFilenamesPboardType];
-    for (i = 0; i < [droppedItems count]; i++)
-    {
-        NSString * filename = [droppedItems objectAtIndex:i];
-        
-        [[self playlist] insertMedia:[VLCMedia mediaWithURL:filename] atIndex:row+i];
-    }
-
-}
-@end
-
-@interface NSObject (UnknownBindingsObject)
-/* OutlineViewDataSourceDropping and bindings hack */
-- (id)observedObject;
-@end
-
-@implementation VLCPlaylistDataSource (OutlineViewDataSourceDropping)
-- (BOOL)outlineView:(NSOutlineView *)aOutlineView acceptDrop:(id <NSDraggingInfo>)info item:(id)item childIndex:(int)index
-{
-    NSArray  * droppedItems = [[info draggingPasteboard] propertyListForType: NSFilenamesPboardType];
-    VLCPlaylist * aPlaylist;
-    int i;
-
-    if (!item)
-        item = [self playlist]; /* The root object is our playlist */
-    else
-        item = [item observedObject];
-
-    if (![item  isMemberOfClass:[VLCPlaylist class]])
-        return NO;
-
-    if (index < 0) /* No precise item given, put it as the first one */
-        index = 0;
-
-    aPlaylist = item;
-
-    if (!droppedItems)
-    {
-        /* XXX: localization */
-        NSRunCriticalAlertPanelRelativeToWindow(@"Error", @"Unable to drop the provided item.", @"OK", nil, nil, [outlineView window]);
-        return NO;
-    }
-
-    for (i = 0; i < [droppedItems count]; i++)
-    {
-        NSString * filename = [droppedItems objectAtIndex:i];
-        
-        [aPlaylist insertMedia:[VLCMedia mediaWithURL:filename] atIndex:index+i];
-    }
-    return YES;
-}
-
-- (NSDragOperation)outlineView:(NSOutlineView *)aOutlineView validateDrop:(id <NSDraggingInfo>)info proposedItem:(id)item proposedChildIndex:(int)index
-{
-    return NSDragOperationEvery;
-}
-@end
\ No newline at end of file
diff --git a/extras/package/macosx/Framework/Sources/VLCServicesDiscoverer.m b/extras/package/macosx/Framework/Sources/VLCServicesDiscoverer.m
deleted file mode 100644 (file)
index bc000f0..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/*****************************************************************************
- * VLCMediaDiscoverer.m: VLC.framework VLCMediaDiscoverer implementation
- *****************************************************************************
- * Copyright (C) 2007 Pierre d'Herbemont
- * Copyright (C) 2007 the VideoLAN team
- * $Id$
- *
- * Authors: Pierre d'Herbemont <pdherbemont # videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import <Cocoa/Cocoa.h>
-#import <VLC/VLCServicesDiscoverer.h>
-#import <VLC/VLCMediaDiscoverer.h>
-#import "VLCLibrary.h"
-
-#include <vlc/libvlc.h>
-
-static VLCServicesDiscoverer * sharedDiscoverer = NULL;
-
-@implementation VLCServicesDiscoverer
-+ (id)sharedDiscoverer
-{
-    if (!sharedDiscoverer)
-    {
-        sharedDiscoverer = [[self alloc] init];
-    }
-    return sharedDiscoverer;
-}
-
-- (id) init
-{
-    if( self = [super init] )
-    {
-        services = [[NSArray arrayWithObjects:
-                        [[[VLCMediaDiscoverer alloc] initWithName:@"sap"] autorelease],
-                        [[[VLCMediaDiscoverer alloc] initWithName:@"shoutcast"] autorelease],
-                        [[[VLCMediaDiscoverer alloc] initWithName:@"shoutcasttv"] autorelease], nil] retain];
-    }
-    return self;
-}
-
-- (NSArray *) services
-{
-    return [[services copy] autorelease];
-}
-@end
diff --git a/extras/package/macosx/Framework/Sources/VLCStreamOutput.m b/extras/package/macosx/Framework/Sources/VLCStreamOutput.m
deleted file mode 100644 (file)
index 0e98086..0000000
+++ /dev/null
@@ -1,194 +0,0 @@
-//
-//  VLCStreamOutput.m
-//  VLCKit
-//
-//  Created by Pierre d'Herbemont on 1/12/08.
-//  Copyright 2008 __MyCompanyName__. All rights reserved.
-//
-
-#import "VLCStreamOutput.h"
-#import "VLCLibVLCBridging.h"
-
-
-@implementation VLCStreamOutput
-- (id)initWithOptionDictionary:(NSDictionary *)dictionary
-{
-    if( self = [super init] )
-    {
-        options = [[NSMutableDictionary dictionaryWithDictionary:dictionary] retain];
-    }
-    return self;
-}
-- (NSString *)description
-{
-    return [self representedLibVLCOptions];
-}
-+ (id)streamOutputWithOptionDictionary:(NSDictionary *)dictionary
-{
-    return [[[self alloc] initWithOptionDictionary:dictionary] autorelease];
-}
-+ (id)rtpBroadcastStreamOutputWithSAPAnnounce:(NSString *)announceName
-{
-    return [self streamOutputWithOptionDictionary:[NSDictionary dictionaryWithObjectsAndKeys:
-                                            [NSDictionary dictionaryWithObjectsAndKeys:
-                                                @"ts", @"muxer",
-                                                @"file", @"access",
-                                                @"sap", @"sdp",
-                                                [announceName copy], @"name",
-                                                @"239.255.1.1", @"destination", nil
-                                            ], @"rtpOptions",
-                                            nil
-                                            ]
-                                        ];
-}
-
-+ (id)rtpBroadcastStreamOutput
-{
-    return [self rtpBroadcastStreamOutputWithSAPAnnounce:@"Helloworld!"];
-}
-
-+ (id)ipodStreamOutputWithFilePath:(NSString *)filePath
-{
-    return [self streamOutputWithOptionDictionary:[NSDictionary dictionaryWithObjectsAndKeys:
-                                            [NSDictionary dictionaryWithObjectsAndKeys:
-                               &