mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-01-14 03:41:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed the win32 build script

Browse Source 
- Don't restore playback session if the setting is disabled
This commit is contained in:
casey langen 2018-02-20 00:28:11 -08:00
parent c0284e2f82
commit 59fe25ec2d
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archive-win32.sh
View File

@ -16,11 +16,13 @@ rm -rf "$MILKDROP"
mkdir -p "$VANILLA/plugins"
mkdir -p "$VANILLA/themes"
mkdir -p "$VANILLA/locales"
mkdir -p "$VANILLA/fonts"
cp bin/release/musikcube.exe "$VANILLA"
cp bin/release/*.dll "$VANILLA"
cp bin/release/plugins/*.dll "$VANILLA/plugins"
cp bin/release/themes/*.json "$VANILLA/themes"
cp bin/release/locales/*.json "$VANILLA/locales"
cp bin/release/fonts/*.ttf "$VANILLA/fonts"
rm "$VANILLA/plugins/vis_milk2.dll"
pushd $VANILLA
7z a -tzip "musikcube_win32_$VERSION.zip" ./* -mx=9
@ -30,11 +32,13 @@ popd
mkdir -p "$MILKDROP/plugins"
mkdir -p "$MILKDROP/themes"
mkdir -p "$MILKDROP/locales"
mkdir -p "$VANILLA/fonts"
cp bin/release/musikcube.exe "$MILKDROP"
cp bin/release/*.dll "$MILKDROP"
cp bin/release/plugins/*.dll "$MILKDROP/plugins"
cp bin/release/themes/*.json "$MILKDROP/themes"
cp bin/release/locales/*.json "$MILKDROP/locales"
cp bin/release/fonts/*.ttf "$VANILLA/fonts"
cp -rfp bin/release/plugins/Milkdrop2 "$MILKDROP/plugins"
pushd $MILKDROP
7z a -tzip "musikcube_win32_with_milkdrop2_$VERSION.zip" ./* -mx=9

16
src/core/support/Playback.cpp
View File

@ -79,15 +79,17 @@ namespace musik {
}
void LoadPlaybackContext(Prefs prefs, ILibraryPtr library, PlaybackService& playback) {
auto query = std::shared_ptr<PersistedPlayQueueQuery>(
PersistedPlayQueueQuery::Restore(library, playback));
if (prefs->GetBool(keys::SaveSessionOnExit, true)) {
auto query = std::shared_ptr<PersistedPlayQueueQuery>(
PersistedPlayQueueQuery::Restore(library, playback));
library->Enqueue(query, ILibrary::QuerySynchronous);
library->Enqueue(query, ILibrary::QuerySynchronous);
int index = prefs->GetInt(keys::LastPlayQueueIndex, -1);
if (index >= 0) {
double time = prefs->GetDouble(keys::LastPlayQueueTime, 0.0f);
playback.Prepare(index, time);
int index = prefs->GetInt(keys::LastPlayQueueIndex, -1);
if (index >= 0) {
double time = prefs->GetDouble(keys::LastPlayQueueTime, 0.0f);
playback.Prepare(index, time);
}
}
}