Browse Source

Added support for Flac.

housekeeping/remove-warnings
Antoine POPINEAU 5 years ago
parent
commit
0fa0b5d212
No known key found for this signature in database
GPG Key ID: A78AC64694F84063
  1. 5
      app/build.gradle.kts
  2. 5
      app/src/main/java/com/github/apognu/otter/activities/LicencesActivity.kt
  3. 1
      app/src/main/java/com/github/apognu/otter/playback/PlayerService.kt
  4. 2
      app/src/main/java/com/github/apognu/otter/playback/QueueManager.kt
  5. 1
      build.gradle.kts

5
app/build.gradle.kts

@ -100,9 +100,12 @@ dependencies { @@ -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")

5
app/src/main/java/com/github/apognu/otter/activities/LicencesActivity.kt

@ -38,6 +38,11 @@ class LicencesActivity : AppCompatActivity() { @@ -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",

1
app/src/main/java/com/github/apognu/otter/playback/PlayerService.kt

@ -403,6 +403,7 @@ class PlayerService : Service() { @@ -403,6 +403,7 @@ class PlayerService : Service() {
}
override fun onPlayerError(error: ExoPlaybackException?) {
log(error.toString())
EventBus.send(
Event.PlaybackError(
getString(R.string.error_playback)

2
app/src/main/java/com/github/apognu/otter/playback/QueueManager.kt

@ -94,6 +94,8 @@ class QueueManager(val context: Context) { @@ -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))
}

1
build.gradle.kts

@ -14,6 +14,7 @@ allprojects { @@ -14,6 +14,7 @@ allprojects {
repositories {
google()
jcenter()
maven(url = "https://jitpack.io")
}
}

Loading…
Cancel
Save