Added VLCAudio support back for iOS

Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

DynamicMobileVLCKit/DynamicMobileVLCKit.h

@@ -16,6 +16,7 @@ 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>

Headers/Internal/VLCLibVLCBridging.h

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

Headers/Public/MobileVLCKit.h

@@ -21,6 +21,7 @@
  * 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>

Headers/Public/VLCLibrary.h

@@ -23,9 +23,12 @@
  *****************************************************************************/
 
 #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

Headers/Public/VLCMediaPlayer.h

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

MobileVLCKit.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		4B49C5FC1BC3D7870052D40C /* VLCAudio.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B49C5FB1BC3D7870052D40C /* VLCAudio.m */; settings = {ASSET_TAGS = (); }; };
 		6360B0E211E7F0C000EAD790 /* VLCMediaDiscoverer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6360B0E111E7F0C000EAD790 /* VLCMediaDiscoverer.m */; };
 		6360B10611E7F27300EAD790 /* VLCMediaDiscoverer.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 6360B0E311E7F0D300EAD790 /* VLCMediaDiscoverer.h */; };
 		636E975811EBC67A002FE8A9 /* VLCMediaThumbnailer.m in Sources */ = {isa = PBXBuildFile; fileRef = 636E975711EBC67A002FE8A9 /* VLCMediaThumbnailer.m */; };
@@ -134,6 +135,8 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		4B49C5FB1BC3D7870052D40C /* VLCAudio.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCAudio.m; path = Sources/VLCAudio.m; sourceTree = "<group>"; };
+		4B49C5FD1BC3D7960052D40C /* VLCAudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCAudio.h; path = Headers/Public/VLCAudio.h; sourceTree = "<group>"; };
 		6360B0E111E7F0C000EAD790 /* VLCMediaDiscoverer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCMediaDiscoverer.m; path = Sources/VLCMediaDiscoverer.m; sourceTree = "<group>"; };
 		6360B0E311E7F0D300EAD790 /* VLCMediaDiscoverer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCMediaDiscoverer.h; path = Headers/Public/VLCMediaDiscoverer.h; sourceTree = "<group>"; };
 		636E975711EBC67A002FE8A9 /* VLCMediaThumbnailer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCMediaThumbnailer.m; path = Sources/VLCMediaThumbnailer.m; sourceTree = "<group>"; };
@@ -289,6 +292,7 @@
 		08FB77AEFE84172EC02AAC07 /* Sources */ = {
 			isa = PBXGroup;
 			children = (
+				4B49C5FB1BC3D7870052D40C /* VLCAudio.m */,
 				7A5ECAC411DE8F7300F66AF3 /* VLCEventManager.m */,
 				7A5ECAC511DE8F7300F66AF3 /* VLCLibrary.m */,
 				7A5ECAC611DE8F7300F66AF3 /* VLCMedia.m */,
@@ -317,6 +321,7 @@
 			children = (
 				7A5ECB9D11DE975700F66AF3 /* MobileVLCKit.h */,
 				7A5ECAE311DE8FDF00F66AF3 /* Internal */,
+				4B49C5FD1BC3D7960052D40C /* VLCAudio.h */,
 				7A5ECAD411DE8FAB00F66AF3 /* VLCLibrary.h */,
 				7A5ECAD511DE8FAB00F66AF3 /* VLCMedia.h */,
 				636E979011EBC96D002FE8A9 /* VLCMediaThumbnailer.h */,
@@ -584,6 +589,7 @@
 				7A5ECACF11DE8F7300F66AF3 /* VLCMediaPlayer.m in Sources */,
 				7A5ECAD011DE8F7300F66AF3 /* VLCTime.m in Sources */,
 				6360B0E211E7F0C000EAD790 /* VLCMediaDiscoverer.m in Sources */,
+				4B49C5FC1BC3D7870052D40C /* VLCAudio.m in Sources */,
 				636E975811EBC67A002FE8A9 /* VLCMediaThumbnailer.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

Sources/VLCMediaPlayer.m

@@ -167,11 +167,9 @@ 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
 
@@ -298,14 +296,12 @@ 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