Просмотр исходного кода

Don't distribute VLCAudio with MobileVLCKit is it is completely NO-OP

Felix Paul Kühne 10 лет назад
Родитель
Сommit
1350d54885

+ 0 - 1
DynamicMobileVLCKit/DynamicMobileVLCKit.h

@@ -16,7 +16,6 @@ FOUNDATION_EXPORT const unsigned char DynamicMobileVLCKitVersionString[];
 
 // In this header, you should import all the public headers of your framework using statements like #import <DynamicMobileVLCKit/PublicHeader.h>
 
-#import <DynamicMobileVLCKit/VLCAudio.h>
 #import <DynamicMobileVLCKit/VLCLibrary.h>
 #import <DynamicMobileVLCKit/VLCMedia.h>
 #import <DynamicMobileVLCKit/VLCMediaDiscoverer.h>

+ 2 - 0
Headers/Internal/VLCLibVLCBridging.h

@@ -121,6 +121,7 @@
 @property (readonly) void * instance;
 @end
 
+#if !TARGET_OS_IPHONE
 /**
  * Bridges functionality between VLCLibrary and VLCAudio.
  */
@@ -145,6 +146,7 @@
  */
 - (id)initWithMediaPlayer:(VLCMediaPlayer *)mediaPlayer;
 @end
+#endif
 
 /**
  * TODO: Documentation

+ 0 - 1
Headers/Public/MobileVLCKit.h

@@ -21,7 +21,6 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#import <MobileVLCKit/VLCAudio.h>
 #import <MobileVLCKit/VLCLibrary.h>
 #import <MobileVLCKit/VLCMedia.h>
 #import <MobileVLCKit/VLCMediaDiscoverer.h>

+ 0 - 3
Headers/Public/VLCLibrary.h

@@ -23,12 +23,9 @@
  *****************************************************************************/
 
 #import <Foundation/Foundation.h>
-#import "VLCAudio.h"
 #import "VLCMediaList.h"
 #import "VLCMedia.h"
 
-@class VLCAudio;
-
 /**
  * The VLCLibrary is the base library of the VLCKit.framework.  This object provides a shared instance that exposes the
  * internal functionalities of libvlc and libvlc-control. The VLCLibrary object is instantiated automatically when

+ 2 - 2
Headers/Public/VLCMedia.h

@@ -2,12 +2,12 @@
  * VLCMedia.h: VLCKit.framework VLCMedia header
  *****************************************************************************
  * Copyright (C) 2007 Pierre d'Herbemont
- * Copyright (C) 2013 Felix Paul Kühne
+ * Copyright (C) 2013 Felix Paul Kühne
  * Copyright (C) 2007-2013 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Pierre d'Herbemont <pdherbemont # videolan.org>
- *          Felix Paul Kühne <fkuehne # videolan.org>
+ *          Felix Paul Kühne <fkuehne # videolan.org>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published by

+ 4 - 1
Headers/Public/VLCMediaPlayer.h

@@ -30,9 +30,10 @@
 #endif
 #import "VLCMedia.h"
 #import "VLCTime.h"
-#import "VLCAudio.h"
 
 #if !TARGET_OS_IPHONE
+#import "VLCAudio.h"
+
 @class VLCVideoView;
 @class VLCVideoLayer;
 #endif
@@ -210,7 +211,9 @@ extern NSString * VLCMediaPlayerStateToString(VLCMediaPlayerState state);
  */
 @property (nonatomic)  float rate;
 
+#if !TARGET_OS_IPHONE
 @property (nonatomic, readonly, weak) VLCAudio * audio;
