Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-01 16:19:43 +02:00
Code Issues Releases Wiki Activity

Standardise on working oof Recording and Playback rather than Input and Output throughout Audacity. Remove some very old junks strings at the same time.

Browse Source
This commit is contained in:
RichardAsh1981@gmail.com 2014-07-21 21:37:53 +00:00
parent 84df24527c
commit 3f49828d37
11 changed files with 60 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/AudacityApp.cpp
View File

@ -1055,8 +1055,6 @@ bool AudacityApp::OnInit()
// Unused strings that we want to be translated, even though
// we're not using them yet...
wxString future1 = _("Master Gain Control");
wxString future2 = _("Input Meter");
wxString future3 = _("Output Meter");
::wxInitAllImageHandlers();

38
src/AudioIO.cpp
View File

@ -925,7 +925,7 @@ void AudioIO::HandleDeviceChange()
#if 0
printf("PortMixer: Output: %s Input: %s\n",
printf("PortMixer: Playback: %s Recording: %s\n",
mEmulateMixerOutputVol? "emulated": "native",
mInputMixerWorks? "hardware": "no control");
#endif
@ -2439,7 +2439,7 @@ wxString AudioIO::GetDeviceInfo()
wxLogDebug(wxT("Portaudio reports %d audio devices"),cnt);
s << wxT("==============================") << e;
s << wxT("Default capture device number: ") << recDeviceNum << e;
s << wxT("Default recording device number: ") << recDeviceNum << e;
s << wxT("Default playback device number: ") << playDeviceNum << e;
wxString recDevice = gPrefs->Read(wxT("/AudioIO/RecordingDevice"), wxT(""));
@ -2467,12 +2467,12 @@ wxString AudioIO::GetDeviceInfo()
s << wxT("Device ID: ") << j << e;
s << wxT("Device name: ") << name << e;
s << wxT("Host name: ") << HostName(info) << e;
s << wxT("Input channels: ") << info->maxInputChannels << e;
s << wxT("Output channels: ") << info->maxOutputChannels << e;
s << wxT("Low Input Latency: ") << info->defaultLowInputLatency << e;
s << wxT("Low Output Latency: ") << info->defaultLowOutputLatency << e;
s << wxT("High Input Latency: ") << info->defaultHighInputLatency << e;
s << wxT("High Output Latency: ") << info->defaultHighOutputLatency << e;
s << wxT("Recording channels: ") << info->maxInputChannels << e;
s << wxT("Playback channels: ") << info->maxOutputChannels << e;
s << wxT("Low Recording Latency: ") << info->defaultLowInputLatency << e;
s << wxT("Low Playback Latency: ") << info->defaultLowOutputLatency << e;
s << wxT("High Recording Latency: ") << info->defaultHighInputLatency << e;
s << wxT("High Playback Latency: ") << info->defaultHighOutputLatency << e;
wxArrayLong rates = GetSupportedPlaybackRates(j, 0.0);
@ -2502,9 +2502,9 @@ wxString AudioIO::GetDeviceInfo()
s << wxT("==============================") << e;
if(haveRecDevice){
s << wxT("Selected capture device: ") << recDeviceNum << wxT(" - ") << recDevice << e;
s << wxT("Selected recording device: ") << recDeviceNum << wxT(" - ") << recDevice << e;
}else{
s << wxT("No capture device found.") << e;
s << wxT("No recording device found.") << e;
}
if(havePlayDevice){
s << wxT("Selected playback device: ") << playDeviceNum << wxT(" - ") << playDevice << e;
@ -2603,7 +2603,7 @@ wxString AudioIO::GetDeviceInfo()
}
s << wxT("==============================") << e;
s << wxT("Available capture sources:") << e;
s << wxT("Available recording sources:") << e;
cnt = Px_GetNumInputSources(PortMixer);
for (int i = 0; i < cnt; i++) {
wxString name(Px_GetInputSourceName(PortMixer, i), wxConvLocal);
@ -2647,7 +2647,7 @@ wxString AudioIO::GetDeviceInfo()
Pa_CloseStream(stream);
s << wxT("==============================") << e;
s << wxT("Capture volume is ") << (EmulateMixerInputVol? wxT("emulated"): wxT("native")) << e;
s << wxT("Recording volume is ") << (EmulateMixerInputVol? wxT("emulated"): wxT("native")) << e;
s << wxT("Playback volume is ") << (EmulateMixerOutputVol? wxT("emulated"): wxT("native")) << e;
Px_CloseMixer(PortMixer);
@ -3166,7 +3166,7 @@ void AudioIO::AILAProcess(double maxPeak) {
//we can't improve it more now
if (mAILATotalAnalysis != 0) {
mAILAActive = false;
proj->TP_DisplayStatusMessage(_("Automated Input Level Adjustment stopped. It was not possible to optimize it more. Still too high."));
proj->TP_DisplayStatusMessage(_("Automated Recording Level Adjustment stopped. It was not possible to optimize it more. Still too high."));
}
printf("\talready min vol:%f\n", iv);
}
@ -3174,7 +3174,7 @@ void AudioIO::AILAProcess(double maxPeak) {
float vol = (float) max(LOWER_BOUND, iv+(mAILAGoalPoint-mAILAMax)*mAILAChangeFactor);
Px_SetInputVolume(mPortMixer, vol);
wxString msg;
msg.Printf(_("Automated Input Level Adjustment decreased the volume to %f."), vol);
msg.Printf(_("Automated Recording Level Adjustment decreased the volume to %f."), vol);
proj->TP_DisplayStatusMessage(msg);
changetype = 1;
printf("\tnew vol:%f\n", vol);
@ -3189,7 +3189,7 @@ void AudioIO::AILAProcess(double maxPeak) {
//we can't improve it more
if (mAILATotalAnalysis != 0) {
mAILAActive = false;
proj->TP_DisplayStatusMessage(_("Automated Input Level Adjustment stopped. It was not possible to optimize it more. Still too low."));
proj->TP_DisplayStatusMessage(_("Automated Recording Level Adjustment stopped. It was not possible to optimize it more. Still too low."));
}
printf("\talready max vol:%f\n", iv);
}
@ -3201,7 +3201,7 @@ void AudioIO::AILAProcess(double maxPeak) {
}
Px_SetInputVolume(mPortMixer, vol);
wxString msg;
msg.Printf(_("Automated Input Level Adjustment increased the volume to %.2f."), vol);
msg.Printf(_("Automated Recording Level Adjustment increased the volume to %.2f."), vol);
proj->TP_DisplayStatusMessage(msg);
changetype = 2;
printf("\tnew vol:%f\n", vol);
@ -3235,12 +3235,12 @@ void AudioIO::AILAProcess(double maxPeak) {
if (mAILAActive && mAILATotalAnalysis != 0 && mAILAAnalysisCounter >= mAILATotalAnalysis) {
mAILAActive = false;
if (mAILAMax > mAILAGoalPoint + mAILAGoalDelta)
proj->TP_DisplayStatusMessage(_("Automated Input Level Adjustment stopped. The total number of analysis has been exceeded without finding an acceptable volume. Still too high."));
proj->TP_DisplayStatusMessage(_("Automated Recording Level Adjustment stopped. The total number of analyses has been exceeded without finding an acceptable volume. Still too high."));
else if (mAILAMax < mAILAGoalPoint - mAILAGoalDelta)
proj->TP_DisplayStatusMessage(_("Automated Input Level Adjustment stopped. The total number of analysis has been exceeded without finding an acceptable volume. Still too low."));
proj->TP_DisplayStatusMessage(_("Automated Recording Level Adjustment stopped. The total number of analyses has been exceeded without finding an acceptable volume. Still too low."));
else {
wxString msg;
msg.Printf(_("Automated Input Level Adjustment stopped. %.2f seems an acceptable volume."), Px_GetInputVolume(mPortMixer));
msg.Printf(_("Automated Recording Level Adjustment stopped. %.2f seems an acceptable volume."), Px_GetInputVolume(mPortMixer));
proj->TP_DisplayStatusMessage(msg);
}
}

6
src/HelpText.cpp
View File

@ -133,17 +133,17 @@ wxString TitleText( const wxString & Key )
if(Key ==wxT("inputdevice") )
{
/* i18n-hint: Title for a topic.*/
return _("Recording - Choosing the Input Device");
return _("Recording - Choosing the Recording Device");
}
if(Key ==wxT("inputsource") )
{
/* i18n-hint: Title for a topic.*/
return _("Recording - Choosing the Input Source");
return _("Recording - Choosing the Recording Source");
}
if(Key ==wxT("inputlevel") )
{
/* i18n-hint: Title for a topic.*/
return _("Recording - Setting the Input Level");
return _("Recording - Setting the Recording Level");
}
if((Key ==wxT("edit") ) || (Key==wxT("grey")))
{

20
src/Menus.cpp
View File

@ -686,7 +686,7 @@ void AudacityProject::CreateMenusAndCommands()
c->AddItem(wxT("SoundActivationLevel"), _("Sound Activation Le&vel..."), FN(OnSoundActivated));
#ifdef AUTOMATED_INPUT_LEVEL_ADJUSTMENT
c->AddCheck(wxT("AutomatedInputLevelAdjustmentOnOff"), _("A&utomated Input Level Adjustment (on/off)"), FN(OnToogleAutomatedInputLevelAdjustment), 0);
c->AddCheck(wxT("AutomatedInputLevelAdjustmentOnOff"), _("A&utomated Recording Level Adjustment (on/off)"), FN(OnToogleAutomatedInputLevelAdjustment), 0);
#endif
c->AddItem(wxT("RescanDevices"), _("R&escan Audio Devices"), FN(OnRescanDevices));
@ -1173,25 +1173,25 @@ void AudacityProject::CreateMenusAndCommands()
wxT("F11"));
#endif
c->AddCommand(wxT("InputDevice"), _("Change input device"), FN(OnInputDevice), wxT("Shift+I"),
c->AddCommand(wxT("InputDevice"), _("Change recording device"), FN(OnInputDevice), wxT("Shift+I"),
AudioIONotBusyFlag,
AudioIONotBusyFlag);
c->AddCommand(wxT("OutputDevice"), _("Change output device"), FN(OnOutputDevice), wxT("Shift+O"),
c->AddCommand(wxT("OutputDevice"), _("Change playback device"), FN(OnOutputDevice), wxT("Shift+O"),
AudioIONotBusyFlag,
AudioIONotBusyFlag);
c->AddCommand(wxT("AudioHost"), _("Change audio host"), FN(OnAudioHost), wxT("Shift+H"),
AudioIONotBusyFlag,
AudioIONotBusyFlag);
c->AddCommand(wxT("InputChannels"), _("Change input channels"), FN(OnInputChannels), wxT("Shift+N"),
c->AddCommand(wxT("InputChannels"), _("Change recording channels"), FN(OnInputChannels), wxT("Shift+N"),
AudioIONotBusyFlag,
AudioIONotBusyFlag);
c->AddCommand(wxT("OutputGain"), _("Adjust output gain"), FN(OnOutputGain));
c->AddCommand(wxT("OutputGainInc"), _("Increase output gain"), FN(OnOutputGainInc));
c->AddCommand(wxT("OutputGainDec"), _("Decrease output gain"), FN(OnOutputGainDec));
c->AddCommand(wxT("InputGain"), _("Adjust input gain"), FN(OnInputGain));
c->AddCommand(wxT("InputGainInc"), _("Increase input gain"), FN(OnInputGainInc));
c->AddCommand(wxT("InputGainDec"), _("Decrease input gain"), FN(OnInputGainDec));
c->AddCommand(wxT("OutputGain"), _("Adjust playback volume"), FN(OnOutputGain));
c->AddCommand(wxT("OutputGainInc"), _("Increase playback volume"), FN(OnOutputGainInc));
c->AddCommand(wxT("OutputGainDec"), _("Decrease playback volume"), FN(OnOutputGainDec));
c->AddCommand(wxT("InputGain"), _("Adjust recording volume"), FN(OnInputGain));
c->AddCommand(wxT("InputGainInc"), _("Increase recording volume"), FN(OnInputGainInc));
c->AddCommand(wxT("InputGainDec"), _("Decrease recording volume"), FN(OnInputGainDec));
c->AddCommand(wxT("PlayAtSpeed"), _("Play at speed"), FN(OnPlayAtSpeed));
c->AddCommand(wxT("SetPlaySpeed"), _("Adjust playback speed"), FN(OnSetPlaySpeed));

2
src/effects/Effect.cpp
View File

@ -533,7 +533,7 @@ void Effect::Preview(bool dryOnly)
delete mProgress;
}
else {
wxMessageBox(_("Error while opening sound device. Please check the output device settings and the project sample rate."),
wxMessageBox(_("Error while opening sound device. Please check the playback device settings and the project sample rate."),
_("Error"), wxOK | wxICON_EXCLAMATION, FocusDialog);
}
}

4
src/prefs/RecordingPrefs.cpp
View File

@ -125,9 +125,9 @@ void RecordingPrefs::PopulateOrExchange(ShuttleGui & S)
S.EndStatic();
#ifdef AUTOMATED_INPUT_LEVEL_ADJUSTMENT
S.StartStatic(_("Automated Input Level Adjustment"));
S.StartStatic(_("Automated Recording Level Adjustment"));
{
S.TieCheckBox(_("Enable Automated Input Level Adjustment."),
S.TieCheckBox(_("Enable Automated Recording Level Adjustment."),
wxT("/AudioIO/AutomatedInputLevelAdjustment"),
false);

5
src/toolbars/ControlToolBar.cpp
View File

@ -608,7 +608,7 @@ void ControlToolBar::PlayPlayRegion(double t0, double t1,
// msmeyer: Show error message if stream could not be opened
wxMessageBox(_(
"Error while opening sound device. "
wxT("Please check the output device settings and the project sample rate.")),
wxT("Please check the playback device settings and the project sample rate.")),
_("Error"), wxOK | wxICON_EXCLAMATION, this);
}
}
@ -940,8 +940,7 @@ void ControlToolBar::OnRecord(wxCommandEvent &evt)
}
// msmeyer: Show error message if stream could not be opened
wxMessageBox(_("Error while opening sound device. "
wxT("Please check the input device settings and the project sample rate.")),
wxMessageBox(_("Error while opening sound device. Please check the recording device settings and the project sample rate."),
_("Error"), wxOK | wxICON_EXCLAMATION, this);
SetPlay(false);

20
src/toolbars/DeviceToolBar.cpp
View File

@ -113,8 +113,8 @@ void DeviceToolBar::Populate()
wxID_ANY,
wxDefaultPosition,
wxDefaultSize);
/* i18n-hint: (noun) It's the device used for output.*/
mOutput->SetName(_("Output Device"));
/* i18n-hint: (noun) It's the device used for playback.*/
mOutput->SetName(_("Playback Device"));
Add(mOutput, 0, wxALIGN_CENTER);
// Input device
@ -128,15 +128,15 @@ void DeviceToolBar::Populate()
wxID_ANY,
wxDefaultPosition,
wxDefaultSize);
/* i18n-hint: (noun) It's the device used for input.*/
mInput->SetName(_("Input Device"));
/* i18n-hint: (noun) It's the device used for recording.*/
mInput->SetName(_("Recording Device"));
Add(mInput, 0, wxALIGN_CENTER);
mInputChannels = new wxChoice(this,
wxID_ANY,
wxDefaultPosition,
wxDefaultSize);
mInputChannels->SetName(_("Input Channels"));
mInputChannels->SetName(_("Recording Channels"));
Add(mInputChannels, 0, wxALIGN_CENTER);
mHost->Connect(wxEVT_SET_FOCUS,
@ -612,10 +612,10 @@ void DeviceToolBar::FillInputChannels()
wxString name;
if (j == 0) {
name = _("1 (Mono) Input Channel");
name = _("1 (Mono) Recording Channel");
}
else if (j == 1) {
name = _("2 (Stereo) Input Channels");
name = _("2 (Stereo) Recording Channels");
}
else {
name = wxString::Format(wxT("%d"), j + 1);
@ -742,11 +742,11 @@ void DeviceToolBar::OnChoice(wxCommandEvent &event)
void DeviceToolBar::ShowInputDialog()
{
ShowComboDialog(mInput, wxString(_("Select Input Device")));
ShowComboDialog(mInput, wxString(_("Select Recording Device")));
}
void DeviceToolBar::ShowOutputDialog()
{
ShowComboDialog(mOutput, wxString(_("Select Output Device")));
ShowComboDialog(mOutput, wxString(_("Select Playback Device")));
}
void DeviceToolBar::ShowHostDialog()
{
@ -754,7 +754,7 @@ void DeviceToolBar::ShowHostDialog()
}
void DeviceToolBar::ShowChannelsDialog()
{
ShowComboDialog(mInputChannels, wxString(_("Select Input Channels")));
ShowComboDialog(mInputChannels, wxString(_("Select Recording Channels")));
}
void DeviceToolBar::ShowComboDialog(wxChoice *combo, const wxString &title)

4
src/toolbars/MeterToolBar.cpp
View File

@ -126,8 +126,8 @@ void MeterToolBar::UpdatePrefs()
void MeterToolBar::RegenerateTooltips()
{
#if wxUSE_TOOLTIPS
mPlayMeter->SetToolTip( _("Output Level") );
mRecordMeter->SetToolTip( _("Input Level (Click to monitor.)") );
mPlayMeter->SetToolTip( _("Playback Level") );
mRecordMeter->SetToolTip( _("Recording Level (Click to monitor.)") );
#endif
}

16
src/toolbars/MixerToolBar.cpp
View File

@ -88,10 +88,10 @@ void MixerToolBar::Populate()
wxID_ANY,
*mPlayBitmap), 0, wxALIGN_CENTER);
mOutputSlider = new ASlider(this, wxID_ANY, _("Output Volume"),
mOutputSlider = new ASlider(this, wxID_ANY, _("Playback Volume"),
wxDefaultPosition, wxSize(130, 25));
mOutputSlider->SetScroll(0.1f, 2.0f);
mOutputSlider->SetName(_("Slider Output"));
mOutputSlider->SetName(_("Slider Playback"));
Add(mOutputSlider, 0, wxALIGN_CENTER);
mRecordBitmap = new wxBitmap(theTheme.Bitmap(bmpMic));
@ -100,10 +100,10 @@ void MixerToolBar::Populate()
wxID_ANY,
*mRecordBitmap), 0, wxALIGN_CENTER);
mInputSlider = new ASlider(this, wxID_ANY, _("Input Volume"),
mInputSlider = new ASlider(this, wxID_ANY, _("Recording Volume"),
wxDefaultPosition, wxSize(130, 25));
mInputSlider->SetScroll(0.1f, 2.0f);
mInputSlider->SetName(_("Slider Input"));
mInputSlider->SetName(_("Slider Recording"));
Add(mInputSlider, 0, wxALIGN_CENTER);
// this bit taken from SelectionBar::Populate()
@ -293,20 +293,20 @@ void MixerToolBar::SetToolTips()
#if wxUSE_TOOLTIPS
if (mInputSlider->IsEnabled()) {
mInputSlider->SetToolTip(wxString::Format(
_("Input Volume: %.2f"), mInputSliderVolume));
_("Recording Volume: %.2f"), mInputSliderVolume));
}
else {
mInputSlider->SetToolTip(
_("Input Volume (Unavailable; use system mixer.)"));
_("Recording Volume (Unavailable; use system mixer.)"));
}
if (mOutputSlider->IsEnabled()) {
mOutputSlider->SetToolTip(wxString::Format(
_("Output Volume: %.2f%s"), mOutputSliderVolume, gAudioIO->OutputMixerEmulated() ? _(" (emulated)") : wxT("")));
_("Playback Volume: %.2f%s"), mOutputSliderVolume, gAudioIO->OutputMixerEmulated() ? _(" (emulated)") : wxT("")));
}
else {
mOutputSlider->SetToolTip(
_("Output Volume (Unavailable; use system mixer.)"));
_("Playback Volume (Unavailable; use system mixer.)"));
}
#endif
}

