Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-06 07:09:39 +02:00
Code Issues Releases Wiki Activity

Remove flushing of preferences in ShuttlePrefs and only

Browse Source 
flush when all settings have been written.
This commit is contained in:
Leland Lucius 2015-12-21 20:07:24 -06:00
parent d3fdccffce
commit 9dd79c9f80
9 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ShuttlePrefs.cpp
View File

@ -43,7 +43,7 @@ bool ShuttlePrefs::TransferBool( const wxString & Name, bool & bValue, const boo
} }
else else
{ {
return (gPrefs->Write( Name, bValue ) && gPrefs->Flush()); return gPrefs->Write( Name, bValue );
} }
return true; return true;
} }
@ -57,7 +57,7 @@ bool ShuttlePrefs::TransferDouble( const wxString & Name, double & dValue, const
} }
else else
{ {
return (gPrefs->Write( Name, dValue ) && gPrefs->Flush()); return gPrefs->Write( Name, dValue );
} }
return true; return true;
} }
@ -71,7 +71,7 @@ bool ShuttlePrefs::TransferInt( const wxString & Name, int & iValue, const int &
} }
else else
{ {
return (gPrefs->Write( Name, iValue ) && gPrefs->Flush()); return gPrefs->Write( Name, iValue );
} }
return true; return true;
} }
@ -85,7 +85,7 @@ bool ShuttlePrefs::TransferString( const wxString & Name, wxString & strValue, c
} }
else else
{ {
return (gPrefs->Write( Name, strValue ) && gPrefs->Flush()); return gPrefs->Write( Name, strValue );
} }
return true; return true;
} }

3
src/SoundActivatedRecord.cpp
View File

@ -67,6 +67,9 @@ void SoundActivatedRecord::OnOK(wxCommandEvent & WXUNUSED(event))
{ {
ShuttleGui S( this, eIsSavingToPrefs ); ShuttleGui S( this, eIsSavingToPrefs );
PopulateOrExchange( S ); PopulateOrExchange( S );
gPrefs->Flush();
EndModal(0); EndModal(0);
} }

2
src/TrackArtist.cpp
View File

@ -3170,8 +3170,6 @@ void TrackArtist::UpdatePrefs()
{ {
mdBrange = gPrefs->Read(ENV_DB_KEY, mdBrange); mdBrange = gPrefs->Read(ENV_DB_KEY, mdBrange);
mShowClipping = gPrefs->Read(wxT("/GUI/ShowClipping"), mShowClipping); mShowClipping = gPrefs->Read(wxT("/GUI/ShowClipping"), mShowClipping);
gPrefs->Flush();
} }
// Draws the sync-lock bitmap, tiled; always draws stationary relative to the DC // Draws the sync-lock bitmap, tiled; always draws stationary relative to the DC

3
src/export/ExportFFmpegDialogs.cpp
View File

@ -1990,9 +1990,12 @@ void ExportFFmpegOptions::OnOK(wxCommandEvent& WXUNUSED(event))
if (selcdc > -1) gPrefs->Write(wxT("/FileFormats/FFmpegCodec"),mCodecList->GetString(selcdc)); if (selcdc > -1) gPrefs->Write(wxT("/FileFormats/FFmpegCodec"),mCodecList->GetString(selcdc));
if (selfmt > -1) gPrefs->Write(wxT("/FileFormats/FFmpegFormat"),mFormatList->GetString(selfmt)); if (selfmt > -1) gPrefs->Write(wxT("/FileFormats/FFmpegFormat"),mFormatList->GetString(selfmt));
gPrefs->Flush(); gPrefs->Flush();
ShuttleGui S(this, eIsSavingToPrefs); ShuttleGui S(this, eIsSavingToPrefs);
PopulateOrExchange(S); PopulateOrExchange(S);
gPrefs->Flush();
EndModal(wxID_OK); EndModal(wxID_OK);
return; return;

2
src/export/ExportMultiple.cpp
View File

@ -522,6 +522,8 @@ void ExportMultiple::OnExport(wxCommandEvent& WXUNUSED(event))
ShuttleGui S(this, eIsSavingToPrefs); ShuttleGui S(this, eIsSavingToPrefs);
PopulateOrExchange(S); PopulateOrExchange(S);
gPrefs->Flush();
// Make sure the output directory is in good shape // Make sure the output directory is in good shape
if (!DirOk()) { if (!DirOk()) {
return; return;

2
src/export/ExportPCM.cpp
View File

@ -216,6 +216,8 @@ bool ExportPCMOptions::TransferDataFromWindow()
ShuttleGui S(this, eIsSavingToPrefs); ShuttleGui S(this, eIsSavingToPrefs);
PopulateOrExchange(S); PopulateOrExchange(S);
gPrefs->Flush();
WriteExportFormatPref(GetFormat()); WriteExportFormatPref(GetFormat());
return true; return true;

2
src/prefs/DevicePrefs.cpp
View File

@ -347,7 +347,6 @@ bool DevicePrefs::Apply()
} }
if (map) { if (map) {
gPrefs->Write(wxT("/AudioIO/PlaybackDevice"), map->deviceString); gPrefs->Write(wxT("/AudioIO/PlaybackDevice"), map->deviceString);
gPrefs->Flush();
} }
map = NULL; map = NULL;
@ -368,7 +367,6 @@ bool DevicePrefs::Apply()
} }
gPrefs->Write(wxT("/AudioIO/RecordChannels"), gPrefs->Write(wxT("/AudioIO/RecordChannels"),
mChannels->GetSelection() + 1); mChannels->GetSelection() + 1);
return gPrefs->Flush();
} }
return true; return true;

3
src/prefs/PrefsDialog.cpp
View File

@ -407,6 +407,8 @@ void PrefsDialog::OnOK(wxCommandEvent & WXUNUSED(event))
else else
mUniquePage->Apply(); mUniquePage->Apply();
gPrefs->Flush();
SavePreferredPage(); SavePreferredPage();
#if USE_PORTMIXER #if USE_PORTMIXER
@ -443,7 +445,6 @@ void PrefsDialog::OnOK(wxCommandEvent & WXUNUSED(event))
WaveformSettings::defaults().LoadPrefs(); WaveformSettings::defaults().LoadPrefs();
gPrefs->Flush();
EndModal(true); EndModal(true);
} }

3
src/prefs/RecordingPrefs.cpp
View File

@ -189,7 +189,6 @@ bool RecordingPrefs::Apply()
if (targetpeak + deltapeak > 100.0 || targetpeak - deltapeak < 0.0) if (targetpeak + deltapeak > 100.0 || targetpeak - deltapeak < 0.0)
{ {
gPrefs->Write(wxT("/AudioIO/DeltaPeakVolume"), min(100.0 - targetpeak, targetpeak)); gPrefs->Write(wxT("/AudioIO/DeltaPeakVolume"), min(100.0 - targetpeak, targetpeak));
gPrefs->Flush();
} }
int value; int value;
@ -201,7 +200,7 @@ bool RecordingPrefs::Apply()
if (value < 0) if (value < 0)
gPrefs->Write(wxT("/AudioIO/NumberAnalysis"), AILA_DEF_NUMBER_ANALYSIS); gPrefs->Write(wxT("/AudioIO/NumberAnalysis"), AILA_DEF_NUMBER_ANALYSIS);
#endif #endif
return gPrefs->Flush(); return true;
} }
PrefsPanel *RecordingPrefsFactory::Create(wxWindow *parent) PrefsPanel *RecordingPrefsFactory::Create(wxWindow *parent)