+#endif
 
 /* Video Information */
 /**

+ 0 - 12
MobileVLCKit.xcodeproj/project.pbxproj

@@ -17,13 +17,11 @@
 		7A5ECACE11DE8F7300F66AF3 /* VLCMediaList.m in Sources */ = {isa = PBXBuildFile; fileRef = 7A5ECAC711DE8F7300F66AF3 /* VLCMediaList.m */; };
 		7A5ECACF11DE8F7300F66AF3 /* VLCMediaPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 7A5ECAC811DE8F7300F66AF3 /* VLCMediaPlayer.m */; };
 		7A5ECAD011DE8F7300F66AF3 /* VLCTime.m in Sources */ = {isa = PBXBuildFile; fileRef = 7A5ECAC911DE8F7300F66AF3 /* VLCTime.m */; };
-		7A5ECAD111DE8F7300F66AF3 /* VLCAudio.m in Sources */ = {isa = PBXBuildFile; fileRef = 7A5ECACA11DE8F7300F66AF3 /* VLCAudio.m */; };
 		7A5ECB5511DE961700F66AF3 /* VLCLibrary.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 7A5ECAD411DE8FAB00F66AF3 /* VLCLibrary.h */; };
 		7A5ECB5611DE961700F66AF3 /* VLCMedia.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 7A5ECAD511DE8FAB00F66AF3 /* VLCMedia.h */; };
 		7A5ECB5711DE961700F66AF3 /* VLCMediaList.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 7A5ECAD611DE8FAB00F66AF3 /* VLCMediaList.h */; };
 		7A5ECB5811DE961700F66AF3 /* VLCMediaPlayer.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 7A5ECAD711DE8FAB00F66AF3 /* VLCMediaPlayer.h */; };
 		7A5ECB5911DE961700F66AF3 /* VLCTime.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 7A5ECAD811DE8FAB00F66AF3 /* VLCTime.h */; };
-		7A5ECB5A11DE961700F66AF3 /* VLCAudio.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 7A5ECAD911DE8FAB00F66AF3 /* VLCAudio.h */; };
 		7A5ECB9E11DE975A00F66AF3 /* MobileVLCKit.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 7A5ECB9D11DE975700F66AF3 /* MobileVLCKit.h */; };
 		7D5F800A185B72EB00C2CD75 /* VLCMediaListPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D5F8009185B72EB00C2CD75 /* VLCMediaListPlayer.m */; };
 		7D5F800C185B733800C2CD75 /* VLCMediaListPlayer.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 7D5F800B185B730F00C2CD75 /* VLCMediaListPlayer.h */; };
@@ -37,7 +35,6 @@
 		7D8939461B500D51008F2B14 /* VLCMediaThumbnailer.m in Sources */ = {isa = PBXBuildFile; fileRef = 636E975711EBC67A002FE8A9 /* VLCMediaThumbnailer.m */; };
 		7D8939471B500D51008F2B14 /* VLCMediaDiscoverer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6360B0E111E7F0C000EAD790 /* VLCMediaDiscoverer.m */; };
 		7D8939481B500D51008F2B14 /* VLCTime.m in Sources */ = {isa = PBXBuildFile; fileRef = 7A5ECAC911DE8F7300F66AF3 /* VLCTime.m */; };
-		7D8939491B500D51008F2B14 /* VLCAudio.m in Sources */ = {isa = PBXBuildFile; fileRef = 7A5ECACA11DE8F7300F66AF3 /* VLCAudio.m */; };
 		7D8939531B500DBC008F2B14 /* StaticLibVLC.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D8939521B500DBC008F2B14 /* StaticLibVLC.m */; };
 		7D8939651B500F13008F2B14 /* libStaticLibVLC.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D89394E1B500DBC008F2B14 /* libStaticLibVLC.a */; };
 		7D8939661B500F38008F2B14 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D8939031B5009E2008F2B14 /* libiconv.dylib */; };
