Merge branch 'cristian1980-minor' into minor

ryanheise · Oct 29, 2024 · 7beeb16 · 7beeb16
2 parents 35a33da + 4322bf7
commit 7beeb16
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 deletions.
diff --git a/just_audio/CHANGELOG.md b/just_audio/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.9.42
+
+* Fix dealloc crash on iOS/macOS (@cristian1980).
+
 ## 0.9.41
 
 * Fix stop() to cause play() to return on iOS.

diff --git a/just_audio/darwin/Classes/AudioPlayer.m b/just_audio/darwin/Classes/AudioPlayer.m
@@ -1326,13 +1326,15 @@ - (void)seek:(CMTime)position index:(NSNumber *)newIndex completionHandler:(void
     }
 }
 
-- (void)dispose {
+- (void)dispose:(BOOL)calledFromDealloc {
     if (!_player) return;
     if (_processingState != none) {
         [_player pause];
 
         [self updatePosition];
-        [self broadcastPlaybackEvent];
+        if (!calledFromDealloc) {
+            [self broadcastPlaybackEvent];
+        }
         if (_playResult) {
             //NSLog(@"PLAY FINISHED DUE TO STOP");
             _playResult(@{});

diff --git a/just_audio/darwin/Classes/JustAudioPlugin.m b/just_audio/darwin/Classes/JustAudioPlugin.m
@@ -40,12 +40,12 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
     } else if ([@"disposePlayer" isEqualToString:call.method]) {
         NSDictionary *request = (NSDictionary *)call.arguments;
         NSString *playerId = request[@"id"];
-        [_players[playerId] dispose];
+        [_players[playerId] dispose:NO];
         [_players setValue:nil forKey:playerId];
         result(@{});
     } else if ([@"disposeAllPlayers" isEqualToString:call.method]) {
         for (NSString *playerId in _players) {
-            [_players[playerId] dispose];
+            [_players[playerId] dispose:NO];
         }
         [_players removeAllObjects];
         result(@{});
@@ -56,7 +56,7 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
 
 - (void)dealloc {
     for (NSString *playerId in _players) {
-        [_players[playerId] dispose];
+        [_players[playerId] dispose:YES];
     }
     [_players removeAllObjects];
 }

diff --git a/just_audio/ios/Classes/AudioPlayer.h b/just_audio/ios/Classes/AudioPlayer.h
@@ -7,7 +7,7 @@
 @property (readonly, nonatomic) float speed;
 
 - (instancetype)initWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar playerId:(NSString*)idParam loadConfiguration:(NSDictionary *)loadConfiguration;
-- (void)dispose;
+- (void)dispose:(BOOL)calledFromDealloc;
 
 @end
 

diff --git a/just_audio/macos/Classes/AudioPlayer.h b/just_audio/macos/Classes/AudioPlayer.h
@@ -7,7 +7,7 @@
 @property (readonly, nonatomic) float speed;
 
 - (instancetype)initWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar playerId:(NSString*)idParam loadConfiguration:(NSDictionary *)loadConfiguration;
-- (void)dispose;
+- (void)dispose:(BOOL)calledFromDealloc;
 
 @end
 

diff --git 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.41
+version: 0.9.42
 repository: https://github.com/ryanheise/just_audio/tree/minor/just_audio
 issue_tracker: https://github.com/ryanheise/just_audio/issues
 topics: