Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-26 07:13:49 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into wx3

Browse Source
This commit is contained in:
Leland Lucius
2015-07-19 18:00:02 -05:00
parent 8bf6668ff3 90d03f8351
commit 3fe146f306
127 changed files with 2284 additions and 1702 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/prefs/BatchPrefs.h
View File

@@ -16,10 +16,10 @@
#include <wx/window.h>
#include "../ShuttleGui.h"
#include "PrefsPanel.h"
class ShuttleGui;
class BatchPrefs : public PrefsPanel
{
public:

6
src/prefs/DevicePrefs.h
View File

@@ -19,11 +19,11 @@
#include <wx/window.h>
#include <wx/dynarray.h>
#include "../ShuttleGui.h"
#include "PrefsPanel.h"
class DevicePrefs:public PrefsPanel
class ShuttleGui;
class DevicePrefs :public PrefsPanel
{
public:
DevicePrefs(wxWindow * parent);

6
src/prefs/DirectoriesPrefs.h
View File

@@ -14,11 +14,11 @@
#include <wx/stattext.h>
#include <wx/textctrl.h>
#include "../ShuttleGui.h"
#include "PrefsPanel.h"
class DirectoriesPrefs:public PrefsPanel
class ShuttleGui;
class DirectoriesPrefs :public PrefsPanel
{
public:
DirectoriesPrefs(wxWindow * parent);

6
src/prefs/EffectsPrefs.h
View File

@@ -18,11 +18,11 @@
#include <wx/arrstr.h>
#include <wx/window.h>
#include "../ShuttleGui.h"
#include "PrefsPanel.h"
class EffectsPrefs:public PrefsPanel
class ShuttleGui;
class EffectsPrefs :public PrefsPanel
{
public:
EffectsPrefs(wxWindow * parent);

4
src/prefs/ExtImportPrefs.h
View File

@@ -16,15 +16,15 @@
#include <wx/window.h>
#include "../widgets/Grid.h"
#include "../ShuttleGui.h"
#include "PrefsPanel.h"
#include "../import/Import.h"
#include "../import/ImportPlugin.h"
class wxButton;
class wxListEvent;
class ExtImportPrefs;
class ShuttleGui;
class ExtImportPrefsDropTarget: public wxDropTarget
{

6
src/prefs/GUIPrefs.h
View File

@@ -18,11 +18,11 @@
#include <wx/arrstr.h>
#include <wx/window.h>
#include "../ShuttleGui.h"
#include "PrefsPanel.h"
class GUIPrefs:public PrefsPanel
class ShuttleGui;
class GUIPrefs :public PrefsPanel
{
public:
GUIPrefs(wxWindow * parent);

6
src/prefs/ImportExportPrefs.h
View File

@@ -17,11 +17,11 @@
#include <wx/window.h>
#include "../ShuttleGui.h"
#include "PrefsPanel.h"
class ImportExportPrefs:public PrefsPanel
class ShuttleGui;
class ImportExportPrefs :public PrefsPanel
{
public:
ImportExportPrefs(wxWindow * parent);

6
src/prefs/KeyConfigPrefs.h
View File

@@ -12,6 +12,8 @@
#ifndef __AUDACITY_KEY_CONFIG_PREFS__
#define __AUDACITY_KEY_CONFIG_PREFS__
class ShuttleGui;
#if defined(EXPERIMENTAL_KEY_VIEW)
#include <wx/defs.h>
@@ -23,13 +25,12 @@
#include <wx/textctrl.h>
#include <wx/timer.h>
#include "../ShuttleGui.h"
#include "../commands/CommandManager.h"
#include "../widgets/KeyView.h"
#include "PrefsPanel.h"
class KeyConfigPrefs:public PrefsPanel
class KeyConfigPrefs :public PrefsPanel
{
public:
KeyConfigPrefs(wxWindow * parent);
@@ -93,7 +94,6 @@ private:
#include <wx/textctrl.h>
#include <wx/string.h>
#include "../ShuttleGui.h"
#include "../commands/CommandManager.h"
#include "PrefsPanel.h"

6
src/prefs/LibraryPrefs.h
View File

@@ -18,11 +18,11 @@
#include <wx/stattext.h>
#include <wx/window.h>
#include "../ShuttleGui.h"
#include "PrefsPanel.h"
class LibraryPrefs:public PrefsPanel
class ShuttleGui;
class LibraryPrefs :public PrefsPanel
{
public:
LibraryPrefs(wxWindow * parent);

5
src/prefs/MidiIOPrefs.h
View File

@@ -10,6 +10,9 @@
**********************************************************************/
#include "../Experimental.h"
class ShuttleGui;
#ifdef EXPERIMENTAL_MIDI_OUT
#ifndef __AUDACITY_MIDI_IO_PREFS__
@@ -21,8 +24,6 @@
#include <wx/string.h>
#include <wx/window.h>
#include "../ShuttleGui.h"
#include "PrefsPanel.h"
class MidiIOPrefs:public PrefsPanel

4
src/prefs/ModulePrefs.h
View File

@@ -17,11 +17,11 @@
#include <wx/window.h>
#include "../ShuttleGui.h"
#include "PrefsPanel.h"
class ShuttleGui;
enum {
kModuleDisabled = 0,
kModuleEnabled = 1,

6
src/prefs/MousePrefs.h
View File

@@ -15,11 +15,11 @@
#include <wx/string.h>
#include <wx/window.h>
#include "../ShuttleGui.h"
#include "PrefsPanel.h"
class MousePrefs:public PrefsPanel
class ShuttleGui;
class MousePrefs :public PrefsPanel
{
public:
MousePrefs(wxWindow * parent);

6
src/prefs/PlaybackPrefs.h
View File

@@ -16,11 +16,11 @@
#include <wx/window.h>
#include "../ShuttleGui.h"
#include "PrefsPanel.h"
class PlaybackPrefs:public PrefsPanel
class ShuttleGui;
class PlaybackPrefs :public PrefsPanel
{
public:
PlaybackPrefs(wxWindow * parent);

1
src/prefs/PrefsDialog.cpp
View File

@@ -39,6 +39,7 @@
#include "../Experimental.h"
#include "../Project.h"
#include "../Prefs.h"
#include "../ShuttleGui.h"
#include "PrefsDialog.h"
#include "PrefsPanel.h"

6
src/prefs/ProjectsPrefs.h
View File

@@ -17,11 +17,11 @@
#include <wx/window.h>
#include "../ShuttleGui.h"
#include "PrefsPanel.h"
class ProjectsPrefs:public PrefsPanel
class ShuttleGui;
class ProjectsPrefs :public PrefsPanel
{
public:
ProjectsPrefs(wxWindow * parent);

6
src/prefs/QualityPrefs.h
View File

@@ -19,11 +19,11 @@
#include <wx/dynarray.h>
#include <wx/textctrl.h>
#include "../ShuttleGui.h"
#include "PrefsPanel.h"
class QualityPrefs:public PrefsPanel
class ShuttleGui;
class QualityPrefs :public PrefsPanel
{
public:
QualityPrefs(wxWindow * parent);

6
src/prefs/RecordingPrefs.h
View File

@@ -16,11 +16,11 @@
#include <wx/window.h>
#include "../ShuttleGui.h"
#include "PrefsPanel.h"
class RecordingPrefs:public PrefsPanel
class ShuttleGui;
class RecordingPrefs :public PrefsPanel
{
public:
RecordingPrefs(wxWindow * parent);

33
src/prefs/SpectrumPrefs.cpp
View File

@@ -164,35 +164,6 @@ void SpectrumPrefs::PopulateOrExchange(ShuttleGui & S)
}
S.EndStatic();
#ifdef EXPERIMENTAL_FFT_SKIP_POINTS
// Search and replace with _ if you want translation.
#define TRANSLATABLE( x ) wxT(x)
wxArrayString wskipn;
wxArrayInt wskipv;
for (size_t i = 0; i < 7; i++) {
wskipn.Add(wxString::Format(wxT("%d"), (1 << i) - 1));
wskipv.Add((1 << i) - 1);
}
/* /////i18n-hint: (noun) Experimental. Don't know what it does. Don't translate.*/
S.StartStatic(TRANSLATABLE("FFT Skip Points"));
{
S.StartMultiColumn(2);
{
/* /////i18n-hint: (noun) here the user chooses points to skip.*/
S.TieChoice(TRANSLATABLE("Skip Points:"),
wxT("/Spectrum/FFTSkipPoints"),
0,
wskipn,
wskipv);
S.SetSizeHints(wskipn);
}
S.EndMultiColumn();
}
S.EndStatic();
#endif //EXPERIMENTAL_FFT_SKIP_POINTS
S.StartStatic(_("Display"));
{
S.StartTwoColumn();
@@ -430,10 +401,6 @@ void SpectrogramSettings::UpdatePrefs()
isGrayscale = (gPrefs->Read(wxT("/Spectrum/Grayscale"), 0L) != 0);
#ifdef EXPERIMENTAL_FFT_SKIP_POINTS
fftSkipPoints = gPrefs->Read(wxT("/Spectrum/FFTSkipPoints"), 0L);
#endif
#ifdef EXPERIMENTAL_FFT_Y_GRID
fftYGrid = (gPrefs->Read(wxT("/Spectrum/FFTYGrid"), 0L) != 0);
#endif //EXPERIMENTAL_FFT_Y_GRID

7
src/prefs/SpectrumPrefs.h
View File

@@ -26,11 +26,12 @@
#include <wx/window.h>
#include "../Experimental.h"
#include "../ShuttleGui.h"
#include "PrefsPanel.h"
class wxTextCtrl;
struct FFTParam;
class ShuttleGui;
class SpectrumPrefs:public PrefsPanel
{
@@ -103,10 +104,6 @@ public:
bool isGrayscale;
#ifdef EXPERIMENTAL_FFT_SKIP_POINTS
int fftSkipPoints;
#endif
#ifdef EXPERIMENTAL_FFT_Y_GRID
bool fftYGrid;
#endif //EXPERIMENTAL_FFT_Y_GRID

6
src/prefs/ThemePrefs.h
View File

@@ -17,11 +17,11 @@
#include <wx/defs.h>
#include <wx/window.h>
#include "../ShuttleGui.h"
#include "PrefsPanel.h"
class ThemePrefs:public PrefsPanel
class ShuttleGui;
class ThemePrefs :public PrefsPanel
{
public:
ThemePrefs(wxWindow * parent);

24
src/prefs/TracksPrefs.cpp
View File

@@ -56,23 +56,29 @@ void TracksPrefs::Populate()
mSoloChoices.Add(_("None"));
// Keep the same order as in TrackPanel.cpp menu: OnWaveformID, OnWaveformDBID, OnSpectrumID, OnSpectrumLogID,
// OnSpectralSelID, OnSpectralSelLogID, OnPitchID
mViewCodes.Add(0);
mViewCodes.Add(1);
mViewCodes.Add(2);
mViewCodes.Add(3);
mViewCodes.Add(4);
mViewCodes.Add(5);
mViewCodes.Add(6);
// Keep view choices and codes in proper correspondence --
// we don't display them by increasing integer values.
mViewChoices.Add(_("Waveform"));
mViewCodes.Add(int(WaveTrack::WaveformDisplay));
mViewChoices.Add(_("Waveform (dB)"));
mViewCodes.Add(int(WaveTrack::WaveformDBDisplay));
mViewChoices.Add(_("Spectrogram"));
mViewCodes.Add(int(WaveTrack::SpectrumDisplay));
mViewChoices.Add(_("Spectrogram log(f)"));
mViewCodes.Add(int(WaveTrack::SpectrumLogDisplay));
mViewChoices.Add(_("Spectral Selection"));
mViewCodes.Add(int(WaveTrack::SpectralSelectionDisplay));
mViewChoices.Add(_("Spectral Selection log(f)"));
mViewCodes.Add(int(WaveTrack::SpectralSelectionLogDisplay));
mViewChoices.Add(_("Pitch (EAC)"));
mViewCodes.Add(int(WaveTrack::PitchDisplay));
//------------------------- Main section --------------------
// Now construct the GUI itself.

6
src/prefs/TracksPrefs.h
View File

@@ -18,11 +18,11 @@
#include <wx/arrstr.h>
#include <wx/window.h>
#include "../ShuttleGui.h"
#include "PrefsPanel.h"
class TracksPrefs:public PrefsPanel
class ShuttleGui;
class TracksPrefs :public PrefsPanel
{
public:
TracksPrefs(wxWindow * parent);

6
src/prefs/WarningsPrefs.h
View File

@@ -17,11 +17,11 @@
#include <wx/window.h>
#include "../ShuttleGui.h"
#include "PrefsPanel.h"
class WarningsPrefs:public PrefsPanel
class ShuttleGui;
class WarningsPrefs :public PrefsPanel
{
public:
WarningsPrefs(wxWindow * parent);