@@ -63,7 +60,6 @@
 		7DDC02101B501ECF0078FC84 /* VLCMediaListPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 7D5F800B185B730F00C2CD75 /* VLCMediaListPlayer.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		7DDC02111B501ECF0078FC84 /* VLCMediaDiscoverer.h in Headers */ = {isa = PBXBuildFile; fileRef = 6360B0E311E7F0D300EAD790 /* VLCMediaDiscoverer.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		7DDC02121B501ECF0078FC84 /* VLCTime.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A5ECAD811DE8FAB00F66AF3 /* VLCTime.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		7DDC02131B501ECF0078FC84 /* VLCAudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A5ECAD911DE8FAB00F66AF3 /* VLCAudio.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		7DDC02141B501ED70078FC84 /* vlc-plugins.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A5ECB3411DE94D600F66AF3 /* vlc-plugins.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		7DDC02151B501ED70078FC84 /* VLCLibVLCBridging.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A5ECAE411DE8FEF00F66AF3 /* VLCLibVLCBridging.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		7DDC02161B501ED70078FC84 /* VLCEventManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A5ECAE511DE8FEF00F66AF3 /* VLCEventManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -86,7 +82,6 @@
 				7D5F800C185B733800C2CD75 /* VLCMediaListPlayer.h in Copy Headers */,
 				6360B10611E7F27300EAD790 /* VLCMediaDiscoverer.h in Copy Headers */,
 				7A5ECB5911DE961700F66AF3 /* VLCTime.h in Copy Headers */,
-				7A5ECB5A11DE961700F66AF3 /* VLCAudio.h in Copy Headers */,
 			);
 			name = "Copy Headers";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -113,13 +108,11 @@
 		7A5ECAC711DE8F7300F66AF3 /* VLCMediaList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCMediaList.m; path = Sources/VLCMediaList.m; sourceTree = "<group>"; };
 		7A5ECAC811DE8F7300F66AF3 /* VLCMediaPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCMediaPlayer.m; path = Sources/VLCMediaPlayer.m; sourceTree = "<group>"; };
 		7A5ECAC911DE8F7300F66AF3 /* VLCTime.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCTime.m; path = Sources/VLCTime.m; sourceTree = "<group>"; };
-		7A5ECACA11DE8F7300F66AF3 /* VLCAudio.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCAudio.m; path = Sources/VLCAudio.m; sourceTree = "<group>"; };
 		7A5ECAD411DE8FAB00F66AF3 /* VLCLibrary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCLibrary.h; path = Headers/Public/VLCLibrary.h; sourceTree = "<group>"; };
 		7A5ECAD511DE8FAB00F66AF3 /* VLCMedia.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCMedia.h; path = Headers/Public/VLCMedia.h; sourceTree = "<group>"; };
 		7A5ECAD611DE8FAB00F66AF3 /* VLCMediaList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCMediaList.h; path = Headers/Public/VLCMediaList.h; sourceTree = "<group>"; };
 		7A5ECAD711DE8FAB00F66AF3 /* VLCMediaPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCMediaPlayer.h; path = Headers/Public/VLCMediaPlayer.h; sourceTree = "<group>"; };
 		7A5ECAD811DE8FAB00F66AF3 /* VLCTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCTime.h; path = Headers/Public/VLCTime.h; sourceTree = "<group>"; };
-		7A5ECAD911DE8FAB00F66AF3 /* VLCAudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCAudio.h; path = Headers/Public/VLCAudio.h; sourceTree = "<group>"; };
 		7A5ECAE411DE8FEF00F66AF3 /* VLCLibVLCBridging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCLibVLCBridging.h; path = Headers/Internal/VLCLibVLCBridging.h; sourceTree = "<group>"; };
 		7A5ECAE511DE8FEF00F66AF3 /* VLCEventManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCEventManager.h; path = Headers/Internal/VLCEventManager.h; sourceTree = "<group>"; };
 		7A5ECB3411DE94D600F66AF3 /* vlc-plugins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "vlc-plugins.h"; path = "MobileVLCKit/vlc-plugins.h"; sourceTree = "<group>"; };
@@ -253,7 +246,6 @@
 				636E975711EBC67A002FE8A9 /* VLCMediaThumbnailer.m */,
 				6360B0E111E7F0C000EAD790 /* VLCMediaDiscoverer.m */,
 				7A5ECAC911DE8F7300F66AF3 /* VLCTime.m */,
