Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mythmusic immediatly save playlists #28

Closed
wants to merge 3 commits into from
Closed

Mythmusic immediatly save playlists #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cea4a3b
immediatly store playlist in database after creation/update.
Nov 6, 2012
6953f4d
try to always store the Playlists if they change.
Nov 6, 2012
bd685e0
store playlist if track is removed by "DELETE"-key
Nov 7, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 24 additions & 0 deletions mythplugins/mythmusic/mythmusic/musiccommon.cpp
View file
Open in desktop
Expand Up @@ -511,6 +511,7 @@ bool MusicCommon::keyPressEvent(QKeyEvent *e)
{
m_movingTrack = false;
item->DisplayState("off", "movestate");
storePlaylists();
}
else if (action == "UP")
{
Expand Down Expand Up @@ -691,7 +692,10 @@ bool MusicCommon::keyPressEvent(QKeyEvent *e)
{
Metadata *mdata = qVariantValue<Metadata*> (item->GetData());
if (mdata)
{
gPlayer->removeTrack(mdata->ID());
storePlaylists();
}
}
}
else if (action == "MENU")
Expand Down Expand Up @@ -1309,13 +1313,17 @@ void MusicCommon::customEvent(QEvent *event)
{
Metadata *mdata = qVariantValue<Metadata*> (item->GetData());
if (mdata)
{
gPlayer->removeTrack(mdata->ID());
storePlaylists();
}
}
}
else if (resulttext == tr("Remove All Tracks"))
{
gPlayer->getPlaylist()->removeAllTracks();
gPlayer->activePlaylistChanged(-1, true);
storePlaylists();
}
else if (resulttext == tr("Save To New Playlist"))
{
Expand Down Expand Up @@ -1384,6 +1392,7 @@ void MusicCommon::customEvent(QEvent *event)
int mode = dce->GetData().toInt();
gPlayer->setShuffleMode((MusicPlayer::ShuffleMode) mode);
updateShuffleMode(true);
storePlaylists();
}
else if (resultid == "exitmenu")
{
Expand Down Expand Up @@ -1435,18 +1444,21 @@ void MusicCommon::customEvent(QEvent *event)
byYear();
else if (resulttext == tr("Tracks With Same Title"))
byTitle();

}
else if (resultid == "playlistoptionsmenu")
{
if (resulttext == tr("Replace Tracks"))
{
m_playlistOptions.insertPLOption = PL_REPLACE;
doUpdatePlaylist();
storePlaylists();
}
else if (resulttext == tr("Add Tracks"))
{
m_playlistOptions.insertPLOption = PL_INSERTATEND;
doUpdatePlaylist();
storePlaylists();
}
}
else if (resultid == "visualizermenu")
Expand All @@ -1464,6 +1476,7 @@ void MusicCommon::customEvent(QEvent *event)
gMusicData->all_playlists->copyNewPlaylist(resulttext);
Playlist *playlist = gMusicData->all_playlists->getPlaylist(resulttext);
gPlayer->playlistChanged(playlist->getID());
storePlaylists();
}
else if (resultid == "updateplaylist")
{
Expand All @@ -1472,6 +1485,7 @@ void MusicCommon::customEvent(QEvent *event)
playlist->removeAllTracks();
playlist->fillSongsFromSonglist(songList);
gPlayer->playlistChanged(playlist->getID());
storePlaylists();
}
}
else if (event->type() == MusicPlayerEvent::TrackChangeEvent)
Expand Down Expand Up @@ -2406,6 +2420,7 @@ void MusicCommon::doUpdatePlaylist(void)
m_whereClause, true,
m_playlistOptions.insertPLOption, curTrackID);
m_whereClause.clear();

}
else if (!m_songList.isEmpty())
{
Expand Down Expand Up @@ -2505,6 +2520,15 @@ void MusicCommon::playFirstTrack()
gPlayer->setCurrentTrackPos(0);
}

void MusicCommon::storePlaylists(void)
{
if (gMusicData->all_playlists->cleanOutThreads())
{
gMusicData->all_playlists->save();
LOG(VB_GENERAL, LOG_INFO, "Playlists saved.");
}
}

//---------------------------------------------------------
// MythMusicVolumeDialog
//---------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions mythplugins/mythmusic/mythmusic/musiccommon.h
View file
Open in desktop
Expand Up @@ -101,6 +101,7 @@ class MPUBLIC MusicCommon : public MythScreenType
protected:
void showExitMenu(void);
void showPlaylistOptionsMenu(bool addMainMenu = false);
void storePlaylists(void);

protected:
QString getTimeString(int exTime, int maxTime);
Expand Down