mirror of
https://github.com/advplyr/audiobookshelf-app.git
synced 2025-07-06 20:14:48 +02:00
Add chapter support, handle audio focus
This commit is contained in:
parent
2c27fb3108
commit
e97218f2e8
5 changed files with 77 additions and 4 deletions
|
@ -10,8 +10,8 @@ android {
|
||||||
applicationId "com.audiobookshelf.app"
|
applicationId "com.audiobookshelf.app"
|
||||||
minSdkVersion rootProject.ext.minSdkVersion
|
minSdkVersion rootProject.ext.minSdkVersion
|
||||||
targetSdkVersion rootProject.ext.targetSdkVersion
|
targetSdkVersion rootProject.ext.targetSdkVersion
|
||||||
versionCode 7
|
versionCode 8
|
||||||
versionName "0.3.0-beta"
|
versionName "0.4.0-beta"
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
aaptOptions {
|
aaptOptions {
|
||||||
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
|
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
|
||||||
|
|
|
@ -21,6 +21,7 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy
|
||||||
import com.bumptech.glide.request.RequestOptions
|
import com.bumptech.glide.request.RequestOptions
|
||||||
import com.getcapacitor.JSObject
|
import com.getcapacitor.JSObject
|
||||||
import com.google.android.exoplayer2.*
|
import com.google.android.exoplayer2.*
|
||||||
|
import com.google.android.exoplayer2.audio.AudioAttributes
|
||||||
import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector
|
import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector
|
||||||
import com.google.android.exoplayer2.ext.mediasession.TimelineQueueNavigator
|
import com.google.android.exoplayer2.ext.mediasession.TimelineQueueNavigator
|
||||||
import com.google.android.exoplayer2.source.hls.HlsMediaSource
|
import com.google.android.exoplayer2.source.hls.HlsMediaSource
|
||||||
|
@ -138,6 +139,10 @@ class PlayerNotificationService : Service() {
|
||||||
simpleExoPlayerBuilder.setSeekBackIncrementMs(10000)
|
simpleExoPlayerBuilder.setSeekBackIncrementMs(10000)
|
||||||
simpleExoPlayerBuilder.setSeekForwardIncrementMs(10000)
|
simpleExoPlayerBuilder.setSeekForwardIncrementMs(10000)
|
||||||
mPlayer = simpleExoPlayerBuilder.build()
|
mPlayer = simpleExoPlayerBuilder.build()
|
||||||
|
mPlayer.setHandleAudioBecomingNoisy(true)
|
||||||
|
|
||||||
|
var audioAttributes:AudioAttributes = AudioAttributes.Builder().setUsage(C.USAGE_MEDIA).setContentType(C.CONTENT_TYPE_SPEECH).build()
|
||||||
|
mPlayer.setAudioAttributes(audioAttributes, true)
|
||||||
|
|
||||||
setPlayerListeners()
|
setPlayerListeners()
|
||||||
|
|
||||||
|
|
|
@ -7,6 +7,9 @@
|
||||||
<p class="px-2 text-xs text-gray-400">by {{ author }}</p>
|
<p class="px-2 text-xs text-gray-400">by {{ author }}</p>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex-grow" />
|
<div class="flex-grow" />
|
||||||
|
<div class="cursor-pointer flex items-center justify-center mr-6 w-6 text-center" :class="chapters.length ? 'text-gray-300' : 'text-gray-400'" @mousedown.prevent @mouseup.prevent @click="clickChapterBtn">
|
||||||
|
<span class="material-icons text-2xl">format_list_bulleted</span>
|
||||||
|
</div>
|
||||||
<span class="material-icons" @click="cancelStream">close</span>
|
<span class="material-icons" @click="cancelStream">close</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="absolute left-2 -top-10">
|
<div class="absolute left-2 -top-10">
|
||||||
|
@ -15,6 +18,7 @@
|
||||||
<audio-player-mini ref="audioPlayerMini" :loading="!stream || currStreamAudiobookId !== streamAudiobookId" @updateTime="updateTime" @selectPlaybackSpeed="showPlaybackSpeedModal = true" @hook:mounted="audioPlayerMounted" />
|
<audio-player-mini ref="audioPlayerMini" :loading="!stream || currStreamAudiobookId !== streamAudiobookId" @updateTime="updateTime" @selectPlaybackSpeed="showPlaybackSpeedModal = true" @hook:mounted="audioPlayerMounted" />
|
||||||
</div>
|
</div>
|
||||||
<modals-playback-speed-modal v-model="showPlaybackSpeedModal" :playback-speed.sync="playbackSpeed" @change="changePlaybackSpeed" />
|
<modals-playback-speed-modal v-model="showPlaybackSpeedModal" :playback-speed.sync="playbackSpeed" @change="changePlaybackSpeed" />
|
||||||
|
<modals-chapters-modal v-model="showChapterModal" :chapters="chapters" @select="selectChapter" />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
@ -28,7 +32,8 @@ export default {
|
||||||
stream: null,
|
stream: null,
|
||||||
lastServerUpdateSentSeconds: 0,
|
lastServerUpdateSentSeconds: 0,
|
||||||
showPlaybackSpeedModal: false,
|
showPlaybackSpeedModal: false,
|
||||||
playbackSpeed: 1
|
playbackSpeed: 1,
|
||||||
|
showChapterModal: false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
|
@ -56,6 +61,9 @@ export default {
|
||||||
series() {
|
series() {
|
||||||
return this.book ? this.book.series : ''
|
return this.book ? this.book.series : ''
|
||||||
},
|
},
|
||||||
|
chapters() {
|
||||||
|
return this.streamAudiobook ? this.streamAudiobook.chapters || [] : []
|
||||||
|
},
|
||||||
volumeNumber() {
|
volumeNumber() {
|
||||||
return this.book ? this.book.volumeNumber : ''
|
return this.book ? this.book.volumeNumber : ''
|
||||||
},
|
},
|
||||||
|
@ -81,6 +89,16 @@ export default {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
clickChapterBtn() {
|
||||||
|
if (!this.chapters.length) return
|
||||||
|
this.showChapterModal = true
|
||||||
|
},
|
||||||
|
selectChapter(chapter) {
|
||||||
|
if (this.$refs.audioPlayerMini) {
|
||||||
|
this.$refs.audioPlayerMini.seek(chapter.start)
|
||||||
|
}
|
||||||
|
this.showChapterModal = false
|
||||||
|
},
|
||||||
async cancelStream() {
|
async cancelStream() {
|
||||||
const { value } = await Dialog.confirm({
|
const { value } = await Dialog.confirm({
|
||||||
title: 'Confirm',
|
title: 'Confirm',
|
||||||
|
|
50
components/modals/ChaptersModal.vue
Normal file
50
components/modals/ChaptersModal.vue
Normal file
|
@ -0,0 +1,50 @@
|
||||||
|
<template>
|
||||||
|
<modals-modal v-model="show" :width="300" height="100%">
|
||||||
|
<div class="w-full h-full overflow-hidden absolute top-0 left-0 flex items-center justify-center" @click="show = false">
|
||||||
|
<div class="w-full overflow-x-hidden overflow-y-auto bg-primary rounded-lg border border-white border-opacity-20" style="max-height: 75%" @click.stop>
|
||||||
|
<ul class="h-full w-full" role="listbox" aria-labelledby="listbox-label">
|
||||||
|
<template v-for="chapter in chapters">
|
||||||
|
<li :key="chapter.id" class="text-gray-50 select-none relative py-3 cursor-pointer hover:bg-black-400" role="option" @click="clickedOption(chapter)">
|
||||||
|
<div class="flex items-center justify-center px-3">
|
||||||
|
<span class="font-normal block truncate text-lg">{{ chapter.title }}</span>
|
||||||
|
<div class="flex-grow" />
|
||||||
|
<span class="font-mono text-gray-300">{{ $secondsToTimestamp(chapter.start) }}</span>
|
||||||
|
</div>
|
||||||
|
</li>
|
||||||
|
</template>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</modals-modal>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
export default {
|
||||||
|
props: {
|
||||||
|
value: Boolean,
|
||||||
|
chapters: {
|
||||||
|
type: Array,
|
||||||
|
default: () => []
|
||||||
|
}
|
||||||
|
},
|
||||||
|
data() {
|
||||||
|
return {}
|
||||||
|
},
|
||||||
|
computed: {
|
||||||
|
show: {
|
||||||
|
get() {
|
||||||
|
return this.value
|
||||||
|
},
|
||||||
|
set(val) {
|
||||||
|
this.$emit('input', val)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
clickedOption(chapter) {
|
||||||
|
this.$emit('select', chapter)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
mounted() {}
|
||||||
|
}
|
||||||
|
</script>
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "audiobookshelf-app",
|
"name": "audiobookshelf-app",
|
||||||
"version": "v0.3.0-beta",
|
"version": "v0.4.0-beta",
|
||||||
"author": "advplyr",
|
"author": "advplyr",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "nuxt --hostname localhost --port 1337",
|
"dev": "nuxt --hostname localhost --port 1337",
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue