wbrawner/Simple-Music-Player
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix some glitches around setting up the songs

Browse source
This commit is contained in:
tibbi 2018-05-20 22:49:45 +02:00
parent 1fcbf186a6
commit 709e570221
2 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/kotlin/com/simplemobiletools/musicplayer/activities/MainActivity.kt
View file

@ -59,6 +59,7 @@ class MainActivity : SimpleActivity(), SongListListener {
private var songs = ArrayList<Song>()
private var searchMenuItem: MenuItem? = null
private var isSearchOpen = false
private var wasInitialPlaylistSet = false
private var artView: ViewGroup? = null
private var oldCover: Drawable? = null
@ -383,8 +384,8 @@ class MainActivity : SimpleActivity(), SongListListener {
FilePickerDialog(this, getFilePickerInitialPath(), pickFile = false) {
toast(R.string.fetching_songs)
Thread {
val songs = getFolderSongs(File(it))
dbHelper.addSongsToPlaylist(songs)
val folderSongs = getFolderSongs(File(it))
dbHelper.addSongsToPlaylist(folderSongs)
sendIntent(REFRESH_LIST)
}.start()
}
@ -425,8 +426,8 @@ class MainActivity : SimpleActivity(), SongListListener {
}
private fun createPlaylistFrom(path: String) {
val songs = getFolderSongs(File(path))
if (songs.isEmpty()) {
val folderSongs = getFolderSongs(File(path))
if (folderSongs.isEmpty()) {
toast(R.string.folder_contains_no_audio)
return
}
@ -448,7 +449,7 @@ class MainActivity : SimpleActivity(), SongListListener {
val playlist = Playlist(0, playlistName)
val newPlaylistId = playlistDAO.insert(playlist).toInt()
//dbHelper.addSongsToPlaylist(songs, newPlaylistId)
//dbHelper.addSongsToPlaylist(folderSongs, newPlaylistId)
playlistChanged(newPlaylistId)
}
@ -551,6 +552,10 @@ class MainActivity : SimpleActivity(), SongListListener {
@Subscribe
fun songChangedEvent(event: Events.SongChanged) {
if (!wasInitialPlaylistSet) {
return
}
val song = event.song
updateSongInfo(song)
markCurrentSong()
@ -566,6 +571,7 @@ class MainActivity : SimpleActivity(), SongListListener {
@Subscribe
fun playlistUpdated(event: Events.PlaylistUpdated) {
wasInitialPlaylistSet = true
fillSongsListView(event.songs)
}

13
app/src/main/kotlin/com/simplemobiletools/musicplayer/services/MusicService.kt
View file

@ -232,21 +232,20 @@ class MusicService : Service(), MediaPlayer.OnPreparedListener, MediaPlayer.OnEr
}
private fun initSongs() {
updateUI()
if (mCurrSong == null) {
setupSong()
} else {
val secs = mPlayer!!.currentPosition / 1000
Handler(Looper.getMainLooper()).post {
mBus!!.post(Events.ProgressUpdated(secs))
}
}
updateUI()
}
private fun updateUI() {
Handler(Looper.getMainLooper()).post {
mBus!!.post(Events.PlaylistUpdated(mSongs))
songChanged(mCurrSong)
mCurrSongCover = getAlbumImage(mCurrSong)
mBus!!.post(Events.SongChanged(mCurrSong))
val secs = mPlayer!!.currentPosition / 1000
mBus!!.post(Events.ProgressUpdated(secs))
}
songStateChanged(getIsPlaying())
}