riff
/
riff_app
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

switched to exoplayer 2.11.0. added some debug to the metadata

remotes/origin/devel
yattoz 2019-12-11 23:08:48 +01:00
parent 4d90d42f68
commit 836da0f80f
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -64,7 +64,7 @@ dependencies {
*/ */
implementation "androidx.media:media:1.1.0" implementation "androidx.media:media:1.1.0"
implementation 'com.google.android.exoplayer:exoplayer:2.10.6' implementation 'com.google.android.exoplayer:exoplayer:2.11.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0' implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.1.0' implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.1.0'

19
app/src/main/java/fr/forum_thalie/tsumugi/RadioService.kt
View File

@ -32,11 +32,11 @@ import androidx.media.AudioManagerCompat
import androidx.preference.PreferenceManager import androidx.preference.PreferenceManager
import com.google.android.exoplayer2.* import com.google.android.exoplayer2.*
import com.google.android.exoplayer2.metadata.icy.* import com.google.android.exoplayer2.metadata.icy.*
import com.google.android.exoplayer2.trackselection.DefaultTrackSelector
import fr.forum_thalie.tsumugi.alarm.RadioAlarm import fr.forum_thalie.tsumugi.alarm.RadioAlarm
import fr.forum_thalie.tsumugi.alarm.RadioSleeper import fr.forum_thalie.tsumugi.alarm.RadioSleeper
import fr.forum_thalie.tsumugi.playerstore.PlayerStore import fr.forum_thalie.tsumugi.playerstore.PlayerStore
import java.util.* import java.util.*
import kotlin.collections.ArrayList
import kotlin.math.exp import kotlin.math.exp
import kotlin.math.ln import kotlin.math.ln
import kotlin.system.exitProcess import kotlin.system.exitProcess
@ -348,7 +348,10 @@ class RadioService : MediaBrowserServiceCompat() {
setBufferDurationsMs(minBufferMillis, maxBufferMillis, bufferForPlayback, bufferForPlaybackAfterRebuffer) setBufferDurationsMs(minBufferMillis, maxBufferMillis, bufferForPlayback, bufferForPlaybackAfterRebuffer)
}.createDefaultLoadControl() }.createDefaultLoadControl()
player = ExoPlayerFactory.newSimpleInstance(this, DefaultTrackSelector(), loadControl) val playerBuilder = SimpleExoPlayer.Builder(this)
playerBuilder.setLoadControl(loadControl)
player = playerBuilder.build()
player.addMetadataOutput { player.addMetadataOutput {
for (i in 0 until it.length()) { for (i in 0 until it.length()) {
val entry = it.get(i) val entry = it.get(i)
@ -356,9 +359,19 @@ class RadioService : MediaBrowserServiceCompat() {
Log.d(tag, radioTag + "onMetadata: IcyHeaders $entry") Log.d(tag, radioTag + "onMetadata: IcyHeaders $entry")
} }
if (entry is IcyInfo) { if (entry is IcyInfo) {
Log.d(tag, radioTag + "onMetadata: Title ----> ${entry.title}") Log.e(tag, radioTag + "onMetadata: Title ----> ${entry.title}")
// Note : Kotlin supports UTF-8 by default. // Note : Kotlin supports UTF-8 by default.
numberOfSongs++ numberOfSongs++
val s = entry.title!!
val a = ArrayList<Int>()
for (j in s.indices)
{
a.add(s[j].toInt())
}
Log.e(tag, a.toString())
Log.e(tag, "raw: ${it}")
val data = entry.title!! val data = entry.title!!
PlayerStore.instance.currentSong.setTitleArtist(data) PlayerStore.instance.currentSong.setTitleArtist(data)
} }