From 0fa0b5d21216d24defbea13f68ae275e8af8e28b Mon Sep 17 00:00:00 2001
From: Antoine POPINEAU <antoine.popineau@appscho.com>
Date: Wed, 23 Oct 2019 21:41:50 +0200
Subject: [PATCH] Added support for Flac.

---
 app/build.gradle.kts                                         | 5 ++++-
 .../com/github/apognu/otter/activities/LicencesActivity.kt   | 5 +++++
 .../java/com/github/apognu/otter/playback/PlayerService.kt   | 1 +
 .../java/com/github/apognu/otter/playback/QueueManager.kt    | 2 ++
 build.gradle.kts                                             | 1 +
 5 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c0d35bc..ad6c8a3 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -100,9 +100,12 @@ dependencies {
   implementation("com.google.android.material:material:1.1.0-beta01")
   implementation("com.android.support.constraint:constraint-layout:1.1.3")
 
-  implementation("com.google.android.exoplayer:exoplayer:2.10.3")
+  implementation("com.google.android.exoplayer:exoplayer:2.10.5")
   implementation("com.google.android.exoplayer:extension-mediasession:2.10.6")
   implementation("com.google.android.exoplayer:extension-cast:2.10.6")
+  implementation("com.github.PaulWoitaschek.ExoPlayer-Extensions:extension-flac:2.10.5") {
+    isTransitive = false
+  }
   implementation("com.aliassadi:power-preference-lib:1.4.1")
   implementation("com.github.kittinunf.fuel:fuel:2.1.0")
   implementation("com.github.kittinunf.fuel:fuel-coroutines:2.1.0")
diff --git a/app/src/main/java/com/github/apognu/otter/activities/LicencesActivity.kt b/app/src/main/java/com/github/apognu/otter/activities/LicencesActivity.kt
index 1433ec0..bc3a2f2 100644
--- a/app/src/main/java/com/github/apognu/otter/activities/LicencesActivity.kt
+++ b/app/src/main/java/com/github/apognu/otter/activities/LicencesActivity.kt
@@ -38,6 +38,11 @@ class LicencesActivity : AppCompatActivity() {
         "Apache License 2.0",
         "https://github.com/google/ExoPlayer/blob/release-v2/LICENSE"
       ),
+      Licence(
+        "ExoPlayer-Extensions",
+        "Apache License 2.0",
+        "https://github.com/PaulWoitaschek/ExoPlayer-Extensions/blob/master/LICENSE"
+      ),
       Licence(
         "Fuel",
         "MIT License",
diff --git a/app/src/main/java/com/github/apognu/otter/playback/PlayerService.kt b/app/src/main/java/com/github/apognu/otter/playback/PlayerService.kt
index bd8b60e..17ca803 100644
--- a/app/src/main/java/com/github/apognu/otter/playback/PlayerService.kt
+++ b/app/src/main/java/com/github/apognu/otter/playback/PlayerService.kt
@@ -403,6 +403,7 @@ class PlayerService : Service() {
     }
 
     override fun onPlayerError(error: ExoPlaybackException?) {
+      log(error.toString())
       EventBus.send(
         Event.PlaybackError(
           getString(R.string.error_playback)
diff --git a/app/src/main/java/com/github/apognu/otter/playback/QueueManager.kt b/app/src/main/java/com/github/apognu/otter/playback/QueueManager.kt
index 3d3e590..8042ecd 100644
--- a/app/src/main/java/com/github/apognu/otter/playback/QueueManager.kt
+++ b/app/src/main/java/com/github/apognu/otter/playback/QueueManager.kt
@@ -94,6 +94,8 @@ class QueueManager(val context: Context) {
     val sources = tracks.map { track ->
       val url = mustNormalizeUrl(track.bestUpload()?.listen_url ?: "")
 
+      log(url)
+
       ProgressiveMediaSource.Factory(factory).createMediaSource(Uri.parse(url))
     }
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 39ad497..64ad895 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -14,6 +14,7 @@ allprojects {
   repositories {
     google()
     jcenter()
+    maven(url = "https://jitpack.io")
   }
 }