-				7A5ECACA11DE8F7300F66AF3 /* VLCAudio.m */,
 			);
 			name = Sources;
 			sourceTree = "<group>";
@@ -280,7 +272,6 @@
 				7D5F800B185B730F00C2CD75 /* VLCMediaListPlayer.h */,
 				6360B0E311E7F0D300EAD790 /* VLCMediaDiscoverer.h */,
 				7A5ECAD811DE8FAB00F66AF3 /* VLCTime.h */,
-				7A5ECAD911DE8FAB00F66AF3 /* VLCAudio.h */,
 			);
 			name = Headers;
 			sourceTree = "<group>";
@@ -352,7 +343,6 @@
 				7DDC02101B501ECF0078FC84 /* VLCMediaListPlayer.h in Headers */,
 				7DDC02111B501ECF0078FC84 /* VLCMediaDiscoverer.h in Headers */,
 				7DDC02121B501ECF0078FC84 /* VLCTime.h in Headers */,
-				7DDC02131B501ECF0078FC84 /* VLCAudio.h in Headers */,
 				7DDC02141B501ED70078FC84 /* vlc-plugins.h in Headers */,
 				7DDC02151B501ED70078FC84 /* VLCLibVLCBridging.h in Headers */,
 				7DDC02161B501ED70078FC84 /* VLCEventManager.h in Headers */,
@@ -473,7 +463,6 @@
 				7D8939461B500D51008F2B14 /* VLCMediaThumbnailer.m in Sources */,
 				7D8939471B500D51008F2B14 /* VLCMediaDiscoverer.m in Sources */,
 				7D8939481B500D51008F2B14 /* VLCTime.m in Sources */,
-				7D8939491B500D51008F2B14 /* VLCAudio.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -496,7 +485,6 @@
 				7A5ECACE11DE8F7300F66AF3 /* VLCMediaList.m in Sources */,
 				7A5ECACF11DE8F7300F66AF3 /* VLCMediaPlayer.m in Sources */,
 				7A5ECAD011DE8F7300F66AF3 /* VLCTime.m in Sources */,
-				7A5ECAD111DE8F7300F66AF3 /* VLCAudio.m in Sources */,
 				6360B0E211E7F0C000EAD790 /* VLCMediaDiscoverer.m in Sources */,
 				636E975811EBC67A002FE8A9 /* VLCMediaThumbnailer.m in Sources */,
 			);

+ 2 - 0
NEWS

@@ -24,6 +24,8 @@ Deprecated APIs:
   - titles, chaptersForTitleIndex:, countOfTitles
 
 Removed APIs:
+- VLCAudio:
+  - the entire object is no longer part of the MobileVLCKit distribution
 - VLCMedia:
   - fps
   - media:metaValueChangedFrom:forKey:

+ 5 - 1
Sources/VLCMediaPlayer.m

@@ -167,9 +167,11 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s
     VLCMediaPlayerState _cachedState;    //< Cached state of the media being played
     float _position;                     //< The position of the media being played
     id _drawable;                        //< The drawable associated to this media player
-    VLCAudio *_audio;
     libvlc_equalizer_t *_equalizerInstance;
     BOOL _equalizerEnabled;
+#if !TARGET_OS_IPHONE
+    VLCAudio *_audio;
+#endif
 }
 @end
 
@@ -277,12 +279,14 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s
     return (__bridge id)(libvlc_media_player_get_nsobject(_playerInstance));
 }
 
+#if !TARGET_OS_IPHONE
 - (VLCAudio *)audio
 {
     if (!_audio)
         _audio = [[VLCAudio alloc] initWithMediaPlayer:self];
     return _audio;
 }
+#endif
 
 #pragma mark -
 #pragma mark Video Tracks