Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-12-04 15:50:10 +01:00
Code Issues Releases Wiki Activity

Fix Bug 432: Cleanspeech mode will now not activate, even if it was enabled in a previous version (and even if it has been deliberately added to audacity.cfg).

Browse Source
This commit is contained in:
james.k.crook@gmail.com
2012-03-25 20:22:10 +00:00
parent 1f17e0bb45
commit 860e19ae47
6 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/toolbars/ControlToolBar.cpp
View File

@@ -94,7 +94,8 @@ ControlToolBar::ControlToolBar()
mCutPreviewTracks = NULL;
gPrefs->Read(wxT("/GUI/ErgonomicTransportButtons"), &mErgonomicTransportButtons, true);
gPrefs->Read(wxT("/Batch/CleanSpeechMode"), &mCleanSpeechMode, false);
// gPrefs->Read(wxT("/Batch/CleanSpeechMode"), &mCleanSpeechMode, false);
mCleanSpeechMode = false;
}
ControlToolBar::~ControlToolBar()
@@ -193,8 +194,8 @@ void ControlToolBar::Populate()
ID_RECORD_BUTTON, true, _("Record"));
/* i18n-hint: (verb)*/
mBatch = MakeButton(bmpCleanSpeech, bmpCleanSpeech, bmpCleanSpeechDisabled,
ID_BATCH_BUTTON, false, _("Clean Speech"));
// mBatch = MakeButton(bmpCleanSpeech, bmpCleanSpeech, bmpCleanSpeechDisabled,
// ID_BATCH_BUTTON, false, _("Clean Speech"));
#if wxUSE_TOOLTIPS
RegenerateToolsTooltips();
@@ -215,7 +216,7 @@ void ControlToolBar::RegenerateToolsTooltips()
mRewind->SetToolTip(_("Skip to Start"));
mFF->SetToolTip(_("Skip to End"));
mRecord->SetToolTip(_("Record (Shift for Append Record)"));
mBatch->SetToolTip(_("Clean Speech"));
// mBatch->SetToolTip(_("Clean Speech"));
#endif
}
@@ -233,7 +234,8 @@ void ControlToolBar::UpdatePrefs()
updated = true;
}
gPrefs->Read( wxT("/Batch/CleanSpeechMode"), &active, false );
//gPrefs->Read( wxT("/Batch/CleanSpeechMode"), &active, false );
active = false;
if( mCleanSpeechMode != active )
{
mCleanSpeechMode = active;
@@ -302,8 +304,8 @@ void ControlToolBar::ArrangeButtons()
}
// Add and possible hide the CleanSpeech button
mSizer->Add( mBatch, 0, flags | wxLEFT, 5 );
mSizer->Show( mBatch, mCleanSpeechMode );
// mSizer->Add( mBatch, 0, flags | wxLEFT, 5 );
// mSizer->Show( mBatch, mCleanSpeechMode );
// Layout the sizer
mSizer->Layout();
@@ -349,7 +351,8 @@ void ControlToolBar::EnableDisableButtons()
AudacityProject *p = GetActiveProject();
size_t numProjects = gAudacityProjects.Count();
bool tracks = false;
bool cleaningSpeech = mBatch->IsDown();
// bool cleaningSpeech = mBatch->IsDown();
bool cleaningSpeech = false;
bool playing = mPlay->IsDown();
bool recording = mRecord->IsDown();
bool busy = gAudioIO->IsBusy() || playing || recording;
@@ -378,7 +381,7 @@ void ControlToolBar::EnableDisableButtons()
canRecord &= !busy;
canRecord &= ((numProjects == 0) || ((numProjects == 1) && !tracks));
mRecord->SetEnabled(canRecord);
mBatch->SetEnabled(!busy && !recording);
//mBatch->SetEnabled(!busy && !recording);
}
mStop->SetEnabled(busy && !cleaningSpeech);
@@ -751,8 +754,8 @@ void ControlToolBar::OnBatch(wxCommandEvent &evt)
mRewind->Enable();
mFF->Enable();
mPause->Disable();
mBatch->Enable();
mBatch->PopUp();
//mBatch->Enable();
//mBatch->PopUp();
}
void ControlToolBar::OnRecord(wxCommandEvent &evt)

4
src/toolbars/ControlToolBar.h
View File

@@ -110,7 +110,7 @@ class ControlToolBar:public ToolBar {
AButton *mRewind;
AButton *mPlay;
AButton *mBatch;
//AButton *mBatch;
AButton *mRecord;
AButton *mPause;
AButton *mStop;
@@ -126,7 +126,7 @@ class ControlToolBar:public ToolBar {
// Show/hide cleanspeech button
bool mCleanSpeechMode;
wxBoxSizer *mBatchGroup;
//wxBoxSizer *mBatchGroup;
wxBoxSizer *mSizer;
TrackList* mCutPreviewTracks;

2
src/toolbars/ToolBar.cpp
View File

@@ -117,7 +117,7 @@ ToolBar::~ToolBar()
//
wxString ToolBar::GetTitle()
{
/* i18n-hint: %s will be replaced by the version number.*/
/* i18n-hint: %s will be replaced by the name of the kind of toolbar.*/
return wxString::Format( _("Audacity %s ToolBar"), GetLabel().c_str() );
}