diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..a6ad715
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "ExoPlayer"]
+ path = ExoPlayer
+ url = https://github.com/google/ExoPlayer/
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 169fd0d..add6ddc 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -8,6 +8,28 @@
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 35eb1dd..257ba1f 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,5 +2,6 @@
+
\ No newline at end of file
diff --git a/ExoPlayer b/ExoPlayer
new file mode 160000
index 0000000..24a1926
--- /dev/null
+++ b/ExoPlayer
@@ -0,0 +1 @@
+Subproject commit 24a19264dbf35e326bbd7bb36c232eb180e1e26d
diff --git a/app/build.gradle b/app/build.gradle
index 9a7267f..d7bb91e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -65,7 +65,9 @@ dependencies {
*/
implementation "androidx.media:media:1.1.0"
- implementation 'com.google.android.exoplayer:exoplayer:2.11.0'
+ //implementation 'com.google.android.exoplayer:exoplayer:2.11.1'
+ implementation project(':exoplayer-library') // uses local ExoPlayer clone, from dev-v2 branch (fixes ISO-8859-1 ICY metadata
+
implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.1.0'
diff --git a/app/debug/app-debug.apk b/app/debug/app-debug.apk
new file mode 100644
index 0000000..8eac5f2
Binary files /dev/null and b/app/debug/app-debug.apk differ
diff --git a/app/debug/output.json b/app/debug/output.json
new file mode 100644
index 0000000..0c446fd
--- /dev/null
+++ b/app/debug/output.json
@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":2,"versionName":"1.1dev","enabled":true,"outputFile":"app-debug.apk","fullName":"debug","baseName":"debug"},"path":"app-debug.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
new file mode 100644
index 0000000..d799d9d
Binary files /dev/null and b/app/release/app-release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
new file mode 100644
index 0000000..5ea8229
--- /dev/null
+++ b/app/release/output.json
@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":2,"versionName":"1.1dev","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/fr/forum_thalie/tsumugi/RadioService.kt b/app/src/main/java/fr/forum_thalie/tsumugi/RadioService.kt
index c0a06ac..5abb908 100644
--- a/app/src/main/java/fr/forum_thalie/tsumugi/RadioService.kt
+++ b/app/src/main/java/fr/forum_thalie/tsumugi/RadioService.kt
@@ -32,6 +32,7 @@ import androidx.media.AudioManagerCompat
import androidx.preference.PreferenceManager
import com.google.android.exoplayer2.*
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.RadioSleeper
import fr.forum_thalie.tsumugi.planning.Planning
@@ -350,9 +351,13 @@ class RadioService : MediaBrowserServiceCompat() {
setBufferDurationsMs(minBufferMillis, maxBufferMillis, bufferForPlayback, bufferForPlaybackAfterRebuffer)
}.createDefaultLoadControl()
+ /*
val playerBuilder = SimpleExoPlayer.Builder(this)
playerBuilder.setLoadControl(loadControl)
player = playerBuilder.build()
+ */
+
+ player = ExoPlayerFactory.newSimpleInstance(this, DefaultTrackSelector(), loadControl)
player.addMetadataOutput {
for (i in 0 until it.length()) {
diff --git a/app/src/main/java/fr/forum_thalie/tsumugi/ui/news/NewsAdapter.kt b/app/src/main/java/fr/forum_thalie/tsumugi/ui/news/NewsAdapter.kt
index 1aac559..2378de6 100644
--- a/app/src/main/java/fr/forum_thalie/tsumugi/ui/news/NewsAdapter.kt
+++ b/app/src/main/java/fr/forum_thalie/tsumugi/ui/news/NewsAdapter.kt
@@ -134,7 +134,7 @@ class NewsAdapter(private val dataSet: ArrayList, private val c: Context
HtmlCompat.FROM_HTML_MODE_LEGACY,
ImageGetter { source ->
val d = LevelListDrawable()
- val empty: Drawable? = ContextCompat.getDrawable(c, R.drawable.exo_icon_circular_play)
+ val empty: Drawable? = ContextCompat.getDrawable(c, R.drawable.exo_icon_play)
d.addLevel(0, 0, empty!!)
d.setBounds(0, 0, empty.intrinsicWidth, empty.intrinsicHeight)
diff --git a/settings.gradle b/settings.gradle
index 6bfed1f..79be6ca 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,6 @@
include ':app'
rootProject.name='Tsumugi-app'
+
+gradle.ext.exoplayerRoot = './ExoPlayer'
+gradle.ext.exoplayerModulePrefix = 'exoplayer-'
+apply from: new File(gradle.ext.exoplayerRoot, 'core_settings.gradle')