diff --git a/just_audio/.gitignore b/just_audio/.gitignore index 07488ba61..84e75b9ad 100644 --- a/just_audio/.gitignore +++ b/just_audio/.gitignore @@ -61,6 +61,8 @@ **/ios/Flutter/flutter_assets/ **/ios/ServiceDefinitions.json **/ios/Runner/GeneratedPluginRegistrant.* +.build/ +.swiftpm/ # Exceptions to above rules. !**/ios/**/default.mode1v3 diff --git a/just_audio/CHANGELOG.md b/just_audio/CHANGELOG.md index ecbffc363..7148d9727 100644 --- a/just_audio/CHANGELOG.md +++ b/just_audio/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.9.44 + +* Add support for SwiftPM. + ## 0.9.43 * Fix NPE in load on iOS/macOS. diff --git a/just_audio/README.md b/just_audio/README.md index a62c5012e..a141c401a 100644 --- a/just_audio/README.md +++ b/just_audio/README.md @@ -281,6 +281,16 @@ dependencies { ### iOS +If you wish to connect to non-HTTPS URLs, or if you use a feature that depends on the proxy such as headers, caching or stream audio sources, add the following to your `Info.plist` file: + +```xml +NSAppTransportSecurity + + NSAllowsArbitraryLoads + + +``` + Using the default configuration, the App Store will detect that your app uses the AVAudioSession API which includes a microphone API, and for privacy reasons it will ask you to describe your app's usage of the microphone. If your app does indeed use the microphone, you can describe your usage by editing the `Info.plist` file as follows: ```xml @@ -288,7 +298,11 @@ Using the default configuration, the App Store will detect that your app uses th ... explain why the app uses the microphone here ... ``` -But if your app does not use the microphone, you can pass a build option to "compile out" any microphone code so that the App Store won't ask for the above usage description. To do so, edit your `ios/Podfile` as follows: +But if your app doesn't use the microphone, you can pass a build option to "compile out" any microphone code so that the App Store won't ask for the above usage description. This can be done with either CocoaPods or SwiftPM builds. + +#### CocoaPods + +Edit your `ios/Podfile` as follows: ```ruby post_install do |installer| @@ -307,17 +321,21 @@ post_install do |installer| end ``` -If you wish to connect to non-HTTPS URLs, or if you use a feature that depends on the proxy such as headers, caching or stream audio sources, add the following to your `Info.plist` file: +#### SwiftPM -```xml -NSAppTransportSecurity - - NSAllowsArbitraryLoads - - +Run `flutter clean` to force SwiftPM to pick up your new settings: + +``` +flutter clean +``` + +Export the environment variable `AUDIO_SESSION_MICROPHONE=0` before running your build command. E.g. Using the bash command line: + +``` +AUDIO_SESSION_MICROPHONE=0 flutter run ``` -The iOS player relies on server headers (e.g. `Content-Type`, `Content-Length` and [byte range requests](https://developer.apple.com/library/archive/documentation/AppleApplications/Reference/SafariWebContent/CreatingVideoforSafarioniPhone/CreatingVideoforSafarioniPhone.html#//apple_ref/doc/uid/TP40006514-SW6)) to know how to decode the file and where applicable to report its duration. In the case of files, iOS relies on the file extension. +Note: `flutter clean` is needed whenever the value of `AUDIO_SESSION_MICROPHONE` changes, or whenever you switch between different projects that use audio_session with different `AUDIO_SESSION_MICROPHONE` values. ### macOS diff --git a/just_audio/darwin/Classes/IndexedPlayerItem.m b/just_audio/darwin/Classes/IndexedPlayerItem.m deleted file mode 100644 index 7a0218617..000000000 --- a/just_audio/darwin/Classes/IndexedPlayerItem.m +++ /dev/null @@ -1,6 +0,0 @@ -#import "IndexedPlayerItem.h" -#import "IndexedAudioSource.h" - -@implementation IndexedPlayerItem -@synthesize audioSource; -@end diff --git a/just_audio/macos/just_audio.podspec b/just_audio/darwin/just_audio.podspec similarity index 52% rename from just_audio/macos/just_audio.podspec rename to just_audio/darwin/just_audio.podspec index d1a251079..0805c37dd 100644 --- a/just_audio/macos/just_audio.podspec +++ b/just_audio/darwin/just_audio.podspec @@ -4,18 +4,19 @@ Pod::Spec.new do |s| s.name = 'just_audio' s.version = '0.0.1' - s.summary = 'A new flutter plugin project.' + s.summary = 'Flutter audio player' s.description = <<-DESC -A new flutter plugin project. +A flutter plugin for playing audio. DESC - s.homepage = 'http://example.com' + s.homepage = 'https://github.com/ryanheise/just_audio' s.license = { :file => '../LICENSE' } s.author = { 'Your Company' => 'email@example.com' } s.source = { :path => '.' } - s.source_files = 'Classes/**/*' - s.public_header_files = 'Classes/**/*.h' - s.dependency 'FlutterMacOS' - s.platform = :osx, '10.12.2' + s.source_files = 'just_audio/Sources/just_audio/**/*.{h,m}' + s.public_header_files = 'just_audio/Sources/just_audio/include/**/*.h' + s.ios.dependency 'Flutter' + s.osx.dependency 'FlutterMacOS' + s.ios.deployment_target = '12.0' + s.osx.deployment_target = '10.14' s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' } end - diff --git a/just_audio/darwin/just_audio/Package.swift b/just_audio/darwin/just_audio/Package.swift new file mode 100644 index 000000000..e711aeb8b --- /dev/null +++ b/just_audio/darwin/just_audio/Package.swift @@ -0,0 +1,25 @@ +// swift-tools-version: 5.9 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +let package = Package( + name: "just_audio", + platforms: [ + .iOS("12.0"), + .macOS("10.14") + ], + products: [ + .library(name: "just-audio", targets: ["just_audio"]) + ], + dependencies: [], + targets: [ + .target( + name: "just_audio", + dependencies: [], + cSettings: [ + .headerSearchPath("include/just_audio") + ] + ) + ] +) diff --git a/just_audio/darwin/Classes/AudioPlayer.m b/just_audio/darwin/just_audio/Sources/just_audio/AudioPlayer.m similarity index 99% rename from just_audio/darwin/Classes/AudioPlayer.m rename to just_audio/darwin/just_audio/Sources/just_audio/AudioPlayer.m index 8884541b0..f359ea67d 100644 --- a/just_audio/darwin/Classes/AudioPlayer.m +++ b/just_audio/darwin/just_audio/Sources/just_audio/AudioPlayer.m @@ -1,12 +1,12 @@ -#import "BetterEventChannel.h" -#import "AudioPlayer.h" -#import "AudioSource.h" -#import "IndexedAudioSource.h" -#import "LoadControl.h" -#import "UriAudioSource.h" -#import "ConcatenatingAudioSource.h" -#import "LoopingAudioSource.h" -#import "ClippingAudioSource.h" +#import "./include/just_audio/BetterEventChannel.h" +#import "./include/just_audio/AudioPlayer.h" +#import "./include/just_audio/AudioSource.h" +#import "./include/just_audio/IndexedAudioSource.h" +#import "./include/just_audio/LoadControl.h" +#import "./include/just_audio/UriAudioSource.h" +#import "./include/just_audio/ConcatenatingAudioSource.h" +#import "./include/just_audio/LoopingAudioSource.h" +#import "./include/just_audio/ClippingAudioSource.h" #import #import #include diff --git a/just_audio/darwin/Classes/AudioSource.m b/just_audio/darwin/just_audio/Sources/just_audio/AudioSource.m similarity index 94% rename from just_audio/darwin/Classes/AudioSource.m rename to just_audio/darwin/just_audio/Sources/just_audio/AudioSource.m index 294215989..af7df2e05 100644 --- a/just_audio/darwin/Classes/AudioSource.m +++ b/just_audio/darwin/just_audio/Sources/just_audio/AudioSource.m @@ -1,4 +1,4 @@ -#import "AudioSource.h" +#import "./include/just_audio/AudioSource.h" #import @implementation AudioSource { diff --git a/just_audio/darwin/Classes/BetterEventChannel.m b/just_audio/darwin/just_audio/Sources/just_audio/BetterEventChannel.m similarity index 94% rename from just_audio/darwin/Classes/BetterEventChannel.m rename to just_audio/darwin/just_audio/Sources/just_audio/BetterEventChannel.m index d92a05626..ad52bb2d3 100644 --- a/just_audio/darwin/Classes/BetterEventChannel.m +++ b/just_audio/darwin/just_audio/Sources/just_audio/BetterEventChannel.m @@ -1,4 +1,4 @@ -#import "BetterEventChannel.h" +#import "./include/just_audio/BetterEventChannel.h" @implementation BetterEventChannel { FlutterEventChannel *_eventChannel; diff --git a/just_audio/darwin/Classes/ClippingAudioSource.m b/just_audio/darwin/just_audio/Sources/just_audio/ClippingAudioSource.m similarity index 94% rename from just_audio/darwin/Classes/ClippingAudioSource.m rename to just_audio/darwin/just_audio/Sources/just_audio/ClippingAudioSource.m index 3c14d1309..e65fb016c 100644 --- a/just_audio/darwin/Classes/ClippingAudioSource.m +++ b/just_audio/darwin/just_audio/Sources/just_audio/ClippingAudioSource.m @@ -1,7 +1,7 @@ -#import "AudioSource.h" -#import "ClippingAudioSource.h" -#import "IndexedPlayerItem.h" -#import "UriAudioSource.h" +#import "./include/just_audio/AudioSource.h" +#import "./include/just_audio/ClippingAudioSource.h" +#import "./include/just_audio/IndexedPlayerItem.h" +#import "./include/just_audio/UriAudioSource.h" #import @implementation ClippingAudioSource { diff --git a/just_audio/darwin/Classes/ConcatenatingAudioSource.m b/just_audio/darwin/just_audio/Sources/just_audio/ConcatenatingAudioSource.m similarity index 97% rename from just_audio/darwin/Classes/ConcatenatingAudioSource.m rename to just_audio/darwin/just_audio/Sources/just_audio/ConcatenatingAudioSource.m index 5ace6af1c..fa8956fb7 100644 --- a/just_audio/darwin/Classes/ConcatenatingAudioSource.m +++ b/just_audio/darwin/just_audio/Sources/just_audio/ConcatenatingAudioSource.m @@ -1,5 +1,5 @@ -#import "AudioSource.h" -#import "ConcatenatingAudioSource.h" +#import "./include/just_audio/AudioSource.h" +#import "./include/just_audio/ConcatenatingAudioSource.h" #import #import diff --git a/just_audio/darwin/Classes/IndexedAudioSource.m b/just_audio/darwin/just_audio/Sources/just_audio/IndexedAudioSource.m similarity index 95% rename from just_audio/darwin/Classes/IndexedAudioSource.m rename to just_audio/darwin/just_audio/Sources/just_audio/IndexedAudioSource.m index 94a3b2ff3..45ffb6747 100644 --- a/just_audio/darwin/Classes/IndexedAudioSource.m +++ b/just_audio/darwin/just_audio/Sources/just_audio/IndexedAudioSource.m @@ -1,5 +1,5 @@ -#import "IndexedAudioSource.h" -#import "IndexedPlayerItem.h" +#import "./include/just_audio/IndexedAudioSource.h" +#import "./include/just_audio/IndexedPlayerItem.h" #import @implementation IndexedAudioSource { diff --git a/just_audio/darwin/just_audio/Sources/just_audio/IndexedPlayerItem.m b/just_audio/darwin/just_audio/Sources/just_audio/IndexedPlayerItem.m new file mode 100644 index 000000000..dd4eb86eb --- /dev/null +++ b/just_audio/darwin/just_audio/Sources/just_audio/IndexedPlayerItem.m @@ -0,0 +1,6 @@ +#import "./include/just_audio/IndexedPlayerItem.h" +#import "./include/just_audio/IndexedAudioSource.h" + +@implementation IndexedPlayerItem +@synthesize audioSource; +@end diff --git a/just_audio/darwin/Classes/JustAudioPlugin.m b/just_audio/darwin/just_audio/Sources/just_audio/JustAudioPlugin.m similarity index 96% rename from just_audio/darwin/Classes/JustAudioPlugin.m rename to just_audio/darwin/just_audio/Sources/just_audio/JustAudioPlugin.m index 30462fdfe..7aac91695 100644 --- a/just_audio/darwin/Classes/JustAudioPlugin.m +++ b/just_audio/darwin/just_audio/Sources/just_audio/JustAudioPlugin.m @@ -1,5 +1,5 @@ -#import "JustAudioPlugin.h" -#import "AudioPlayer.h" +#import "./include/just_audio/JustAudioPlugin.h" +#import "./include/just_audio/AudioPlayer.h" #import #include diff --git a/just_audio/darwin/Classes/LoadControl.m b/just_audio/darwin/just_audio/Sources/just_audio/LoadControl.m similarity index 79% rename from just_audio/darwin/Classes/LoadControl.m rename to just_audio/darwin/just_audio/Sources/just_audio/LoadControl.m index b2969cb5a..d27f6ef62 100644 --- a/just_audio/darwin/Classes/LoadControl.m +++ b/just_audio/darwin/just_audio/Sources/just_audio/LoadControl.m @@ -1,4 +1,4 @@ -#import "LoadControl.h" +#import "./include/just_audio/LoadControl.h" @implementation LoadControl @synthesize preferredForwardBufferDuration; diff --git a/just_audio/darwin/Classes/LoopingAudioSource.m b/just_audio/darwin/just_audio/Sources/just_audio/LoopingAudioSource.m similarity index 95% rename from just_audio/darwin/Classes/LoopingAudioSource.m rename to just_audio/darwin/just_audio/Sources/just_audio/LoopingAudioSource.m index 6293f42ab..a8a231bdd 100644 --- a/just_audio/darwin/Classes/LoopingAudioSource.m +++ b/just_audio/darwin/just_audio/Sources/just_audio/LoopingAudioSource.m @@ -1,5 +1,5 @@ -#import "AudioSource.h" -#import "LoopingAudioSource.h" +#import "./include/just_audio/AudioSource.h" +#import "./include/just_audio/LoopingAudioSource.h" #import @implementation LoopingAudioSource { diff --git a/just_audio/darwin/Classes/UriAudioSource.m b/just_audio/darwin/just_audio/Sources/just_audio/UriAudioSource.m similarity index 97% rename from just_audio/darwin/Classes/UriAudioSource.m rename to just_audio/darwin/just_audio/Sources/just_audio/UriAudioSource.m index 73073301d..6a1ba9e93 100644 --- a/just_audio/darwin/Classes/UriAudioSource.m +++ b/just_audio/darwin/just_audio/Sources/just_audio/UriAudioSource.m @@ -1,7 +1,7 @@ -#import "UriAudioSource.h" -#import "IndexedAudioSource.h" -#import "IndexedPlayerItem.h" -#import "LoadControl.h" +#import "./include/just_audio/UriAudioSource.h" +#import "./include/just_audio/IndexedAudioSource.h" +#import "./include/just_audio/IndexedPlayerItem.h" +#import "./include/just_audio/LoadControl.h" #import @implementation UriAudioSource { diff --git a/just_audio/macos/Classes/AudioPlayer.h b/just_audio/darwin/just_audio/Sources/just_audio/include/just_audio/AudioPlayer.h similarity index 91% rename from just_audio/macos/Classes/AudioPlayer.h rename to just_audio/darwin/just_audio/Sources/just_audio/include/just_audio/AudioPlayer.h index e17fc2b39..3538be34a 100644 --- a/just_audio/macos/Classes/AudioPlayer.h +++ b/just_audio/darwin/just_audio/Sources/just_audio/include/just_audio/AudioPlayer.h @@ -1,4 +1,8 @@ +#if TARGET_OS_OSX #import +#else +#import +#endif #import @interface AudioPlayer : NSObject diff --git a/just_audio/macos/Classes/AudioSource.h b/just_audio/darwin/just_audio/Sources/just_audio/include/just_audio/AudioSource.h similarity index 89% rename from just_audio/macos/Classes/AudioSource.h rename to just_audio/darwin/just_audio/Sources/just_audio/include/just_audio/AudioSource.h index aacfc1fa1..b23811195 100644 --- a/just_audio/macos/Classes/AudioSource.h +++ b/just_audio/darwin/just_audio/Sources/just_audio/include/just_audio/AudioSource.h @@ -1,4 +1,8 @@ +#if TARGET_OS_OSX #import +#else +#import +#endif @interface AudioSource : NSObject diff --git a/just_audio/macos/Classes/BetterEventChannel.h b/just_audio/darwin/just_audio/Sources/just_audio/include/just_audio/BetterEventChannel.h similarity index 81% rename from just_audio/macos/Classes/BetterEventChannel.h rename to just_audio/darwin/just_audio/Sources/just_audio/include/just_audio/BetterEventChannel.h index a9b384fd1..7974f0268 100644 --- a/just_audio/macos/Classes/BetterEventChannel.h +++ b/just_audio/darwin/just_audio/Sources/just_audio/include/just_audio/BetterEventChannel.h @@ -1,4 +1,8 @@ +#if TARGET_OS_OSX #import +#else +#import +#endif @interface BetterEventChannel : NSObject diff --git a/just_audio/macos/Classes/ClippingAudioSource.h b/just_audio/darwin/just_audio/Sources/just_audio/include/just_audio/ClippingAudioSource.h similarity index 85% rename from just_audio/macos/Classes/ClippingAudioSource.h rename to just_audio/darwin/just_audio/Sources/just_audio/include/just_audio/ClippingAudioSource.h index 8122e3a4d..47863f45c 100644 --- a/just_audio/macos/Classes/ClippingAudioSource.h +++ b/just_audio/darwin/just_audio/Sources/just_audio/include/just_audio/ClippingAudioSource.h @@ -1,6 +1,10 @@ #import "AudioSource.h" #import "UriAudioSource.h" +#if TARGET_OS_OSX #import +#else +#import +#endif @interface ClippingAudioSource : IndexedAudioSource diff --git a/just_audio/macos/Classes/ConcatenatingAudioSource.h b/just_audio/darwin/just_audio/Sources/just_audio/include/just_audio/ConcatenatingAudioSource.h similarity index 91% rename from just_audio/macos/Classes/ConcatenatingAudioSource.h rename to just_audio/darwin/just_audio/Sources/just_audio/include/just_audio/ConcatenatingAudioSource.h index 49da8ccd6..359e6e89c 100644 --- a/just_audio/macos/Classes/ConcatenatingAudioSource.h +++ b/just_audio/darwin/just_audio/Sources/just_audio/include/just_audio/ConcatenatingAudioSource.h @@ -1,5 +1,9 @@ #import "AudioSource.h" +#if TARGET_OS_OSX #import +#else +#import +#endif @interface ConcatenatingAudioSource : AudioSource diff --git a/just_audio/macos/Classes/IndexedAudioSource.h b/just_audio/darwin/just_audio/Sources/just_audio/include/just_audio/IndexedAudioSource.h similarity index 94% rename from just_audio/macos/Classes/IndexedAudioSource.h rename to just_audio/darwin/just_audio/Sources/just_audio/include/just_audio/IndexedAudioSource.h index 9bf755b8e..a46b02a48 100644 --- a/just_audio/macos/Classes/IndexedAudioSource.h +++ b/just_audio/darwin/just_audio/Sources/just_audio/include/just_audio/IndexedAudioSource.h @@ -1,6 +1,10 @@ #import "AudioSource.h" #import "IndexedPlayerItem.h" +#if TARGET_OS_OSX #import +#else +#import +#endif #import @interface IndexedAudioSource : AudioSource diff --git a/just_audio/ios/Classes/IndexedPlayerItem.h b/just_audio/darwin/just_audio/Sources/just_audio/include/just_audio/IndexedPlayerItem.h similarity index 100% rename from just_audio/ios/Classes/IndexedPlayerItem.h rename to just_audio/darwin/just_audio/Sources/just_audio/include/just_audio/IndexedPlayerItem.h diff --git a/just_audio/macos/Classes/JustAudioPlugin.h b/just_audio/darwin/just_audio/Sources/just_audio/include/just_audio/JustAudioPlugin.h similarity index 62% rename from just_audio/macos/Classes/JustAudioPlugin.h rename to just_audio/darwin/just_audio/Sources/just_audio/include/just_audio/JustAudioPlugin.h index 3f4068dea..ada737102 100644 --- a/just_audio/macos/Classes/JustAudioPlugin.h +++ b/just_audio/darwin/just_audio/Sources/just_audio/include/just_audio/JustAudioPlugin.h @@ -1,4 +1,8 @@ +#if TARGET_OS_OSX #import +#else +#import +#endif @interface JustAudioPlugin : NSObject @end diff --git a/just_audio/macos/Classes/LoadControl.h b/just_audio/darwin/just_audio/Sources/just_audio/include/just_audio/LoadControl.h similarity index 88% rename from just_audio/macos/Classes/LoadControl.h rename to just_audio/darwin/just_audio/Sources/just_audio/include/just_audio/LoadControl.h index 8d6cb9445..a115fdae9 100644 --- a/just_audio/macos/Classes/LoadControl.h +++ b/just_audio/darwin/just_audio/Sources/just_audio/include/just_audio/LoadControl.h @@ -1,3 +1,5 @@ +#import + @interface LoadControl : NSObject @property (readwrite, nonatomic) NSNumber *preferredForwardBufferDuration; diff --git a/just_audio/macos/Classes/LoopingAudioSource.h b/just_audio/darwin/just_audio/Sources/just_audio/include/just_audio/LoopingAudioSource.h similarity index 78% rename from just_audio/macos/Classes/LoopingAudioSource.h rename to just_audio/darwin/just_audio/Sources/just_audio/include/just_audio/LoopingAudioSource.h index a77636b8f..dab706196 100644 --- a/just_audio/macos/Classes/LoopingAudioSource.h +++ b/just_audio/darwin/just_audio/Sources/just_audio/include/just_audio/LoopingAudioSource.h @@ -1,5 +1,9 @@ #import "AudioSource.h" +#if TARGET_OS_OSX #import +#else +#import +#endif @interface LoopingAudioSource : AudioSource diff --git a/just_audio/macos/Classes/UriAudioSource.h b/just_audio/darwin/just_audio/Sources/just_audio/include/just_audio/UriAudioSource.h similarity index 86% rename from just_audio/macos/Classes/UriAudioSource.h rename to just_audio/darwin/just_audio/Sources/just_audio/include/just_audio/UriAudioSource.h index 6e771e5af..2a8050999 100644 --- a/just_audio/macos/Classes/UriAudioSource.h +++ b/just_audio/darwin/just_audio/Sources/just_audio/include/just_audio/UriAudioSource.h @@ -1,6 +1,10 @@ #import "IndexedAudioSource.h" #import "LoadControl.h" +#if TARGET_OS_OSX #import +#else +#import +#endif @interface UriAudioSource : IndexedAudioSource diff --git a/just_audio/example/ios/Podfile b/just_audio/example/ios/Podfile index 414ba51f1..62877219d 100644 --- a/just_audio/example/ios/Podfile +++ b/just_audio/example/ios/Podfile @@ -28,11 +28,19 @@ require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelpe flutter_ios_podfile_setup target 'Runner' do + use_frameworks! + use_modular_headers! flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) end post_install do |installer| installer.pods_project.targets.each do |target| flutter_additional_ios_build_settings(target) + target.build_configurations.each do |config| + config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [ + '$(inherited)', + 'AUDIO_SESSION_MICROPHONE=0' + ] + end end end diff --git a/just_audio/example/ios/Runner.xcodeproj/project.pbxproj b/just_audio/example/ios/Runner.xcodeproj/project.pbxproj index fed952262..4cfabbd19 100644 --- a/just_audio/example/ios/Runner.xcodeproj/project.pbxproj +++ b/just_audio/example/ios/Runner.xcodeproj/project.pbxproj @@ -7,15 +7,16 @@ objects = { /* Begin PBXBuildFile section */ + 0A720CB4D81263F42CDA9B37 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 193F48DFA6CEE2D2331AE551 /* Pods_Runner.framework */; }; 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; 9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; }; 978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; }; 97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; - D06FA586B72D3A4E8145F7B3 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C5F18129E1310C9DA1B65F44 /* libPods-Runner.a */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -34,6 +35,7 @@ /* Begin PBXFileReference section */ 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 193F48DFA6CEE2D2331AE551 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 2920064AACAD73E894573C6E /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; @@ -48,7 +50,6 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - C5F18129E1310C9DA1B65F44 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; }; EEEB488F061389F2C0725BDD /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -57,7 +58,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - D06FA586B72D3A4E8145F7B3 /* libPods-Runner.a in Frameworks */, + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, + 0A720CB4D81263F42CDA9B37 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -67,7 +69,7 @@ 1E7998A536E2BAD21DDFF12E /* Frameworks */ = { isa = PBXGroup; children = ( - C5F18129E1310C9DA1B65F44 /* libPods-Runner.a */, + 193F48DFA6CEE2D2331AE551 /* Pods_Runner.framework */, ); name = Frameworks; sourceTree = ""; @@ -150,13 +152,15 @@ 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - E3D27207363A6BEE407ADF2D /* [CP] Copy Pods Resources */, ); buildRules = ( ); dependencies = ( ); name = Runner; + packageProductDependencies = ( + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, + ); productName = Runner; productReference = 97C146EE1CF9000F007C117D /* Runner.app */; productType = "com.apple.product-type.application"; @@ -184,6 +188,9 @@ Base, ); mainGroup = 97C146E51CF9000F007C117D; + packageReferences = ( + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */, + ); productRefGroup = 97C146EF1CF9000F007C117D /* Products */; projectDirPath = ""; projectRoot = ""; @@ -262,24 +269,6 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; - E3D27207363A6BEE407ADF2D /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/path_provider_foundation/path_provider_foundation_privacy.bundle", - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/path_provider_foundation_privacy.bundle", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -573,6 +562,20 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCLocalSwiftPackageReference section */ + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = { + isa = XCLocalSwiftPackageReference; + relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; + }; +/* End XCLocalSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = { + isa = XCSwiftPackageProductDependency; + productName = FlutterGeneratedPluginSwiftPackage; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 97C146E61CF9000F007C117D /* Project object */; } diff --git a/just_audio/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/just_audio/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index e67b2808a..50f56ebf1 100644 --- a/just_audio/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/just_audio/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,10 +1,28 @@ + version = "1.7"> + + + + + + + + + + - - - - + + - - Bool { return true } + + override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool { + return true + } } diff --git a/just_audio/example/pubspec.yaml b/just_audio/example/pubspec.yaml index a31e51fdb..0601f25ff 100644 --- a/just_audio/example/pubspec.yaml +++ b/just_audio/example/pubspec.yaml @@ -8,7 +8,7 @@ environment: dependencies: flutter: sdk: flutter - audio_session: ^0.1.23 + audio_session: ^0.1.24 rxdart: ^0.28.0 just_audio_mpv: ^0.1.6 just_audio_windows: ^0.2.0 @@ -35,6 +35,7 @@ dev_dependencies: flutter_lints: ^2.0.1 flutter: + # disable-swift-package-manager: true uses-material-design: true assets: diff --git a/just_audio/ios/.gitignore b/just_audio/ios/.gitignore deleted file mode 100644 index aa479fd3c..000000000 --- a/just_audio/ios/.gitignore +++ /dev/null @@ -1,37 +0,0 @@ -.idea/ -.vagrant/ -.sconsign.dblite -.svn/ - -.DS_Store -*.swp -profile - -DerivedData/ -build/ -GeneratedPluginRegistrant.h -GeneratedPluginRegistrant.m - -.generated/ - -*.pbxuser -*.mode1v3 -*.mode2v3 -*.perspectivev3 - -!default.pbxuser -!default.mode1v3 -!default.mode2v3 -!default.perspectivev3 - -xcuserdata - -*.moved-aside - -*.pyc -*sync/ -Icon? -.tags* - -/Flutter/Generated.xcconfig -/Flutter/flutter_export_environment.sh \ No newline at end of file diff --git a/just_audio/ios/Assets/.gitkeep b/just_audio/ios/Assets/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/just_audio/ios/Classes/AudioPlayer.h b/just_audio/ios/Classes/AudioPlayer.h deleted file mode 100644 index 935073fb2..000000000 --- a/just_audio/ios/Classes/AudioPlayer.h +++ /dev/null @@ -1,26 +0,0 @@ -#import -#import - -@interface AudioPlayer : NSObject - -@property (readonly, nonatomic) AVQueuePlayer *player; -@property (readonly, nonatomic) float speed; - -- (instancetype)initWithRegistrar:(NSObject *)registrar playerId:(NSString*)idParam loadConfiguration:(NSDictionary *)loadConfiguration; -- (void)dispose:(BOOL)calledFromDealloc; - -@end - -enum ProcessingState { - none, - loading, - buffering, - ready, - completed -}; - -enum LoopMode { - loopOff, - loopOne, - loopAll -}; diff --git a/just_audio/ios/Classes/AudioPlayer.m b/just_audio/ios/Classes/AudioPlayer.m deleted file mode 120000 index 596ca1d0d..000000000 --- a/just_audio/ios/Classes/AudioPlayer.m +++ /dev/null @@ -1 +0,0 @@ -../../darwin/Classes/AudioPlayer.m \ No newline at end of file diff --git a/just_audio/ios/Classes/AudioSource.h b/just_audio/ios/Classes/AudioSource.h deleted file mode 100644 index 8f7210832..000000000 --- a/just_audio/ios/Classes/AudioSource.h +++ /dev/null @@ -1,14 +0,0 @@ -#import - -@interface AudioSource : NSObject - -@property (readonly, nonatomic) NSString* sourceId; -@property (readwrite, nonatomic) BOOL lazyLoading; - -- (instancetype)initWithId:(NSString *)sid; -- (int)buildSequence:(NSMutableArray *)sequence treeIndex:(int)treeIndex; -- (void)findById:(NSString *)sourceId matches:(NSMutableArray *)matches; -- (NSArray *)getShuffleIndices; -- (void)decodeShuffleOrder:(NSDictionary *)dict; - -@end diff --git a/just_audio/ios/Classes/AudioSource.m b/just_audio/ios/Classes/AudioSource.m deleted file mode 120000 index 16881d6f5..000000000 --- a/just_audio/ios/Classes/AudioSource.m +++ /dev/null @@ -1 +0,0 @@ -../../darwin/Classes/AudioSource.m \ No newline at end of file diff --git a/just_audio/ios/Classes/BetterEventChannel.h b/just_audio/ios/Classes/BetterEventChannel.h deleted file mode 100644 index d20ea2e16..000000000 --- a/just_audio/ios/Classes/BetterEventChannel.h +++ /dev/null @@ -1,9 +0,0 @@ -#import - -@interface BetterEventChannel : NSObject - -- (instancetype)initWithName:(NSString*)name messenger:(NSObject *)messenger; -- (void)sendEvent:(id)event; -- (void)dispose; - -@end diff --git a/just_audio/ios/Classes/BetterEventChannel.m b/just_audio/ios/Classes/BetterEventChannel.m deleted file mode 120000 index e43a7141c..000000000 --- a/just_audio/ios/Classes/BetterEventChannel.m +++ /dev/null @@ -1 +0,0 @@ -../../darwin/Classes/BetterEventChannel.m \ No newline at end of file diff --git a/just_audio/ios/Classes/ClippingAudioSource.h b/just_audio/ios/Classes/ClippingAudioSource.h deleted file mode 100644 index 127019e17..000000000 --- a/just_audio/ios/Classes/ClippingAudioSource.h +++ /dev/null @@ -1,11 +0,0 @@ -#import "AudioSource.h" -#import "UriAudioSource.h" -#import - -@interface ClippingAudioSource : IndexedAudioSource - -@property (readonly, nonatomic) UriAudioSource* audioSource; - -- (instancetype)initWithId:(NSString *)sid audioSource:(UriAudioSource *)audioSource start:(NSNumber *)start end:(NSNumber *)end; - -@end diff --git a/just_audio/ios/Classes/ClippingAudioSource.m b/just_audio/ios/Classes/ClippingAudioSource.m deleted file mode 120000 index d561b1e0e..000000000 --- a/just_audio/ios/Classes/ClippingAudioSource.m +++ /dev/null @@ -1 +0,0 @@ -../../darwin/Classes/ClippingAudioSource.m \ No newline at end of file diff --git a/just_audio/ios/Classes/ConcatenatingAudioSource.h b/just_audio/ios/Classes/ConcatenatingAudioSource.h deleted file mode 100644 index e1ded5796..000000000 --- a/just_audio/ios/Classes/ConcatenatingAudioSource.h +++ /dev/null @@ -1,14 +0,0 @@ -#import "AudioSource.h" -#import - -@interface ConcatenatingAudioSource : AudioSource - -@property (readonly, nonatomic) int count; - -- (instancetype)initWithId:(NSString *)sid audioSources:(NSMutableArray *)audioSources shuffleOrder:(NSArray *)shuffleOrder lazyLoading:(NSNumber *)lazyLoading; -- (void)insertSource:(AudioSource *)audioSource atIndex:(int)index; -- (void)removeSourcesFromIndex:(int)start toIndex:(int)end; -- (void)moveSourceFromIndex:(int)currentIndex toIndex:(int)newIndex; -- (void)setShuffleOrder:(NSArray *)shuffleOrder; - -@end diff --git a/just_audio/ios/Classes/ConcatenatingAudioSource.m b/just_audio/ios/Classes/ConcatenatingAudioSource.m deleted file mode 120000 index 1e2adbb70..000000000 --- a/just_audio/ios/Classes/ConcatenatingAudioSource.m +++ /dev/null @@ -1 +0,0 @@ -../../darwin/Classes/ConcatenatingAudioSource.m \ No newline at end of file diff --git a/just_audio/ios/Classes/IndexedAudioSource.h b/just_audio/ios/Classes/IndexedAudioSource.h deleted file mode 100644 index 6842ab63b..000000000 --- a/just_audio/ios/Classes/IndexedAudioSource.h +++ /dev/null @@ -1,28 +0,0 @@ -#import "AudioSource.h" -#import "IndexedPlayerItem.h" -#import -#import - -@interface IndexedAudioSource : AudioSource - -@property (readonly, nonatomic) IndexedPlayerItem *playerItem; -@property (readonly, nonatomic) IndexedPlayerItem *playerItem2; -@property (readwrite, nonatomic) CMTime duration; -@property (readonly, nonatomic) CMTime position; -@property (readonly, nonatomic) CMTime bufferedPosition; -@property (readonly, nonatomic) BOOL isAttached; - -- (void)onStatusChanged:(AVPlayerItemStatus)status; -- (void)attach:(AVQueuePlayer *)player initialPos:(CMTime)initialPos; -- (void)play:(AVQueuePlayer *)player; -- (void)pause:(AVQueuePlayer *)player; -- (void)stop:(AVQueuePlayer *)player; -- (void)seek:(CMTime)position; -- (void)seek:(CMTime)position completionHandler:(void (^)(BOOL))completionHandler; -- (void)preparePlayerItem2; -- (void)flip; -- (void)applyPreferredForwardBufferDuration; -- (void)applyCanUseNetworkResourcesForLiveStreamingWhilePaused; -- (void)applyPreferredPeakBitRate; - -@end diff --git a/just_audio/ios/Classes/IndexedAudioSource.m b/just_audio/ios/Classes/IndexedAudioSource.m deleted file mode 120000 index 051d5041c..000000000 --- a/just_audio/ios/Classes/IndexedAudioSource.m +++ /dev/null @@ -1 +0,0 @@ -../../darwin/Classes/IndexedAudioSource.m \ No newline at end of file diff --git a/just_audio/ios/Classes/IndexedPlayerItem.m b/just_audio/ios/Classes/IndexedPlayerItem.m deleted file mode 120000 index 04e55fc54..000000000 --- a/just_audio/ios/Classes/IndexedPlayerItem.m +++ /dev/null @@ -1 +0,0 @@ -../../darwin/Classes/IndexedPlayerItem.m \ No newline at end of file diff --git a/just_audio/ios/Classes/JustAudioPlugin.h b/just_audio/ios/Classes/JustAudioPlugin.h deleted file mode 100644 index a694322cd..000000000 --- a/just_audio/ios/Classes/JustAudioPlugin.h +++ /dev/null @@ -1,4 +0,0 @@ -#import - -@interface JustAudioPlugin : NSObject -@end diff --git a/just_audio/ios/Classes/JustAudioPlugin.m b/just_audio/ios/Classes/JustAudioPlugin.m deleted file mode 120000 index 8583f76e2..000000000 --- a/just_audio/ios/Classes/JustAudioPlugin.m +++ /dev/null @@ -1 +0,0 @@ -../../darwin/Classes/JustAudioPlugin.m \ No newline at end of file diff --git a/just_audio/ios/Classes/LoadControl.h b/just_audio/ios/Classes/LoadControl.h deleted file mode 100644 index 8d6cb9445..000000000 --- a/just_audio/ios/Classes/LoadControl.h +++ /dev/null @@ -1,7 +0,0 @@ -@interface LoadControl : NSObject - -@property (readwrite, nonatomic) NSNumber *preferredForwardBufferDuration; -@property (readwrite, nonatomic) BOOL canUseNetworkResourcesForLiveStreamingWhilePaused; -@property (readwrite, nonatomic) NSNumber *preferredPeakBitRate; - -@end diff --git a/just_audio/ios/Classes/LoadControl.m b/just_audio/ios/Classes/LoadControl.m deleted file mode 120000 index 3b2b5d223..000000000 --- a/just_audio/ios/Classes/LoadControl.m +++ /dev/null @@ -1 +0,0 @@ -../../darwin/Classes/LoadControl.m \ No newline at end of file diff --git a/just_audio/ios/Classes/LoopingAudioSource.h b/just_audio/ios/Classes/LoopingAudioSource.h deleted file mode 100644 index 7c524a978..000000000 --- a/just_audio/ios/Classes/LoopingAudioSource.h +++ /dev/null @@ -1,8 +0,0 @@ -#import "AudioSource.h" -#import - -@interface LoopingAudioSource : AudioSource - -- (instancetype)initWithId:(NSString *)sid audioSources:(NSArray *)audioSources; - -@end diff --git a/just_audio/ios/Classes/LoopingAudioSource.m b/just_audio/ios/Classes/LoopingAudioSource.m deleted file mode 120000 index 17c7958c5..000000000 --- a/just_audio/ios/Classes/LoopingAudioSource.m +++ /dev/null @@ -1 +0,0 @@ -../../darwin/Classes/LoopingAudioSource.m \ No newline at end of file diff --git a/just_audio/ios/Classes/UriAudioSource.h b/just_audio/ios/Classes/UriAudioSource.h deleted file mode 100644 index 1e4f92a6f..000000000 --- a/just_audio/ios/Classes/UriAudioSource.h +++ /dev/null @@ -1,11 +0,0 @@ -#import "IndexedAudioSource.h" -#import "LoadControl.h" -#import - -@interface UriAudioSource : IndexedAudioSource - -@property (readonly, nonatomic) NSString *uri; - -- (instancetype)initWithId:(NSString *)sid uri:(NSString *)uri loadControl:(LoadControl *)loadControl headers:(NSDictionary *)headers options:(NSDictionary *)options; - -@end diff --git a/just_audio/ios/Classes/UriAudioSource.m b/just_audio/ios/Classes/UriAudioSource.m deleted file mode 120000 index 8effbd7cb..000000000 --- a/just_audio/ios/Classes/UriAudioSource.m +++ /dev/null @@ -1 +0,0 @@ -../../darwin/Classes/UriAudioSource.m \ No newline at end of file diff --git a/just_audio/ios/just_audio.podspec b/just_audio/ios/just_audio.podspec deleted file mode 100644 index ba5c7d261..000000000 --- a/just_audio/ios/just_audio.podspec +++ /dev/null @@ -1,21 +0,0 @@ -# -# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html -# -Pod::Spec.new do |s| - s.name = 'just_audio' - s.version = '0.0.1' - s.summary = 'A new flutter plugin project.' - s.description = <<-DESC -A new flutter plugin project. - DESC - s.homepage = 'http://example.com' - s.license = { :file => '../LICENSE' } - s.author = { 'Your Company' => 'email@example.com' } - s.source = { :path => '.' } - s.source_files = 'Classes/**/*' - s.public_header_files = 'Classes/**/*.h' - s.dependency 'Flutter' - s.platform = :ios, '8.0' - s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'VALID_ARCHS[sdk=iphonesimulator*]' => 'x86_64' } -end - diff --git a/just_audio/macos/.gitignore b/just_audio/macos/.gitignore deleted file mode 100644 index aa479fd3c..000000000 --- a/just_audio/macos/.gitignore +++ /dev/null @@ -1,37 +0,0 @@ -.idea/ -.vagrant/ -.sconsign.dblite -.svn/ - -.DS_Store -*.swp -profile - -DerivedData/ -build/ -GeneratedPluginRegistrant.h -GeneratedPluginRegistrant.m - -.generated/ - -*.pbxuser -*.mode1v3 -*.mode2v3 -*.perspectivev3 - -!default.pbxuser -!default.mode1v3 -!default.mode2v3 -!default.perspectivev3 - -xcuserdata - -*.moved-aside - -*.pyc -*sync/ -Icon? -.tags* - -/Flutter/Generated.xcconfig -/Flutter/flutter_export_environment.sh \ No newline at end of file diff --git a/just_audio/macos/Assets/.gitkeep b/just_audio/macos/Assets/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/just_audio/macos/Classes/AudioPlayer.m b/just_audio/macos/Classes/AudioPlayer.m deleted file mode 120000 index 596ca1d0d..000000000 --- a/just_audio/macos/Classes/AudioPlayer.m +++ /dev/null @@ -1 +0,0 @@ -../../darwin/Classes/AudioPlayer.m \ No newline at end of file diff --git a/just_audio/macos/Classes/AudioSource.m b/just_audio/macos/Classes/AudioSource.m deleted file mode 120000 index 16881d6f5..000000000 --- a/just_audio/macos/Classes/AudioSource.m +++ /dev/null @@ -1 +0,0 @@ -../../darwin/Classes/AudioSource.m \ No newline at end of file diff --git a/just_audio/macos/Classes/BetterEventChannel.m b/just_audio/macos/Classes/BetterEventChannel.m deleted file mode 120000 index e43a7141c..000000000 --- a/just_audio/macos/Classes/BetterEventChannel.m +++ /dev/null @@ -1 +0,0 @@ -../../darwin/Classes/BetterEventChannel.m \ No newline at end of file diff --git a/just_audio/macos/Classes/ClippingAudioSource.m b/just_audio/macos/Classes/ClippingAudioSource.m deleted file mode 120000 index d561b1e0e..000000000 --- a/just_audio/macos/Classes/ClippingAudioSource.m +++ /dev/null @@ -1 +0,0 @@ -../../darwin/Classes/ClippingAudioSource.m \ No newline at end of file diff --git a/just_audio/macos/Classes/ConcatenatingAudioSource.m b/just_audio/macos/Classes/ConcatenatingAudioSource.m deleted file mode 120000 index 1e2adbb70..000000000 --- a/just_audio/macos/Classes/ConcatenatingAudioSource.m +++ /dev/null @@ -1 +0,0 @@ -../../darwin/Classes/ConcatenatingAudioSource.m \ No newline at end of file diff --git a/just_audio/macos/Classes/IndexedAudioSource.m b/just_audio/macos/Classes/IndexedAudioSource.m deleted file mode 120000 index 051d5041c..000000000 --- a/just_audio/macos/Classes/IndexedAudioSource.m +++ /dev/null @@ -1 +0,0 @@ -../../darwin/Classes/IndexedAudioSource.m \ No newline at end of file diff --git a/just_audio/macos/Classes/IndexedPlayerItem.h b/just_audio/macos/Classes/IndexedPlayerItem.h deleted file mode 100644 index 8a86a94d4..000000000 --- a/just_audio/macos/Classes/IndexedPlayerItem.h +++ /dev/null @@ -1,9 +0,0 @@ -#import - -@class IndexedAudioSource; - -@interface IndexedPlayerItem : AVPlayerItem - -@property (readwrite, nonatomic, weak) IndexedAudioSource *audioSource; - -@end diff --git a/just_audio/macos/Classes/IndexedPlayerItem.m b/just_audio/macos/Classes/IndexedPlayerItem.m deleted file mode 120000 index 04e55fc54..000000000 --- a/just_audio/macos/Classes/IndexedPlayerItem.m +++ /dev/null @@ -1 +0,0 @@ -../../darwin/Classes/IndexedPlayerItem.m \ No newline at end of file diff --git a/just_audio/macos/Classes/JustAudioPlugin.m b/just_audio/macos/Classes/JustAudioPlugin.m deleted file mode 120000 index 8583f76e2..000000000 --- a/just_audio/macos/Classes/JustAudioPlugin.m +++ /dev/null @@ -1 +0,0 @@ -../../darwin/Classes/JustAudioPlugin.m \ No newline at end of file diff --git a/just_audio/macos/Classes/LoadControl.m b/just_audio/macos/Classes/LoadControl.m deleted file mode 120000 index 3b2b5d223..000000000 --- a/just_audio/macos/Classes/LoadControl.m +++ /dev/null @@ -1 +0,0 @@ -../../darwin/Classes/LoadControl.m \ No newline at end of file diff --git a/just_audio/macos/Classes/LoopingAudioSource.m b/just_audio/macos/Classes/LoopingAudioSource.m deleted file mode 120000 index 17c7958c5..000000000 --- a/just_audio/macos/Classes/LoopingAudioSource.m +++ /dev/null @@ -1 +0,0 @@ -../../darwin/Classes/LoopingAudioSource.m \ No newline at end of file diff --git a/just_audio/macos/Classes/UriAudioSource.m b/just_audio/macos/Classes/UriAudioSource.m deleted file mode 120000 index 8effbd7cb..000000000 --- a/just_audio/macos/Classes/UriAudioSource.m +++ /dev/null @@ -1 +0,0 @@ -../../darwin/Classes/UriAudioSource.m \ No newline at end of file diff --git a/just_audio/pubspec.yaml b/just_audio/pubspec.yaml index 63601311a..e1c6e0ce5 100644 --- a/just_audio/pubspec.yaml +++ b/just_audio/pubspec.yaml @@ -1,6 +1,6 @@ name: just_audio description: A feature-rich audio player for Flutter. Loop, clip and concatenate any sound from any source (asset/file/URL/stream) in a variety of audio formats with gapless playback. -version: 0.9.43 +version: 0.9.44 repository: https://github.com/ryanheise/just_audio/tree/minor/just_audio issue_tracker: https://github.com/ryanheise/just_audio/issues topics: @@ -20,7 +20,7 @@ dependencies: just_audio_web: ^0.4.11 # just_audio_web: # path: ../just_audio_web - audio_session: ^0.1.23 + audio_session: ^0.1.24 rxdart: '>=0.26.0 <0.29.0' path: ^1.8.0 path_provider: ^2.0.0 @@ -46,7 +46,9 @@ flutter: pluginClass: JustAudioPlugin ios: pluginClass: JustAudioPlugin + sharedDarwinSource: true macos: pluginClass: JustAudioPlugin + sharedDarwinSource: true web: default_package: just_audio_web