6
src/widgets/Meter.cpp
View File

@ -414,9 +414,9 @@ void Meter::OnMouse(wxMouseEvent &evt)
#ifdef AUTOMATED_INPUT_LEVEL_ADJUSTMENT
if (gAudioIO->AILAIsActive())
menu->Append(OnAutomatedInputLevelAdjustmentID, _("Stop Automated Input Level Adjustment"));
menu->Append(OnAutomatedInputLevelAdjustmentID, _("Stop Automated Recording Level Adjustment"));
else
menu->Append(OnAutomatedInputLevelAdjustmentID, _("Start Automated Input Level Adjustment"));
menu->Append(OnAutomatedInputLevelAdjustmentID, _("Start Automated Recording Level Adjustment"));
bool AVActive;
gPrefs->Read(wxT("/AudioIO/AutomatedInputLevelAdjustment"), &AVActive, false);
@ -1273,7 +1273,7 @@ void Meter::OnAutomatedInputLevelAdjustment(wxCommandEvent &evt)
if (gAudioIO->AILAIsActive()) {
gAudioIO->AILADisable();
AudacityProject *p = GetActiveProject();
if (p) p->TP_DisplayStatusMessage(_("Automated Input Level Adjustment stopped as requested by user."));
if (p) p->TP_DisplayStatusMessage(_("Automated Recording Level Adjustment stopped as requested by user."));
}
else
gAudioIO->AILAInitialize();