mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2024-10-02 04:52:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure remote library settings are always saved.

Browse Source
This commit is contained in:
casey langen 2020-10-22 17:03:47 -07:00
parent ed4869298c
commit 60a206a2d6
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/musikcube/app/layout/RemoteLibrarySettingsLayout.cpp
View File

@ -73,6 +73,7 @@ RemoteLibrarySettingsLayout::RemoteLibrarySettingsLayout()
}
RemoteLibrarySettingsLayout::~RemoteLibrarySettingsLayout() {
this->SavePreferences();
}
void RemoteLibrarySettingsLayout::OnLayout() {
@ -218,7 +219,7 @@ void RemoteLibrarySettingsLayout::LoadPreferences() {
this->httpTlsCheckbox->CheckChanged.connect(this, &RemoteLibrarySettingsLayout::OnTlsCheckboxChanged);
}
void RemoteLibrarySettingsLayout::LoadPreferencesAndLayout() {
void RemoteLibrarySettingsLayout::SyncPreferencesAndLayout() {
this->SavePreferences();
this->LoadPreferences();
this->Layout();
@ -255,12 +256,12 @@ void RemoteLibrarySettingsLayout::SavePreferences() {
void RemoteLibrarySettingsLayout::OnActivateTranscoderFormat(cursespp::TextLabel* tl) {
SettingsOverlays::ShowTranscoderFormatOverlay([this]() {
this->LoadPreferencesAndLayout();
this->SyncPreferencesAndLayout();
});
}
void RemoteLibrarySettingsLayout::OnActivateTranscoderBitrate(cursespp::TextLabel* tl) {
SettingsOverlays::ShowTranscoderBitrateOverlay([this]() {
this->LoadPreferencesAndLayout();
this->SyncPreferencesAndLayout();
});
}

2
src/musikcube/app/layout/RemoteLibrarySettingsLayout.h
View File

@ -56,7 +56,7 @@ namespace musik { namespace cube {
private:
void InitializeWindows();
void LoadPreferencesAndLayout();
void SyncPreferencesAndLayout();
void OnTlsCheckboxChanged(cursespp::Checkbox* cb, bool checked);
void OnActivateTranscoderFormat(cursespp::TextLabel* tl);

4
src/plugins/httpdatastream/HttpDataStream.cpp
View File

@ -199,8 +199,8 @@ class FileReadStream {
}
clearerr(this->file);
int available = this->length - this->Position();
unsigned actualReadBytes = std::max(0, std::min(available, (int) readBytes));
const int available = this->length - this->Position();
const unsigned actualReadBytes = std::max(0, std::min(available, (int) readBytes));
return (PositionType) fread(buffer, 1, actualReadBytes, this->file);
}