switched to local exoplayer using branch dev-v2

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "ExoPlayer"]
+	path = ExoPlayer
+	url = https://github.com/google/ExoPlayer/

.idea/gradle.xml

@@ -8,6 +8,28 @@
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/ExoPlayer/extensions/av1" />
+            <option value="$PROJECT_DIR$/ExoPlayer/extensions/cast" />
+            <option value="$PROJECT_DIR$/ExoPlayer/extensions/cronet" />
+            <option value="$PROJECT_DIR$/ExoPlayer/extensions/ffmpeg" />
+            <option value="$PROJECT_DIR$/ExoPlayer/extensions/flac" />
+            <option value="$PROJECT_DIR$/ExoPlayer/extensions/gvr" />
+            <option value="$PROJECT_DIR$/ExoPlayer/extensions/ima" />
+            <option value="$PROJECT_DIR$/ExoPlayer/extensions/jobdispatcher" />
+            <option value="$PROJECT_DIR$/ExoPlayer/extensions/leanback" />
+            <option value="$PROJECT_DIR$/ExoPlayer/extensions/mediasession" />
+            <option value="$PROJECT_DIR$/ExoPlayer/extensions/okhttp" />
+            <option value="$PROJECT_DIR$/ExoPlayer/extensions/opus" />
+            <option value="$PROJECT_DIR$/ExoPlayer/extensions/rtmp" />
+            <option value="$PROJECT_DIR$/ExoPlayer/extensions/vp9" />
+            <option value="$PROJECT_DIR$/ExoPlayer/extensions/workmanager" />
+            <option value="$PROJECT_DIR$/ExoPlayer/library/all" />
+            <option value="$PROJECT_DIR$/ExoPlayer/library/core" />
+            <option value="$PROJECT_DIR$/ExoPlayer/library/dash" />
+            <option value="$PROJECT_DIR$/ExoPlayer/library/hls" />
+            <option value="$PROJECT_DIR$/ExoPlayer/library/smoothstreaming" />
+            <option value="$PROJECT_DIR$/ExoPlayer/library/ui" />
+            <option value="$PROJECT_DIR$/ExoPlayer/testutils" />
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>

.idea/vcs.xml

@@ -2,5 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/ExoPlayer" vcs="Git" />
   </component>
 </project>

ExoPlayer

@@ -0,0 +1 @@
+Subproject commit 24a19264dbf35e326bbd7bb36c232eb180e1e26d

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'
 

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":{}}]

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":{}}]

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()) {

app/src/main/java/fr/forum_thalie/tsumugi/ui/news/NewsAdapter.kt

@@ -134,7 +134,7 @@ class NewsAdapter(private val dataSet: ArrayList<News>, 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)

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')