Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-01 08:29:27 +02:00
Code Issues Releases Wiki Activity

Move record-new-track option

Browse Source 
It's now in recording-prefs rather than track-behavior-prefs, and to make room latency options (which are related to device) ar enow in device-prefs.  Naming of new tracks has also been made slightly more compact.
This commit is contained in:
James Crook 2017-05-07 13:22:04 +01:00
parent 6a33e8303a
commit f0bdfc10b5
3 changed files with 72 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/prefs/DevicePrefs.cpp
View File

@ -161,6 +161,35 @@ void DevicePrefs::PopulateOrExchange(ShuttleGui & S)
S.EndMultiColumn();
}
S.EndStatic();
// These previously lived in recording preferences.
// However they are liable to become device specific.
// Buffering also affects playback, not just recording, so is a device characteristic.
S.StartStatic( _("Latency"));
{
S.StartThreeColumn();
{
wxTextCtrl *w;
// only show the following controls if we use Portaudio v19, because
// for Portaudio v18 we always use default buffer sizes
w = S.TieNumericTextBox(_("Audio to &buffer:"),
wxT("/AudioIO/LatencyDuration"),
DEFAULT_LATENCY_DURATION,
9);
S.AddUnits(_("milliseconds (higher = more latency)"));
w->SetName(w->GetName() + wxT(" ") + _("milliseconds (higher = more latency)"));
w = S.TieNumericTextBox(_("L&atency correction:"),
wxT("/AudioIO/LatencyCorrection"),
DEFAULT_LATENCY_CORRECTION,
9);
S.AddUnits(_("milliseconds (negative = backwards)"));
w->SetName(w->GetName() + wxT(" ") + _("milliseconds (negative = backwards)"));
}
S.EndThreeColumn();
}
S.EndStatic();
}
void DevicePrefs::OnHost(wxCommandEvent & e)

57
src/prefs/RecordingPrefs.cpp
View File

@ -67,8 +67,6 @@ void RecordingPrefs::Populate()
void RecordingPrefs::PopulateOrExchange(ShuttleGui & S)
{
wxTextCtrl *w;
S.SetBorder(2);
S.StartStatic(_("Playthrough"));
@ -90,30 +88,6 @@ void RecordingPrefs::PopulateOrExchange(ShuttleGui & S)
}
S.EndStatic();
S.StartStatic( _("Latency"));
{
S.StartThreeColumn();
{
// only show the following controls if we use Portaudio v19, because
// for Portaudio v18 we always use default buffer sizes
w = S.TieNumericTextBox(_("Audio to &buffer:"),
wxT("/AudioIO/LatencyDuration"),
DEFAULT_LATENCY_DURATION,
9);
S.AddUnits(_("milliseconds (higher = more latency)"));
w->SetName(w->GetName() + wxT(" ") + _("milliseconds (higher = more latency)"));
w = S.TieNumericTextBox(_("L&atency correction:"),
wxT("/AudioIO/LatencyCorrection"),
DEFAULT_LATENCY_CORRECTION,
9);
S.AddUnits(_("milliseconds (negative = backwards)"));
w->SetName(w->GetName() + wxT(" ") + _("milliseconds (negative = backwards)"));
}
S.EndThreeColumn();
}
S.EndStatic();
S.StartStatic(_("Sound Activated Recording"));
{
S.TieCheckBox(_("Sound Activated &Recording"),
@ -135,11 +109,17 @@ void RecordingPrefs::PopulateOrExchange(ShuttleGui & S)
}
S.EndStatic();
S.StartStatic(_("Naming newly recorded tracks"));
S.StartStatic(_("Name newly recorded tracks"));
{
// Nested multicolumns to indent by 'With:' width, in a way that works if
// translated.
// This extra step is worth doing to get the check boxes lined up nicely.
S.StartMultiColumn( 2 );
{
S.AddFixedText(_("With:")) ;
S.StartMultiColumn(3);
{
S.Id(UseCustomTrackNameID).TieCheckBox(_("Use Custom Track &Name"),
S.Id(UseCustomTrackNameID).TieCheckBox(_("Custom Track &Name"),
wxT("/GUI/TrackNames/RecordingNameCustom"),
mUseCustomTrackName ? true : false);
@ -152,18 +132,33 @@ void RecordingPrefs::PopulateOrExchange(ShuttleGui & S)
}
S.EndMultiColumn();
S.TieCheckBox(_("Add &Track Number"),
S.AddFixedText( "" );
S.StartMultiColumn(3);
{
S.TieCheckBox(_("&Track Number"),
wxT("/GUI/TrackNames/TrackNumber"),
false);
S.TieCheckBox(_("Add System &Date"),
S.TieCheckBox(_("System &Date"),
wxT("/GUI/TrackNames/DateStamp"),
false);
S.TieCheckBox(_("Add System T&ime"),
S.TieCheckBox(_("System T&ime"),
wxT("/GUI/TrackNames/TimeStamp"),
false);
}
S.EndMultiColumn();
}
S.EndMultiColumn();
}
S.EndStatic();
S.StartStatic(_("Options"));
{
S.TieCheckBox(_("Record appends, instead of recording new track"),
wxT("/GUI/PreferAppendRecord"),
true);
}
S.EndStatic();
#ifdef EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT

3
src/prefs/TracksBehaviorsPrefs.cpp
View File

@ -63,9 +63,6 @@ void TracksBehaviorsPrefs::PopulateOrExchange(ShuttleGui & S)
S.TieCheckBox(_("&Select then act on entire project, if no audio selected"),
wxT("/GUI/SelectAllOnNone"),
true);
S.TieCheckBox(_("Append recordings to same track, by default"),
wxT("/GUI/PreferAppendRecord"),
true);
/* i18n-hint: cut-lines are a lines indicating where to cut.*/
S.TieCheckBox(_("Enable cut &lines"),
wxT("/GUI/EnableCutLines"),