Skip to content
Snippets Groups Projects
Commit 3b8fc53e authored by Nicolas Pomepuy's avatar Nicolas Pomepuy
Browse files

Display the chapter instead of title in audio player if available

parent 59de8bd5
No related branches found
No related tags found
1 merge request!1235Display album in audio player cover mode
Pipeline #182900 passed with stage
in 19 minutes and 53 seconds
......@@ -494,6 +494,7 @@
<string name="playlist_name_hint">Playlist name</string>
<string name="go_to_chapter">Go to chapter…</string>
<string name="chapter">Chapter</string>
<string name="current_chapter">Chapter: %s</string>
<string name="resume_from_position">Resume from last position</string>
<string name="confirm_resume">Resume from last position?</string>
<string name="confirm_resume_title">Resume played videos</string>
......
......@@ -308,8 +308,10 @@ class AudioPlayer : Fragment(), PlaylistAdapter.IPlayer, TextWatcher, IAudioPlay
updateRepeatMode()
binding.audioMediaSwitcher.updateMedia(playlistModel.service)
binding.coverMediaSwitcher.updateMedia(playlistModel.service)
binding.songTitle?.text = playlistModel.title
binding.songSubtitle?.text = TextUtils.separatedString(playlistModel.artist, playlistModel.album)
val chapter = playlistModel.service!!.getChapters(-1)?.get(playlistModel.service!!.chapterIdx)?.name
binding.songTitle?.text = if (!chapter.isNullOrEmpty()) getString(R.string.current_chapter, chapter) else playlistModel.title
binding.songSubtitle?.text = if (!chapter.isNullOrEmpty()) TextUtils.separatedString(playlistModel.title, playlistModel.artist) else TextUtils.separatedString(playlistModel.artist, playlistModel.album)
binding.songTitle?.isSelected = true
binding.songSubtitle?.isSelected = true
binding.songTrackInfo?.text = playlistModel.service?.trackInfo()
......
......@@ -30,6 +30,7 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.ObsoleteCoroutinesApi
import kotlinx.coroutines.withContext
import org.videolan.vlc.PlaybackService
import org.videolan.vlc.R
import org.videolan.vlc.gui.helpers.AudioUtil
@ObsoleteCoroutinesApi
......@@ -106,7 +107,8 @@ abstract class AudioMediaSwitcher(context: Context, attrs: AttributeSet) : Fling
addMediaView(inflater, service.titlePrev, service.artistPrev, service.albumPrev, coverPrev, prevTrackInfo)
hasPrevious = true
}
if (service.hasMedia()) addMediaView(inflater, service.title, service.artist, service.album, coverCurrent, trackInfo)
val chapter = service.getChapters(-1)?.get(service.chapterIdx)?.name
if (service.hasMedia()) addMediaView(inflater, if (!chapter.isNullOrEmpty()) service.getString(R.string.current_chapter, chapter) else service.title, if (!chapter.isNullOrEmpty()) service.title else service.artist, if (!chapter.isNullOrEmpty()) service.artist else service.album, coverCurrent, trackInfo)
if (service.hasNext()) addMediaView(inflater, service.titleNext, service.artistNext, service.albumNext, coverNext, nextTrackInfo)
if (service.hasPrevious() && service.hasMedia()) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment