Update of /cvsroot/audacity/audacity-src/src/prefs
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15388/src/prefs
Modified Files:
AudioIOPrefs.cpp FileFormatPrefs.cpp GUIPrefs.cpp GUIPrefs.h
PrefsDialog.cpp
Log Message:
More updates based on suggestions.
Index: PrefsDialog.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/prefs/PrefsDialog.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- PrefsDialog.cpp 6 Apr 2009 23:20:28 -0000 1.60
+++ PrefsDialog.cpp 7 Apr 2009 04:27:22 -0000 1.61
@@ -84,13 +84,13 @@
// w = new MidiIOPrefs(mCategories); mCategories->AddPage(w,
w->GetName(), false, 0);
w = new QualityPrefs(mCategories); mCategories->AddPage(w,
w->GetName(), false, 0);
w = new FileFormatPrefs(mCategories); mCategories->AddPage(w,
w->GetName(), false, 0);
+ w = new ProjectPrefs(mCategories); mCategories->AddPage(w,
w->GetName(), false, 0);
w = new LibraryPrefs(mCategories); mCategories->AddPage(w,
w->GetName(), false, 0);
w = new GUIPrefs(mCategories); mCategories->AddPage(w,
w->GetName(), false, 0);
- w = new ShowPrefs(mCategories); mCategories->AddPage(w,
w->GetName(), false, 0);
w = new TracksPrefs(mCategories); mCategories->AddPage(w,
w->GetName(), false, 0);
w = new SpectrumPrefs(mCategories); mCategories->AddPage(w,
w->GetName(), false, 0);
w = new DirectoriesPrefs(mCategories); mCategories->AddPage(w,
w->GetName(), false, 0);
-// w = new SmartRecordPrefs(mCategories); mCategories->AddPage(w,
w->GetName(), false, 0);
+ w = new WarningsPrefs(mCategories); mCategories->AddPage(w,
w->GetName(), false, 0);
#ifdef EXPERIMENTAL_THEME_PREFS
w = new ThemePrefs(mCategories); mCategories->AddPage(w,
w->GetName(), false, 0);
Index: GUIPrefs.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/prefs/GUIPrefs.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- GUIPrefs.h 4 Apr 2009 10:55:55 -0000 1.22
+++ GUIPrefs.h 7 Apr 2009 04:27:22 -0000 1.23
@@ -23,11 +23,11 @@
#include "PrefsPanel.h"
-class ShowPrefs:public PrefsPanel
+class WarningsPrefs:public PrefsPanel
{
public:
- ShowPrefs(wxWindow * parent);
- ~ShowPrefs();
+ WarningsPrefs(wxWindow * parent);
+ ~WarningsPrefs();
virtual bool Apply();
private:
Index: GUIPrefs.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/prefs/GUIPrefs.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- GUIPrefs.cpp 6 Apr 2009 23:20:28 -0000 1.74
+++ GUIPrefs.cpp 7 Apr 2009 04:27:22 -0000 1.75
@@ -32,17 +32,17 @@
////////////////////////////////////////////////////////////////////////////////
-ShowPrefs::ShowPrefs(wxWindow * parent)
-: PrefsPanel(parent, _("Show"))
+WarningsPrefs::WarningsPrefs(wxWindow * parent)
+: PrefsPanel(parent, _("Warnings"))
{
Populate();
}
-ShowPrefs::~ShowPrefs()
+WarningsPrefs::~WarningsPrefs()
{
}
-void ShowPrefs::Populate()
+void WarningsPrefs::Populate()
{
//------------------------- Main section --------------------
// Now construct the GUI itself.
@@ -53,38 +53,32 @@
// ----------------------- End of main section --------------
}
-void ShowPrefs::PopulateOrExchange(ShuttleGui & S)
+void WarningsPrefs::PopulateOrExchange(ShuttleGui & S)
{
S.SetBorder(2);
- S.StartStatic(_("Show"));
+ S.StartStatic(_("Show Warnings/Prompts"));
{
- S.TieCheckBox(_("Show &welcome message at program start up"),
- wxT("/GUI/ShowSplashScreen"),
+ S.TieCheckBox(_("When saving &projects"),
+ wxT("/Warnings/FirstProjectSave"),
true);
- S.TieCheckBox(_("Show prompt to sa&ve, even if project is empty"),
+ S.TieCheckBox(_("When saving &empty project"),
wxT("/GUI/EmptyCanBeDirty"),
true);
- S.TieCheckBox(_("Show warnings about &temp files"),
- wxT("/GUI/WarnAboutTempFiles"),
- true);
- S.TieCheckBox(_("Show warnings about &low disk space"),
+ S.TieCheckBox(_("When &disk space is getting low"),
wxT("/Warnings/DiskSpaceWarning"),
true);
- S.TieCheckBox(_("Show warning when saving projects"),
- wxT("/Warnings/FirstProjectSave"),
- true);
- S.TieCheckBox(_("Show warning about mixdown to stereo during export"),
+ S.TieCheckBox(_("When mixing tracks down to &stereo during export"),
wxT("/Warnings/MixStereo"),
true);
- S.TieCheckBox(_("Show warning about mixdown to mono during export"),
+ S.TieCheckBox(_("When mixing tracks down to &mono during export"),
wxT("/Warnings/MixMono"),
true);
}
S.EndStatic();
}
-bool ShowPrefs::Apply()
+bool WarningsPrefs::Apply()
{
ShuttleGui S(this, eIsSavingToPrefs);
PopulateOrExchange(S);
@@ -165,6 +159,9 @@
S.StartStatic(_("Behaviors"));
{
+ S.TieCheckBox(_("&Select all audio in project, if none selected"),
+ wxT("/GUI/SelectAllOnNone"),
+ true);
S.TieCheckBox(_("Enable cut &lines"),
wxT("/GUI/EnableCutLines"),
false);
@@ -177,9 +174,6 @@
S.TieCheckBox(_("Editing a &clip can move other clips"),
wxT("/GUI/EditClipCanMove"),
true);
- S.TieCheckBox(_("&Select all audio in project, if none selected"),
- wxT("/GUI/SelectAllOnNone"),
- true);
S.AddSpace(10);
@@ -277,6 +271,9 @@
S.TieCheckBox(_("Er&gonomic order of audio I/O buttons"),
wxT("/GUI/ErgonomicTransportButtons"),
true);
+ S.TieCheckBox(_("Show &welcome message at program start up"),
+ wxT("/GUI/ShowSplashScreen"),
+ true);
S.AddSpace(10);
Index: FileFormatPrefs.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/prefs/FileFormatPrefs.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- FileFormatPrefs.cpp 6 Apr 2009 23:20:28 -0000 1.76
+++ FileFormatPrefs.cpp 7 Apr 2009 04:27:22 -0000 1.77
@@ -255,32 +255,32 @@
S.StartStatic(_("When importing audio files"));
{
-
S.StartRadioButtonGroup(wxT("/FileFormats/CopyOrEditUncompressedData"),wxT("edit"));
- S.TieRadioButton(_("&Make a copy of uncompressed audio files before
editing (safer)"),wxT("copy"));
- S.TieRadioButton(_("&Read uncompressed audio files directly from the
original (faster)"),wxT("edit"));
+ S.StartRadioButtonGroup(wxT("/FileFormats/CopyOrEditUncompressedData"),
wxT("edit"));
+ {
+ S.TieRadioButton(_("&Make a copy of uncompressed audio files before
editing (safer)"),
+ wxT("copy"));
+ S.TieRadioButton(_("&Read uncompressed audio files directly from the
original (faster)"),
+ wxT("edit"));
+ }
S.EndRadioButtonGroup();
+
S.TieCheckBox(_("&Normalize all tracks in project"),
wxT("/AudioFiles/NormalizeOnLoad"),
false);
}
S.EndStatic();
- S.StartStatic(_("When saving a project that depends on other audio files"));
- {
-
S.StartRadioButtonGroup(wxT("/FileFormats/SaveProjectWithDependencies"),wxT("ask"));
- S.TieRadioButton(_("Always © all audio into project (safest)"),
wxT("copy"));
- S.TieRadioButton(_("&Do not copy any audio"), wxT("never"));
- S.TieRadioButton(_("&Ask user"), wxT("ask"));
- S.EndRadioButtonGroup();
- }
- S.EndStatic();
-
S.StartStatic(_("When exporting tracks to an audio file"));
{
- S.StartRadioButtonGroup(wxT("/FileFormats/ExportDownMix"),true);
- S.TieRadioButton(_("A&lways mix all tracks down to Stereo or Mono
channel(s)."),true);
- S.TieRadioButton(_("&Use custom mix (for example to export a 5.1
multichannel file)"),false);
+ S.StartRadioButtonGroup(wxT("/FileFormats/ExportDownMix"), true);
+ {
+ S.TieRadioButton(_("A&lways mix all tracks down to Stereo or Mono
channel(s)."),
+ true);
+ S.TieRadioButton(_("&Use custom mix (for example to export a 5.1
multichannel file)"),
+ false);
+ }
S.EndRadioButtonGroup();
+
S.TieCheckBox(_("S&how Metadata Editor prior to export step"),
wxT("/AudioFiles/ShowId3Dialog"),
true);
@@ -327,10 +327,15 @@
S.StartStatic(_("When saving a project that depends on other audio files"));
{
-
S.StartRadioButtonGroup(wxT("/FileFormats/SaveProjectWithDependencies"),wxT("ask"));
- S.TieRadioButton(_("Always © all audio into project (safest)"),
wxT("copy"));
- S.TieRadioButton(_("&Do not copy any audio"), wxT("never"));
- S.TieRadioButton(_("&Ask user"), wxT("ask"));
+ S.StartRadioButtonGroup(wxT("/FileFormats/SaveProjectWithDependencies"),
wxT("ask"));
+ {
+ S.TieRadioButton(_("Always © all audio into project (safest)"),
+ wxT("copy"));
+ S.TieRadioButton(_("&Do not copy any audio"),
+ wxT("never"));
+ S.TieRadioButton(_("&Ask user"),
+ wxT("ask"));
+ }
S.EndRadioButtonGroup();
}
S.EndStatic();
Index: AudioIOPrefs.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/prefs/AudioIOPrefs.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- AudioIOPrefs.cpp 7 Apr 2009 01:50:27 -0000 1.65
+++ AudioIOPrefs.cpp 7 Apr 2009 04:27:22 -0000 1.66
@@ -83,13 +83,17 @@
void DevicePrefs::GetNamesAndLabels()
{
- // Get lists of devices both for play and record.
- int nHosts = Pa_GetHostApiCount();
-
- for (int i = 0; i < nHosts; i++) {
- wxString name = LAT1CTOWX(Pa_GetHostApiInfo(i)->name);
- mHostNames.Add(name);
- mHostLabels.Add(name);
+ // Gather list of hosts. Only added hosts that have devices attached.
+ int nDevices = Pa_GetDeviceCount();
+ for (int i = 0; i < nDevices; i++) {
+ const PaDeviceInfo *info = Pa_GetDeviceInfo(i);
+ if (info->maxOutputChannels > 0 || info->maxInputChannels > 0) {
+ wxString name = LAT1CTOWX(Pa_GetHostApiInfo(info->hostApi)->name);
+ if (mHostNames.Index(name) == wxNOT_FOUND) {
+ mHostNames.Add(name);
+ mHostLabels.Add(name);
+ }
+ }
}
// Channel counts, mono, stereo etc...
------------------------------------------------------------------------------
This SF.net email is sponsored by:
High Quality Requirements in a Collaborative Environment.
Download a free trial of Rational Requirements Composer Now!
http://p.sf.net/sfu/www-ibm-com
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
