capacitor-plugin-playlist 0.5.1 → 0.6.1

package/android/src/main/java/org/dwbn/plugins/playlist/PlaylistPlugin.kt

@@ -1,5 +1,7 @@
 package org.dwbn.plugins.playlist
 
+import android.os.Handler
+import android.os.Looper
 import android.util.Log
 import com.devbrackets.android.playlistcore.data.MediaProgress
 import com.getcapacitor.*
@@ -22,20 +24,25 @@ class PlaylistPlugin : Plugin(), OnStatusReportListener {
 
     @PluginMethod
     fun initialize(call: PluginCall) {
-        statusCallback = OnStatusCallback(this)
-        onStatus(RmxAudioStatusMessage.RMXSTATUS_REGISTER, "INIT", null)
-        Log.i(TAG, "Initialized...")
-        audioPlayerImpl!!.resume()
-        call.resolve()
+        Handler(Looper.getMainLooper()).post {
+            statusCallback = OnStatusCallback(this)
+            onStatus(RmxAudioStatusMessage.RMXSTATUS_REGISTER, "INIT", null)
+            Log.i(TAG, "Initialized...")
+
+            audioPlayerImpl!!.resume()
+            call.resolve()
+        }
     }
     @PluginMethod
     fun setOptions(call: PluginCall) {
-        val options: JSObject = call.getObject("options") ?: JSObject()
-        resetStreamOnPause = options.optBoolean("resetStreamOnPause", this.resetStreamOnPause)
-        Log.i("AudioPlayerOptions", options.toString())
-        audioPlayerImpl!!.resetStreamOnPause = resetStreamOnPause
-        audioPlayerImpl!!.setOptions(options)
-        call.resolve()
+        Handler(Looper.getMainLooper()).post {
+            val options: JSObject = call.getObject("options") ?: JSObject()
+            resetStreamOnPause = options.optBoolean("resetStreamOnPause", this.resetStreamOnPause)
+            Log.i("AudioPlayerOptions", options.toString())
+            audioPlayerImpl!!.resetStreamOnPause = resetStreamOnPause
+            audioPlayerImpl!!.setOptions(options)
+            call.resolve()
+        }
     }
 
     @PluginMethod
@@ -47,260 +54,317 @@ class PlaylistPlugin : Plugin(), OnStatusReportListener {
 
     @PluginMethod
     fun setLoop(call: PluginCall) {
-        val loop: Boolean = call.getBoolean("loop", audioPlayerImpl!!.playlistManager.loop)!!
-        audioPlayerImpl!!.playlistManager.loop = loop
-        call.resolve()
-        Log.i(TAG,"setLoop: " + (if (loop)  "TRUE" else "FALSE"))
+        Handler(Looper.getMainLooper()).post {
+            val loop: Boolean = call.getBoolean("loop", audioPlayerImpl!!.playlistManager.loop)!!
+            audioPlayerImpl!!.playlistManager.loop = loop
+            call.resolve()
+            Log.i(TAG, "setLoop: " + (if (loop) "TRUE" else "FALSE"))
+        }
     }
 
     @PluginMethod
     fun setPlaylistItems(call: PluginCall) {
-        val items: JSArray = call.getArray("items")
-        val optionsArgs: JSONObject = call.getObject("options")
-        val options = PlaylistItemOptions(optionsArgs)
-
-        val trackItems: ArrayList<AudioTrack> = getTrackItems(items)
-        audioPlayerImpl!!.playlistManager.setAllItems(trackItems, options)
-        for (playerItem in trackItems) {
-            if (playerItem.trackId != null) {
-                onStatus(RmxAudioStatusMessage.RMXSTATUS_ITEM_ADDED, playerItem.trackId, playerItem.toDict())
+        Handler(Looper.getMainLooper()).post {
+            val items: JSArray = call.getArray("items")
+            val optionsArgs: JSONObject = call.getObject("options")
+            val options = PlaylistItemOptions(optionsArgs)
+
+            val trackItems: ArrayList<AudioTrack> = getTrackItems(items)
+            audioPlayerImpl!!.playlistManager.setAllItems(trackItems, options)
+            for (playerItem in trackItems) {
+                if (playerItem.trackId != null) {
+                    onStatus(
+                        RmxAudioStatusMessage.RMXSTATUS_ITEM_ADDED,
+                        playerItem.trackId,
+                        playerItem.toDict()
+                    )
+                }
             }
-        }
 
-        call.resolve()
+            call.resolve()
 
-        Log.i(TAG,"setPlaylistItems" + items.length().toString())
+            Log.i(TAG, "setPlaylistItems" + items.length().toString())
+        }
     }
 
     @PluginMethod
     fun addItem(call: PluginCall) {
-        val item: JSONObject = call.getObject("item")
-        val playerItem: AudioTrack? = getTrackItem(item)
-        audioPlayerImpl!!.getPlaylistManager().addItem(playerItem)
-
-
-        if (playerItem?.trackId != null) {
-            onStatus(RmxAudioStatusMessage.RMXSTATUS_ITEM_ADDED, playerItem.trackId, playerItem.toDict())
+        Handler(Looper.getMainLooper()).post {
+            val item: JSONObject = call.getObject("item")
+            val playerItem: AudioTrack? = getTrackItem(item)
+            audioPlayerImpl!!.getPlaylistManager().addItem(playerItem)
+
+
+            if (playerItem?.trackId != null) {
+                onStatus(
+                    RmxAudioStatusMessage.RMXSTATUS_ITEM_ADDED,
+                    playerItem.trackId,
+                    playerItem.toDict()
+                )
+            }
+            call.resolve()
+            Log.i(TAG, "addItem")
         }
-        call.resolve()
-        Log.i(TAG,"addItem")
     }
 
     @PluginMethod
     fun addAllItems(call: PluginCall) {
-        val items: JSONArray = call.getArray("items")
-        val trackItems = getTrackItems(items)
-        audioPlayerImpl!!.playlistManager.addAllItems(trackItems)
-
-        for (playerItem in trackItems) {
-            if (playerItem.trackId != null) {
-                onStatus(RmxAudioStatusMessage.RMXSTATUS_ITEM_ADDED, playerItem.trackId, playerItem.toDict())
+        Handler(Looper.getMainLooper()).post {
+            val items: JSONArray = call.getArray("items")
+            val trackItems = getTrackItems(items)
+            audioPlayerImpl!!.playlistManager.addAllItems(trackItems)
+
+            for (playerItem in trackItems) {
+                if (playerItem.trackId != null) {
+                    onStatus(
+                        RmxAudioStatusMessage.RMXSTATUS_ITEM_ADDED,
+                        playerItem.trackId,
+                        playerItem.toDict()
+                    )
+                }
             }
+            call.resolve()
+            Log.i(TAG, "addAllItems")
         }
-        call.resolve()
-        Log.i(TAG,"addAllItems")
     }
 
     @PluginMethod
     fun removeItem(call: PluginCall) {
-        val trackIndex: Int = call.getInt("index", -1)!!
-        val trackId: String = call.getString("id", "")!!
-        Log.i(TAG,"removeItem trackIn" )
-        val item = audioPlayerImpl!!.playlistManager.removeItem(trackIndex, trackId)
-
-        if (item != null) {
-            onStatus(RmxAudioStatusMessage.RMXSTATUS_ITEM_REMOVED, item.trackId, item.toDict())
-            call.resolve()
-        }
-        else {
-            call.reject("Could not find item!")
+        Handler(Looper.getMainLooper()).post {
+            val trackIndex: Int = call.getInt("index", -1)!!
+            val trackId: String = call.getString("id", "")!!
+            Log.i(TAG, "removeItem trackIn")
+            val item = audioPlayerImpl!!.playlistManager.removeItem(trackIndex, trackId)
+
+            if (item != null) {
+                onStatus(RmxAudioStatusMessage.RMXSTATUS_ITEM_REMOVED, item.trackId, item.toDict())
+                call.resolve()
+            } else {
+                call.reject("Could not find item!")
+            }
         }
     }
 
     @PluginMethod
     fun removeItems(call: PluginCall) {
-        val items: JSONArray = call.getArray("items")
-        var removed = 0
-
-        val removals = ArrayList<TrackRemovalItem>()
-        for (index in 0 until items.length()) {
-            val entry = items.optJSONObject(index) ?: continue
-            val trackIndex = entry.optInt("trackIndex", -1)
-            val trackId = entry.optString("trackId", "")
-            removals.add(TrackRemovalItem(trackIndex, trackId))
-            val removedTracks = audioPlayerImpl!!.playlistManager.removeAllItems(removals)
-            if (removedTracks.size > 0) {
-                for (removedItem in removedTracks) {
-                    onStatus(RmxAudioStatusMessage.RMXSTATUS_ITEM_REMOVED, removedItem.trackId, removedItem.toDict())
+        Handler(Looper.getMainLooper()).post {
+            val items: JSONArray = call.getArray("items")
+            var removed = 0
+
+            val removals = ArrayList<TrackRemovalItem>()
+            for (index in 0 until items.length()) {
+                val entry = items.optJSONObject(index) ?: continue
+                val trackIndex = entry.optInt("trackIndex", -1)
+                val trackId = entry.optString("trackId", "")
+                removals.add(TrackRemovalItem(trackIndex, trackId))
+                val removedTracks = audioPlayerImpl!!.playlistManager.removeAllItems(removals)
+                if (removedTracks.size > 0) {
+                    for (removedItem in removedTracks) {
+                        onStatus(
+                            RmxAudioStatusMessage.RMXSTATUS_ITEM_REMOVED,
+                            removedItem.trackId,
+                            removedItem.toDict()
+                        )
+                    }
+                    removed = removedTracks.size
                 }
-                removed = removedTracks.size
             }
-        }
 
-        val result = JSObject()
-        result.put("removed", removed)
-        call.resolve(result)
+            val result = JSObject()
+            result.put("removed", removed)
+            call.resolve(result)
 
-        Log.i(TAG,"removeItems")
+            Log.i(TAG, "removeItems")
+        }
     }
 
     @PluginMethod
     fun clearAllItems(call: PluginCall) {
-        audioPlayerImpl!!.playlistManager.clearItems()
+        Handler(Looper.getMainLooper()).post {
+            audioPlayerImpl!!.playlistManager.clearItems()
 
-        onStatus(RmxAudioStatusMessage.RMXSTATUS_PLAYLIST_CLEARED, "INVALID", null)
-        call.resolve()
+            onStatus(RmxAudioStatusMessage.RMXSTATUS_PLAYLIST_CLEARED, "INVALID", null)
+            call.resolve()
 
-        Log.i(TAG,"clearAllItems")
+            Log.i(TAG, "clearAllItems")
+        }
     }
 
     @PluginMethod
     fun play(call: PluginCall) {
-        if (audioPlayerImpl!!.playlistManager.playlistHandler != null) {
-            val isPlaying = (audioPlayerImpl!!.playlistManager.playlistHandler?.currentMediaPlayer != null
-                    && audioPlayerImpl!!.playlistManager.playlistHandler?.currentMediaPlayer?.isPlaying!!)
-            // There's a bug in the threaded repeater that it stacks up the repeat calls instead of ignoring
-            // additional ones or starting a new one. E.g. every time this is called, you'd get a new repeat cycle,
-            // meaning you get N updates per second. Ew.
-            if (!isPlaying) {
-                audioPlayerImpl!!.playlistManager.playlistHandler?.play()
-                //audioPlayerImpl.getPlaylistManager().playlistHandler.seek(position)
+        Handler(Looper.getMainLooper()).post {
+            if (audioPlayerImpl!!.playlistManager.playlistHandler != null) {
+                val isPlaying =
+                    (audioPlayerImpl!!.playlistManager.playlistHandler?.currentMediaPlayer != null
+                            && audioPlayerImpl!!.playlistManager.playlistHandler?.currentMediaPlayer?.isPlaying!!)
+                // There's a bug in the threaded repeater that it stacks up the repeat calls instead of ignoring
+                // additional ones or starting a new one. E.g. every time this is called, you'd get a new repeat cycle,
+                // meaning you get N updates per second. Ew.
+                if (!isPlaying) {
+                    audioPlayerImpl!!.playlistManager.playlistHandler?.play()
+                    //audioPlayerImpl.getPlaylistManager().playlistHandler.seek(position)
+                }
             }
-        }
 
-        call.resolve()
+            call.resolve()
 
-        Log.i(TAG,"play")
+            Log.i(TAG, "play")
+        }
     }
 
     @PluginMethod
     fun playTrackByIndex(call: PluginCall) {
-        val index: Int = call.getInt("index", audioPlayerImpl!!.playlistManager.currentPosition)!!
-        val seekPosition = (call.getInt("position", 0)!! * 1000.0).toLong()
+        Handler(Looper.getMainLooper()).post {
+            val index: Int =
+                call.getInt("index", audioPlayerImpl!!.playlistManager.currentPosition)!!
+            val seekPosition = (call.getInt("position", 0)!! * 1000.0).toLong()
 
-        audioPlayerImpl!!.playlistManager.currentPosition = index
-        audioPlayerImpl!!.playlistManager.beginPlayback(seekPosition, false)
+            audioPlayerImpl!!.playlistManager.currentPosition = index
+            audioPlayerImpl!!.playlistManager.beginPlayback(seekPosition, false)
 
-        call.resolve()
+            call.resolve()
 
-        Log.i(TAG,"playTrackByIndex")
+            Log.i(TAG, "playTrackByIndex")
+        }
     }
 
     @PluginMethod
     fun playTrackById(call: PluginCall) {
-        val id: String = call.getString("id")!!
-        if ("" != id) {
-            // alternatively we could search for the item and set the current index to that item.
-            val code = id.hashCode()
-            val seekPosition = (call.getInt("position", 0)!! * 1000.0).toLong()
-            audioPlayerImpl!!.playlistManager.setCurrentItem(code.toLong())
-            audioPlayerImpl!!.playlistManager.beginPlayback(seekPosition, false)
-        }
+        Handler(Looper.getMainLooper()).post {
+            val id: String = call.getString("id")!!
+            if ("" != id) {
+                // alternatively we could search for the item and set the current index to that item.
+                val code = id.hashCode()
+                val seekPosition = (call.getInt("position", 0)!! * 1000.0).toLong()
+                audioPlayerImpl!!.playlistManager.setCurrentItem(code.toLong())
+                audioPlayerImpl!!.playlistManager.beginPlayback(seekPosition, false)
+            }
 
-        call.resolve()
+            call.resolve()
 
-        Log.i(TAG,"playTrackById")
+            Log.i(TAG, "playTrackById")
+        }
     }
 
     @PluginMethod
     fun selectTrackByIndex(call: PluginCall) {
-        val index: Int = call.getInt("index", audioPlayerImpl!!.playlistManager.currentPosition)!!
+        Handler(Looper.getMainLooper()).post {
+            val index: Int =
+                call.getInt("index", audioPlayerImpl!!.playlistManager.currentPosition)!!
 
-        audioPlayerImpl!!.playlistManager.currentPosition = index
+            audioPlayerImpl!!.playlistManager.currentPosition = index
 
-        val seekPosition = (call.getInt("position", 0)!! * 1000.0).toLong()
+            val seekPosition = (call.getInt("position", 0)!! * 1000.0).toLong()
 
-        audioPlayerImpl!!.playlistManager.beginPlayback(seekPosition, true)
+            audioPlayerImpl!!.playlistManager.beginPlayback(seekPosition, true)
 
-        call.resolve()
+            call.resolve()
 
-        Log.i(TAG,"selectTrackByIndex")
+            Log.i(TAG, "selectTrackByIndex")
+        }
     }
 
 
     @PluginMethod
     fun selectTrackById(call: PluginCall) {
-        val id: String = call.getString("id")!!
-        if ("" != id) {
-            // alternatively we could search for the item and set the current index to that item.
-            val code = id.hashCode()
-            audioPlayerImpl!!.playlistManager.setCurrentItem(code.toLong())
+        Handler(Looper.getMainLooper()).post {
+            val id: String = call.getString("id")!!
+            if ("" != id) {
+                // alternatively we could search for the item and set the current index to that item.
+                val code = id.hashCode()
+                audioPlayerImpl!!.playlistManager.setCurrentItem(code.toLong())
 
-            val seekPosition = (call.getInt("position", 0)!! * 1000.0).toLong()
+                val seekPosition = (call.getInt("position", 0)!! * 1000.0).toLong()
 
-            audioPlayerImpl!!.playlistManager.beginPlayback(seekPosition, true)
-        }
-        call.resolve()
+                audioPlayerImpl!!.playlistManager.beginPlayback(seekPosition, true)
+            }
+            call.resolve()
 
-        Log.i(TAG,"selectTrackById")
+            Log.i(TAG, "selectTrackById")
+        }
     }
 
     @PluginMethod
     fun pause(call: PluginCall) {
-        audioPlayerImpl!!.playlistManager.invokePausePlay()
+        Handler(Looper.getMainLooper()).post {
+            audioPlayerImpl!!.playlistManager.invokePausePlay()
 
-        call.resolve()
+            call.resolve()
 
-        Log.i(TAG,"pause")
+            Log.i(TAG, "pause")
+        }
     }
 
     @PluginMethod
     fun skipForward(call: PluginCall) {
-        audioPlayerImpl!!.playlistManager.invokeNext()
+        Handler(Looper.getMainLooper()).post {
+            audioPlayerImpl!!.playlistManager.invokeNext()
 
-        call.resolve()
+            call.resolve()
 
-        Log.i(TAG,"skipForward")
+            Log.i(TAG, "skipForward")
+        }
     }
 
     @PluginMethod
     fun skipBack(call: PluginCall) {
-        audioPlayerImpl!!.playlistManager.invokePrevious()
+        Handler(Looper.getMainLooper()).post {
+            audioPlayerImpl!!.playlistManager.invokePrevious()
 
-        call.resolve()
+            call.resolve()
 
-        Log.i(TAG,"skipBack")
+            Log.i(TAG, "skipBack")
+        }
     }
 
     @PluginMethod
     fun seekTo(call: PluginCall) {
-        var position: Long = 0
-        val progress: MediaProgress? = audioPlayerImpl!!.playlistManager.currentProgress
-        if (progress != null) {
-            position = progress.position
-        }
+        Handler(Looper.getMainLooper()).post {
+            var position: Long = 0
+            val progress: MediaProgress? = audioPlayerImpl!!.playlistManager.currentProgress
+            if (progress != null) {
+                position = progress.position
+            }
 
-        val seekPosition = (call.getInt("position",  (position / 1000.0f).toInt())!! * 1000.0).toLong()
+            val seekPosition =
+                (call.getInt("position", (position / 1000.0f).toInt())!! * 1000.0).toLong()
 
-        val isPlaying: Boolean? = audioPlayerImpl!!.playlistManager.playlistHandler?.currentMediaPlayer?.isPlaying
-        audioPlayerImpl!!.playlistManager.playlistHandler?.seek(seekPosition)
-        if (isPlaying === null || !isPlaying) {
-            audioPlayerImpl!!.playlistManager.playlistHandler?.pause(false)
-        }
+            val isPlaying: Boolean? =
+                audioPlayerImpl!!.playlistManager.playlistHandler?.currentMediaPlayer?.isPlaying
+            audioPlayerImpl!!.playlistManager.playlistHandler?.seek(seekPosition)
+            if (isPlaying === null || !isPlaying) {
+                audioPlayerImpl!!.playlistManager.playlistHandler?.pause(false)
+            }
 
-        call.resolve()
+            call.resolve()
 
-        Log.i(TAG,"seekTo")
+            Log.i(TAG, "seekTo")
+        }
     }
 
     @PluginMethod
     fun setPlaybackRate(call: PluginCall) {
-        val speed = call.getFloat("rate", audioPlayerImpl!!.playlistManager.getPlaybackSpeed())!!
-        audioPlayerImpl!!.playlistManager.setPlaybackSpeed(speed)
+        Handler(Looper.getMainLooper()).post {
+            val speed =
+                call.getFloat("rate", audioPlayerImpl!!.playlistManager.getPlaybackSpeed())!!
+            audioPlayerImpl!!.playlistManager.setPlaybackSpeed(speed)
 
-        call.resolve()
+            call.resolve()
 
-        Log.i(TAG,"setPlaybackRate")
+            Log.i(TAG, "setPlaybackRate")
+        }
     }
 
     @PluginMethod
     fun setVolume(call: PluginCall) {
-        val volume = call.getFloat("volume", audioPlayerImpl!!.volume)!!
-        audioPlayerImpl!!.volume = volume
+        Handler(Looper.getMainLooper()).post {
+            val volume = call.getFloat("volume", audioPlayerImpl!!.volume)!!
+            audioPlayerImpl!!.volume = volume
 
-        call.resolve()
+            call.resolve()
 
-        Log.i(TAG,"addItem")
+            Log.i(TAG, "addItem")
+        }
     }
 
     override fun handleOnDestroy() {

package/android/src/main/java/org/dwbn/plugins/playlist/RmxAudioPlayer.java

@@ -4,6 +4,9 @@ import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.OptIn;
+import androidx.media3.common.util.UnstableApi;
+import androidx.media3.exoplayer.ExoPlaybackException;
 
 import com.devbrackets.android.exomedia.listener.OnErrorListener;
 import com.devbrackets.android.playlistcore.data.MediaProgress;
@@ -12,7 +15,6 @@ import com.devbrackets.android.playlistcore.data.PlaylistItemChange;
 import com.devbrackets.android.playlistcore.listener.PlaybackStatusListener;
 import com.devbrackets.android.playlistcore.listener.PlaylistListener;
 import com.devbrackets.android.playlistcore.listener.ProgressListener;
-import com.google.android.exoplayer2.ExoPlaybackException;
 
 import org.dwbn.plugins.playlist.data.AudioTrack;
 import org.dwbn.plugins.playlist.manager.MediaControlsListener;
@@ -142,7 +144,7 @@ public class RmxAudioPlayer implements PlaybackStatusListener<AudioTrack>,
         onStatus(RmxAudioStatusMessage.RMX_STATUS_SKIP_FORWARD, trackId, param);
     }
 
-    @Override
+    @OptIn(markerClass = UnstableApi.class) @Override
     public boolean onError(Exception e) {
         String errorMsg = e.toString();
         RmxAudioErrorType errorType = RmxAudioErrorType.RMXERR_NONE_SUPPORTED;

package/android/src/main/java/org/dwbn/plugins/playlist/manager/PlaylistManager.kt

@@ -48,9 +48,10 @@ class PlaylistManager(application: Application) :
     val isPlaying: Boolean
         get() = playlistHandler != null && playlistHandler!!.currentMediaPlayer != null && playlistHandler!!.currentMediaPlayer!!.isPlaying
 
-    override fun onError(e: Exception): Boolean {
-        Log.i(TAG, "onError: $e")
-        if (errorListener.get() != null) {
+    override fun onError(e: Exception?): Boolean {
+
+        if (e != null && errorListener.get() != null) {
+            Log.i(TAG, "onError: $e")
             errorListener.get()!!.onError(e)
         }
         return true
@@ -77,10 +78,10 @@ class PlaylistManager(application: Application) :
     override operator fun next(): AudioTrack? {
         if (isNextAvailable) {
             val isAtEnd = currentPosition + 1 >= itemCount
-            if (isAtEnd && loop) {
-                currentPosition = 0
+            currentPosition = if (isAtEnd && loop) {
+                0
             } else {
-                currentPosition = (currentPosition + 1).coerceAtMost(itemCount)
+                (currentPosition + 1).coerceAtMost(itemCount)
             }
         } else {
             if (loop) {
@@ -283,4 +284,5 @@ class PlaylistManager(application: Application) :
         setParameters(audioTracks, 0)
         options = Options(application.baseContext)
     }
+
 }

package/android/src/main/java/org/dwbn/plugins/playlist/playlist/AudioApi.kt

@@ -6,10 +6,12 @@ import android.net.Uri
 import android.os.PowerManager
 import androidx.annotation.FloatRange
 import androidx.annotation.IntRange
+import androidx.media3.common.AudioAttributes
+import androidx.media3.common.C
+import androidx.media3.exoplayer.util.EventLogger
 import com.devbrackets.android.exomedia.AudioPlayer
 import com.devbrackets.android.exomedia.listener.OnErrorListener
 import com.devbrackets.android.playlistcore.manager.BasePlaylistManager
-import com.google.android.exoplayer2.util.EventLogger
 import org.dwbn.plugins.playlist.data.AudioTrack
 import java.lang.ref.WeakReference
 import java.util.concurrent.locks.ReentrantLock
@@ -42,8 +44,8 @@ class AudioApi(context: Context) : BaseMediaApi() {
         audioPlayer.setOnSeekCompletionListener(this)
         audioPlayer.setOnBufferUpdateListener(this)
 
-        audioPlayer.setWakeMode(context, PowerManager.PARTIAL_WAKE_LOCK)
-        audioPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC)
+        audioPlayer.setWakeLevel(PowerManager.PARTIAL_WAKE_LOCK)
+        audioPlayer.setAudioAttributes(getAudioAttributes(C.USAGE_MEDIA, C.AUDIO_CONTENT_TYPE_MUSIC))
         audioPlayer.setAnalyticsListener(EventLogger(null))
     }
 
@@ -56,7 +58,7 @@ class AudioApi(context: Context) : BaseMediaApi() {
     }
 
     override fun stop() {
-        audioPlayer.stopPlayback()
+        audioPlayer.stop()
     }
 
     override fun reset() {
@@ -68,7 +70,7 @@ class AudioApi(context: Context) : BaseMediaApi() {
     }
 
     override fun setVolume(@FloatRange(from = 0.0, to = 1.0) left: Float, @FloatRange(from = 0.0, to = 1.0) right: Float) {
-        audioPlayer.setVolume(left, right)
+        audioPlayer.volume = (left + right) / 2
     }
 
     override fun seekTo(@IntRange(from = 0L) milliseconds: Long) {
@@ -79,23 +81,30 @@ class AudioApi(context: Context) : BaseMediaApi() {
         return item.mediaType == BasePlaylistManager.AUDIO
     }
 
-    fun setPlaybackSpeed(@FloatRange(from = 0.0, to = 1.0) speed: Float) {
-        audioPlayer.playbackSpeed = speed
-    }
     override fun playItem(item: AudioTrack) {
         try {
-            prepared = false
             bufferPercent = 0
-            audioPlayer.setDataSource(Uri.parse(if (item.downloaded) item.downloadedMediaUri else item.mediaUrl))
-            audioPlayer.prepareAsync()
+            audioPlayer.setMedia(Uri.parse(if (item.downloaded) item.downloadedMediaUri else item.mediaUrl))
         } catch (e: Exception) {
             //Purposefully left blank
         }
     }
 
+    fun setPlaybackSpeed(@FloatRange(from = 0.0, to = 1.0) speed: Float) {
+        audioPlayer.setPlaybackSpeed(speed)
+    }
+
     fun addErrorListener(listener: OnErrorListener) {
         errorListenersLock.lock()
         errorListeners.add(WeakReference<OnErrorListener>(listener))
         errorListenersLock.unlock()
     }
+
+    @Suppress("SameParameterValue")
+    private fun getAudioAttributes(@C.AudioUsage usage: Int, @C.AudioContentType contentType: Int): AudioAttributes {
+        return AudioAttributes.Builder()
+            .setUsage(usage)
+            .setContentType(contentType)
+            .build()
+    }
 }