Skip to content

A cross platform Audiobookshelf client for Android and iOS

Dart

just audio fix for mono

Nathan Poulson2b7c45443edc
diff --git a/android/app/src/main/kotlin/com/barnabas/absorb/MainActivity.kt b/android/app/src/main/kotlin/com/barnabas/absorb/MainActivity.kt
index 4bacb12f..b5011e5b 100644
--- a/android/app/src/main/kotlin/com/barnabas/absorb/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/barnabas/absorb/MainActivity.kt
@@ -12,7 +12,7 @@ import android.os.Environment
import android.os.StatFs
import android.util.Log
import com.ryanheise.audioservice.AudioServiceActivity
-import com.ryanheise.just_audio.AudioPlayer
+import com.ryanheise.just_audio.MonoController
import io.flutter.embedding.engine.FlutterEngine
import io.flutter.plugin.common.MethodChannel
@@ -67,7 +67,7 @@ class MainActivity : AudioServiceActivity() {
}
"setMono" -> {
val enabled = call.argument<Boolean>("enabled") ?: false
- AudioPlayer.setMonoEnabled(enabled)
+ MonoController.setMonoEnabled(enabled)
result.success(true)
}
else -> result.notImplemented()
diff --git a/packages/just_audio/android/src/main/java/com/ryanheise/just_audio/AudioPlayer.java b/packages/just_audio/android/src/main/java/com/ryanheise/just_audio/AudioPlayer.java
index 932dfe04..15a07bff 100644
--- a/packages/just_audio/android/src/main/java/com/ryanheise/just_audio/AudioPlayer.java
+++ b/packages/just_audio/android/src/main/java/com/ryanheise/just_audio/AudioPlayer.java
@@ -105,8 +105,8 @@ public class AudioPlayer implements MethodCallHandler, Player.Listener, Metadata
private Map<String, Object> pendingPlaybackEvent;
private ExoPlayer player;
- private androidx.media3.exoplayer.audio.ChannelMixingAudioProcessor monoProcessor;
- private static androidx.media3.exoplayer.audio.ChannelMixingAudioProcessor sMonoProcessor;
+ private androidx.media3.common.audio.ChannelMixingAudioProcessor monoProcessor;
+ private static androidx.media3.common.audio.ChannelMixingAudioProcessor sMonoProcessor;
private Integer audioSessionId;
private MediaSource mediaSource;
private Integer currentIndex;
@@ -776,8 +776,12 @@ public class AudioPlayer implements MethodCallHandler, Player.Listener, Metadata
private void ensurePlayerInitialized() {
if (player == null) {
androidx.media3.common.audio.SonicAudioProcessor sonicAudioProcessor = new androidx.media3.common.audio.SonicAudioProcessor();
- monoProcessor = new androidx.media3.exoplayer.audio.ChannelMixingAudioProcessor();
+ monoProcessor = new androidx.media3.common.audio.ChannelMixingAudioProcessor();
+ // Set identity matrix so audio passes through by default
+ monoProcessor.putChannelMixingMatrix(
+ new androidx.media3.common.audio.ChannelMixingMatrix(2, 2, new float[]{1f, 0f, 0f, 1f}));
sMonoProcessor = monoProcessor;
+ MonoController.register(AudioPlayer::setMonoEnabled);
RenderersFactory renderersFactory = new DefaultRenderersFactory(context) {
@Override
protected AudioSink buildAudioSink(
@@ -1015,16 +1019,16 @@ public class AudioPlayer implements MethodCallHandler, Player.Listener, Metadata
player.setSkipSilenceEnabled(enabled);
}
- public static void setMonoEnabled(final boolean enabled) {
+ private static void setMonoEnabled(final boolean enabled) {
if (sMonoProcessor == null) return;
if (enabled) {
// Mix both input channels equally into both output channels
sMonoProcessor.putChannelMixingMatrix(
- new androidx.media3.exoplayer.audio.ChannelMixingMatrix(2, 2, new float[]{0.5f, 0.5f, 0.5f, 0.5f}));
+ new androidx.media3.common.audio.ChannelMixingMatrix(2, 2, new float[]{0.5f, 0.5f, 0.5f, 0.5f}));
} else {
// Identity matrix - passthrough
sMonoProcessor.putChannelMixingMatrix(
- new androidx.media3.exoplayer.audio.ChannelMixingMatrix(2, 2, new float[]{1f, 0f, 0f, 1f}));
+ new androidx.media3.common.audio.ChannelMixingMatrix(2, 2, new float[]{1f, 0f, 0f, 1f}));
}
}
diff --git a/packages/just_audio/android/src/main/java/com/ryanheise/just_audio/MonoController.java b/packages/just_audio/android/src/main/java/com/ryanheise/just_audio/MonoController.java
new file mode 100644
index 00000000..bd510736
--- /dev/null
+++ b/packages/just_audio/android/src/main/java/com/ryanheise/just_audio/MonoController.java
@@ -0,0 +1,22 @@
+package com.ryanheise.just_audio;
+
+/**
+ * Static bridge so external code (e.g. MainActivity) can toggle mono
+ * without directly importing AudioPlayer (which causes classpath issues).
+ */
+public class MonoController {
+ public interface Callback {
+ void setMonoEnabled(boolean enabled);
+ }
+
+ private static volatile Callback sCallback;
+
+ public static void register(Callback callback) {
+ sCallback = callback;
+ }
+
+ public static void setMonoEnabled(boolean enabled) {
+ Callback cb = sCallback;
+ if (cb != null) cb.setMonoEnabled(enabled);
+ }
+}