Updated to work with new server with chapters

izderadicka · Mar 9, 2019 · 7bc7259 · 7bc7259
1 parent c97d853
commit 7bc7259
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -18,8 +18,8 @@ android {
         applicationId "eu.zderadicka.audioserve"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 25
-        versionName "0.7.5"
+        versionCode 26
+        versionName "0.7.6"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/app/src/main/java/eu/zderadicka/audioserve/AudioService.kt b/app/src/main/java/eu/zderadicka/audioserve/AudioService.kt
@@ -30,6 +30,7 @@ import com.google.android.exoplayer2.decoder.DecoderCounters
 import com.google.android.exoplayer2.ext.mediasession.DefaultPlaybackController
 import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector
 import com.google.android.exoplayer2.ext.mediasession.TimelineQueueNavigator
+import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory
 import com.google.android.exoplayer2.source.DynamicConcatenatingMediaSource
 import com.google.android.exoplayer2.source.ExtractorMediaSource
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector
@@ -277,7 +278,10 @@ class AudioService : MediaBrowserServiceCompat() {
             if (token != null) {
                 cm.startCacheLoader(token)
             }
+            val extractorFactory = DefaultExtractorsFactory()
+            extractorFactory.setConstantBitrateSeekingEnabled(true)
             sourceFactory = ExtractorMediaSource.Factory(cm.sourceFactory)
+            sourceFactory?.setExtractorsFactory(extractorFactory)
 
         }
 

diff --git a/app/src/main/java/eu/zderadicka/audioserve/net/CacheBrowser.kt b/app/src/main/java/eu/zderadicka/audioserve/net/CacheBrowser.kt
@@ -22,17 +22,18 @@ private fun subfolderToItem(path:String): MediaBrowserCompat.MediaItem {
             .build()
     return MediaBrowserCompat.MediaItem(desc, MediaBrowserCompat.MediaItem.FLAG_BROWSABLE)
 }
-
+private val CHAPTER_RE = Regex("""\$\$[\d\-]+\$\$""")
 private fun fileToItem(mediaId: String, cacheDir: File): MediaBrowserCompat.MediaItem? {
     val fullFile = File(cacheDir,mediaId)
     if (! fullFile.isFile()) return null
 
     val extras = Bundle()
     val f = File(mediaId)
     val (name, ext) = splitExtension(f.name)
+    val normName = CHAPTER_RE.replace(name, "")
     val descBuilder = MediaDescriptionCompat.Builder()
             .setMediaId(mediaId)
-            .setTitle(name)
+            .setTitle(normName)
             .setSubtitle(f.parent)
     if (ext != null) {
         extras.putString(METADATA_KEY_EXTENSION, ext)

diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.1'
+        classpath 'com.android.tools.build:gradle:3.3.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong