fix(linux): allow reusing event channel with same name

.github/workflows/test.yml

@@ -268,8 +268,9 @@ jobs:
       - uses: actions/checkout@v3
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: ${{ inputs.flutter_version }}
-          channel: 'stable'
+          # TODO: uncomment and change to `stable`, when flutter/flutter#129534 has been released.
+          #flutter-version: ${{ inputs.flutter_version }}
+          channel: 'master'
       - uses: bluefireteam/melos-action@main
       - name: Install Flutter requirements for Linux
         run: |

packages/audioplayers/example/integration_test/lib_test.dart

@@ -21,9 +21,6 @@ void main() {
   final isAndroid = !kIsWeb && Platform.isAndroid;
   final isLinux = !kIsWeb && Platform.isLinux;
 
-  // FIXME(gustl22): Cannot reuse event channel with same id on Linux (flutter/flutter#126209)
-  var linuxPlayerCount = 0;
-
   final wavUrl1TestData = LibSourceTestData(
     source: UrlSource(wavUrl1),
     duration: const Duration(milliseconds: 451),
@@ -79,7 +76,7 @@ void main() {
         // Start all players simultaneously
         final iterator = List<int>.generate(audioTestDataList.length, (i) => i);
         if (isLinux) {
-          // FIXME(gustl22): Linux needs additional pump (#1507)
+          // FIXME(gustl22): Linux needs additional pump (#1556)
           await tester.pump();
         }
         await Future.wait<void>(
@@ -98,10 +95,7 @@ void main() {
           }
           await players[i].stop();
         }
-        if (!isLinux) {
-          // FIXME(gustl22): Linux not disposing properly (#1507)
-          await Future.wait(players.map((p) => p.dispose()));
-        }
+        await Future.wait(players.map((p) => p.dispose()));
       },
       // FIXME: Causes media error on Android (see #1333, #1353)
       // Unexpected platform error: MediaPlayer error with
@@ -116,7 +110,7 @@ void main() {
       for (var i = 0; i < audioTestDataList.length; i++) {
         final td = audioTestDataList[i];
         if (isLinux) {
-          // FIXME(gustl22): Linux needs additional pump (#1507)
+          // FIXME(gustl22): Linux needs additional pump (#1556)
           await tester.pump();
         }
         await player.play(td.source);
@@ -131,10 +125,7 @@ void main() {
         }
         await player.stop();
       }
-      if (!isLinux) {
-        // FIXME(gustl22): Linux not disposing properly (#1507)
-        await player.dispose();
-      }
+      await player.dispose();
     });
   });
 
@@ -161,7 +152,7 @@ void main() {
         await player.setAudioContext(audioContext);
 
         if (isLinux) {
-          // FIXME(gustl22): Linux needs additional pump (#1507)
+          // FIXME(gustl22): Linux needs additional pump (#1556)
           await tester.pump();
         }
         await player.play(td.source);
@@ -180,10 +171,7 @@ void main() {
         await tester.pumpAndSettle();
         await tester.pump(td.duration + const Duration(seconds: 8));
         expect(player.state, PlayerState.completed);
-        if (!isLinux) {
-          // FIXME(gustl22): Linux not disposing properly (#1507)
-          await player.dispose();
-        }
+        await player.dispose();
       },
       skip: !features.hasForceSpeaker,
     );
@@ -211,7 +199,7 @@ void main() {
         await player.setAudioContext(audioContext);
 
         if (isLinux) {
-          // FIXME(gustl22): Linux needs additional pump (#1507)
+          // FIXME(gustl22): Linux needs additional pump (#1556)
           await tester.pump();
         }
         await player.setSource(td.source);
@@ -235,10 +223,7 @@ void main() {
         expect(player.state, PlayerState.playing);
         await player.stop();
         expect(player.state, PlayerState.stopped);
-        if (!isLinux) {
-          // FIXME(gustl22): Linux not disposing properly (#1507)
-          await player.dispose();
-        }
+        await player.dispose();
       },
       skip: !features.hasForceSpeaker || !features.hasLowLatency,
     );
