1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-23 23:03:55 +02:00

First stab at taming the meter toolbars

This should correct at least a couple of the reported
issues.  And it also has some fixes in for multiple
project support.
This commit is contained in:
lllucius
2014-12-17 19:16:08 +00:00
parent 4fe3f855eb
commit fe42e881a5
13 changed files with 203 additions and 158 deletions

View File

@@ -406,9 +406,9 @@ ToolManager::ToolManager( AudacityProject *parent )
// Create all of the toolbars
mBars[ ToolsBarID ] = new ToolsToolBar();
mBars[ TransportBarID ] = new ControlToolBar();
mBars[ RecordMeterBarID ] = new MeterToolBar( kWithRecordMeter );
mBars[ PlayMeterBarID ] = new MeterToolBar( kWithPlayMeter );
mBars[ MeterBarID ] = new MeterToolBar( kWithPlayMeter | kWithRecordMeter );
mBars[ RecordMeterBarID ] = new MeterToolBar( parent, RecordMeterBarID );
mBars[ PlayMeterBarID ] = new MeterToolBar( parent, PlayMeterBarID );
mBars[ MeterBarID ] = new MeterToolBar( parent, MeterBarID );
mBars[ EditBarID ] = new EditToolBar();
mBars[ MixerBarID ] = new MixerToolBar();
mBars[ TranscriptionBarID ] = new TranscriptionToolBar();
@@ -469,10 +469,6 @@ void ToolManager::Reset()
{
int ndx;
// The mInputMeter and mOutputMeter may be in use if audio is playing
// when this happens.
gAudioIO->SetMeters( NULL, NULL );
// Disconnect all docked bars
for( ndx = 0; ndx < ToolBarCount; ndx++ )
{
@@ -756,6 +752,10 @@ void ToolManager::ReadConfig()
{
d->ShowHide( t->GetId() );
}
else
{
t->Expose( show[ ndx ] );
}
}
}
@@ -772,6 +772,10 @@ void ToolManager::ReadConfig()
{
d->ShowHide( t->GetId() );
}
else
{
t->Expose( show[ ndx ] );
}
}
}