1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-17 09:07:41 +02:00

Add selection settings to Device Toolbar tooltips. Adjust some comments.

This commit is contained in:
v.audacity 2012-08-07 04:16:13 +00:00
parent 740770f391
commit f7841b4d8f
3 changed files with 7 additions and 7 deletions

View File

@ -193,7 +193,7 @@ bool Sequence::ConvertToSampleFormat(sampleFormat format, bool* pbChanged)
// This will happen consistently when going from more bytes per sample to fewer... // This will happen consistently when going from more bytes per sample to fewer...
// This will create a block that's smaller than mMinSamples, which // This will create a block that's smaller than mMinSamples, which
// shouldn't be allowed, but we agreed it's okay for now. // shouldn't be allowed, but we agreed it's okay for now.
//vvvvv ANSWER-ME: Does this cause any bugs, or failures on write, elsewhere? //vvv ANSWER-ME: Does this cause any bugs, or failures on write, elsewhere?
// If so, need to special-case (len < mMinSamples) and start combining data // If so, need to special-case (len < mMinSamples) and start combining data
// from the old blocks... Oh no! // from the old blocks... Oh no!
@ -223,7 +223,7 @@ bool Sequence::ConvertToSampleFormat(sampleFormat format, bool* pbChanged)
{ {
SeqBlock* pOldSeqBlock = mBlock->Item(i); SeqBlock* pOldSeqBlock = mBlock->Item(i);
mDirManager->Deref(pOldSeqBlock->f); mDirManager->Deref(pOldSeqBlock->f);
pOldSeqBlock->f = NULL; //vvvvv ...so we don't delete the file when we delete mBlock, next. ANSWER-ME: Right, or delete? pOldSeqBlock->f = NULL; //vvv ...so we don't delete the file when we delete mBlock, next. ANSWER-ME: Right, or delete?
} }
delete mBlock; delete mBlock;

View File

@ -348,10 +348,10 @@ void DeviceToolBar::EnableDisableButtons()
void DeviceToolBar::RegenerateTooltips() void DeviceToolBar::RegenerateTooltips()
{ {
#if wxUSE_TOOLTIPS #if wxUSE_TOOLTIPS
mOutput->SetToolTip(_("Output Device")); mOutput->SetToolTip(mOutput->GetName() + wxT(" - ") + mOutput->GetStringSelection());
mInput->SetToolTip(_("Input Device")); mInput->SetToolTip(mInput->GetName() + wxT(" - ") + mInput->GetStringSelection());
mHost->SetToolTip(_("Audio Host")); mHost->SetToolTip(mHost->GetName() + wxT(" - ") + mHost->GetStringSelection());
mInputChannels->SetToolTip(_("Input Channels")); mInputChannels->SetToolTip(mInputChannels->GetName() + wxT(" - ") + mInputChannels->GetStringSelection());
#endif #endif
} }

View File

@ -407,7 +407,7 @@ ToolManager::ToolManager( AudacityProject *parent )
// Create all of the toolbars // Create all of the toolbars
mBars[ ToolsBarID ] = new ToolsToolBar(); mBars[ ToolsBarID ] = new ToolsToolBar();
mBars[ TransportBarID ] = new ControlToolBar(); mBars[ TransportBarID ] = new ControlToolBar();
mBars[ MeterBarID ] = new MeterToolBar(); mBars[ MeterBarID ] = new MeterToolBar();
mBars[ EditBarID ] = new EditToolBar(); mBars[ EditBarID ] = new EditToolBar();
mBars[ MixerBarID ] = new MixerToolBar(); mBars[ MixerBarID ] = new MixerToolBar();