1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-05 16:43:52 +01:00

Round 3 retry...helps to add the changed files to the commit

This commit is contained in:
Leland Lucius
2015-07-13 12:36:40 -05:00
parent d1594cdca5
commit 4deccfc980
15 changed files with 588 additions and 761 deletions

View File

@@ -57,13 +57,13 @@ struct CompatibilityEntry
/// AC3 export options dialog
class ExportFFmpegAC3Options : public wxDialog
class ExportFFmpegAC3Options : public wxPanel
{
public:
ExportFFmpegAC3Options(wxWindow *parent);
ExportFFmpegAC3Options(wxWindow *parent, int format);
virtual ~ExportFFmpegAC3Options();
void PopulateOrExchange(ShuttleGui & S);
void OnOK(wxCommandEvent& event);
/// Bit Rates supported by AC3 encoder
static const int iAC3BitRates[];
/// Sample Rates supported by AC3 encoder (must end with zero-element)
@@ -76,35 +76,29 @@ private:
wxArrayInt mBitRateLabels;
wxChoice *mBitRateChoice;
wxButton *mOk;
int mBitRateFromChoice;
DECLARE_EVENT_TABLE()
};
class ExportFFmpegAACOptions : public wxDialog
class ExportFFmpegAACOptions : public wxPanel
{
public:
ExportFFmpegAACOptions(wxWindow *parent);
ExportFFmpegAACOptions(wxWindow *parent, int format);
virtual ~ExportFFmpegAACOptions();
void PopulateOrExchange(ShuttleGui & S);
void OnOK(wxCommandEvent& event);
private:
wxSpinCtrl *mQualitySpin;
wxButton *mOk;
DECLARE_EVENT_TABLE()
};
class ExportFFmpegAMRNBOptions : public wxDialog
class ExportFFmpegAMRNBOptions : public wxPanel
{
public:
ExportFFmpegAMRNBOptions(wxWindow *parent);
ExportFFmpegAMRNBOptions(wxWindow *parent, int format);
virtual ~ExportFFmpegAMRNBOptions();
void PopulateOrExchange(ShuttleGui & S);
void OnOK(wxCommandEvent& event);
static int iAMRNBBitRate[];
@@ -114,19 +108,16 @@ private:
wxArrayInt mBitRateLabels;
wxChoice *mBitRateChoice;
wxButton *mOk;
int mBitRateFromChoice;
DECLARE_EVENT_TABLE()
};
class ExportFFmpegWMAOptions : public wxDialog
class ExportFFmpegWMAOptions : public wxPanel
{
public:
ExportFFmpegWMAOptions(wxWindow *parent);
ExportFFmpegWMAOptions(wxWindow *parent, int format);
~ExportFFmpegWMAOptions();
void PopulateOrExchange(ShuttleGui & S);
void OnOK(wxCommandEvent& event);
static const int iWMASampleRates[];
static const int iWMABitRate[];
@@ -137,10 +128,7 @@ private:
wxArrayInt mBitRateLabels;
wxChoice *mBitRateChoice;
wxButton *mOk;
int mBitRateFromChoice;
DECLARE_EVENT_TABLE()
};
/// Entry for the Applicability table