@@ -248,7 +233,7 @@ void main() {
     testWidgets('Emit platform log', (tester) async {
       final logCompleter = Completer<String>();
 
-      final playerId = 'somePlayerId${isLinux ? linuxPlayerCount++ : ''}';
+      const playerId = 'somePlayerId';
       final player = AudioPlayer(playerId: playerId);
       final onLogSub = player.onLog.listen(
         logCompleter.complete,
@@ -289,7 +274,7 @@ void main() {
         try {
           // Throws PlatformException via MethodChannel:
           if (isLinux) {
-            // FIXME(gustl22): Linux needs additional pump (#1507)
+            // FIXME(gustl22): Linux needs additional pump (#1556)
             await tester.pump();
           }
           await player.setSource(AssetSource(invalidAsset));
@@ -298,10 +283,7 @@ void main() {
         } catch (e) {
           expect(e, isInstanceOf<PlatformException>());
         }
-        if (!isLinux) {
-          // FIXME(gustl22): Linux not disposing properly (#1507)
-          await player.dispose();
-        }
+        await player.dispose();
       },
     );
 
@@ -312,7 +294,7 @@ void main() {
         try {
           // Throws PlatformException via MethodChannel:
           if (isLinux) {
-            // FIXME(gustl22): Linux needs additional pump (#1507)
+            // FIXME(gustl22): Linux needs additional pump (#1556)
             await tester.pump();
           }
           await player.setSource(UrlSource('non_existent.txt'));
@@ -321,10 +303,7 @@ void main() {
         } catch (e) {
           expect(e, isInstanceOf<PlatformException>());
         }
-        if (!isLinux) {
-          // FIXME(gustl22): Linux not disposing properly (#1507)
-          await player.dispose();
-        }
+        await player.dispose();
       },
     );
   });
@@ -333,7 +312,7 @@ void main() {
     testWidgets('#create and #dispose', (tester) async {
       final platform = AudioplayersPlatformInterface.instance;
 
-      final playerId = 'somePlayerId${isLinux ? linuxPlayerCount++ : ''}';
+      const playerId = 'somePlayerId';
       await platform.create(playerId);
       await tester.pumpAndSettle();
       await platform.dispose(playerId);
@@ -354,7 +333,7 @@ void main() {
     testWidgets('#setSource #getPosition and #getDuration', (tester) async {
       final platform = AudioplayersPlatformInterface.instance;
 
-      final playerId = 'somePlayerId${isLinux ? linuxPlayerCount++ : ''}';
+      const playerId = 'somePlayerId';
       await platform.create(playerId);
 
       final preparedCompleter = Completer<void>();
@@ -371,7 +350,7 @@ void main() {
         onError: preparedCompleter.completeError,
       );
       if (isLinux) {
-        // FIXME(gustl22): Linux needs additional pump (#1507)
+        // FIXME(gustl22): Linux needs additional pump (#1556)
         await tester.pump();
       }
       await platform.setSourceUrl(
@@ -387,16 +366,13 @@ void main() {
       );
 
       await onPreparedSub.cancel();
-      if (!isLinux) {
-        // FIXME(gustl22): Linux not disposing properly (#1507)
-        await platform.dispose(playerId);
-      }
+      await platform.dispose(playerId);
     });
 
     testWidgets('#seek with millisecond precision', (tester) async {
       final platform = AudioplayersPlatformInterface.instance;
 
-      final playerId = 'somePlayerId${isLinux ? linuxPlayerCount++ : ''}';
+      const playerId = 'somePlayerId';
       await platform.create(playerId);
 
       final preparedCompleter = Completer<void>();
@@ -413,7 +389,7 @@ void main() {
         onError: preparedCompleter.completeError,
       );
       if (isLinux) {
-        // FIXME(gustl22): Linux needs additional pump (#1507)
+        // FIXME(gustl22): Linux needs additional pump (#1556)
         await tester.pump();
       }
       await platform.setSourceUrl(
@@ -437,16 +413,13 @@ void main() {
       expect(await platform.getCurrentPosition(playerId), 21);
 
       await onPreparedSub.cancel();
-      if (!isLinux) {
-        // FIXME(gustl22): Linux not disposing properly (#1507)
-        await platform.dispose(playerId);
-      }
+      await platform.dispose(playerId);
     });
 
     testWidgets('Set same source twice (#1520)', (tester) async {
       final platform = AudioplayersPlatformInterface.instance;
 
-      final playerId = 'somePlayerId${isLinux ? linuxPlayerCount++ : ''}';
+      const playerId = 'somePlayerId';
       await platform.create(playerId);
 
       final eventStream = platform.getEventStream(playerId);
@@ -464,7 +437,7 @@ void main() {
           onError: preparedCompleter.completeError,
         );
         if (isLinux) {
-          // FIXME(gustl22): Linux needs additional pump (#1507)
+          // FIXME(gustl22): Linux needs additional pump (#1556)
           await tester.pump();
         }
         await platform.setSourceUrl(
@@ -474,63 +447,30 @@ void main() {
         await preparedCompleter.future.timeout(const Duration(seconds: 30));
         await onPreparedSub.cancel();
       }
-      if (!isLinux) {
-        // FIXME(gustl22): Linux not disposing properly (#1507)
-        await platform.dispose(playerId);
-      }
+      await platform.dispose(playerId);
     });
   });
 
   group('Platform event channel', () {
     testWidgets('Listen and cancel twice', (tester) async {
       final platform = AudioplayersPlatformInterface.instance;
 
-      final playerId = 'somePlayerId${isLinux ? linuxPlayerCount++ : ''}';
+      const playerId = 'somePlayerId';
       await platform.create(playerId);
 
       final eventStream = platform.getEventStream(playerId);
       for (var i = 0; i < 2; i++) {
         final eventSub = eventStream.listen(null);
         await eventSub.cancel();
       }
-      if (!isLinux) {
-        // FIXME(gustl22): Linux not disposing properly (#1507)
-        await platform.dispose(playerId);
-      }
+      await platform.dispose(playerId);
     });
 
-    // TODO(gustl22): remove once https://github.com/flutter/flutter/issues/126209
-    // is fixed, as tests should cover the problem in flutter engine.
-    testWidgets(
-      'Reuse same platform event channel id',
-      (tester) async {
-        final platform = AudioplayersPlatformInterface.instance;
-
-        const playerId = 'somePlayerId';
-        await platform.create(playerId);
-
-        final eventStreamSub = platform.getEventStream(playerId).listen((_) {});
-
-        await eventStreamSub.cancel();
-        await platform.dispose(playerId);
-
-        // Recreate player with same player Id
-        await platform.create(playerId);
-
-        final eventStreamSub2 =
-            platform.getEventStream(playerId).listen((_) {});
-
-        await eventStreamSub2.cancel();
-        await platform.dispose(playerId);
-      },
-      skip: isLinux,
-    );
-
     testWidgets('Emit platform error', (tester) async {
       final errorCompleter = Completer<Object>();
       final platform = AudioplayersPlatformInterface.instance;
 
-      final playerId = 'somePlayerId${isLinux ? linuxPlayerCount++ : ''}';
+      const playerId = 'somePlayerId';
       await platform.create(playerId);
 
       final eventStreamSub = platform