Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-02-19 17:28:09 +01:00
Code Issues Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

61
src/export/ExportFLAC.cpp
View File

@@ -44,32 +44,20 @@ and libvorbis examples, Monty <monty@xiph.org>
// ExportFLACOptions Class
//----------------------------------------------------------------------------
class ExportFLACOptions : public wxDialog
class ExportFLACOptions : public wxPanel
{
public:
ExportFLACOptions(wxWindow *parent);
ExportFLACOptions(wxWindow *parent, int format);
void PopulateOrExchange(ShuttleGui & S);
void OnOK(wxCommandEvent& event);
private:
DECLARE_EVENT_TABLE()
};
BEGIN_EVENT_TABLE(ExportFLACOptions, wxDialog)
EVT_BUTTON(wxID_OK, ExportFLACOptions::OnOK)
END_EVENT_TABLE()
///
///
ExportFLACOptions::ExportFLACOptions(wxWindow *parent)
: wxDialog(parent, wxID_ANY,
wxString(_("Specify FLAC Options")))
ExportFLACOptions::ExportFLACOptions(wxWindow *parent, int WXUNUSED(format))
: wxPanel(parent, wxID_ANY)
{
SetName(GetTitle());
ShuttleGui S(this, eIsCreatingFromPrefs);
PopulateOrExchange(S);
}
@@ -92,41 +80,22 @@ void ExportFLACOptions::PopulateOrExchange(ShuttleGui & S)
flacBitDepthLabels.Add(wxT("16")); flacBitDepthNames.Add(_("16 bit"));
flacBitDepthLabels.Add(wxT("24")); flacBitDepthNames.Add(_("24 bit"));
S.StartHorizontalLay(wxEXPAND, 0);
S.StartVerticalLay();
{
S.StartStatic(_("FLAC Export Setup"), 0);
S.StartHorizontalLay(wxCENTER);
{
S.StartTwoColumn();
S.StartMultiColumn(2, wxCENTER);
{
S.TieChoice(_("Level:"), wxT("/FileFormats/FLACLevel"),
wxT("5"), flacLevelNames, flacLevelLabels);
S.TieChoice(_("Bit depth:"), wxT("/FileFormats/FLACBitDepth"),
wxT("16"), flacBitDepthNames, flacBitDepthLabels);
}
S.EndTwoColumn();
S.EndMultiColumn();
}
S.EndStatic();
S.EndHorizontalLay();
}
S.EndHorizontalLay();
S.AddStandardButtons();
Layout();
Fit();
SetMinSize(GetSize());
Center();
return;
}
///
///
void ExportFLACOptions::OnOK(wxCommandEvent& WXUNUSED(event))
{
ShuttleGui S(this, eIsSavingToPrefs);
PopulateOrExchange(S);
EndModal(wxID_OK);
S.EndVerticalLay();
return;
}
@@ -178,7 +147,7 @@ public:
// Required
bool DisplayOptions(wxWindow *parent, int format = 0);
wxWindow *OptionsCreate(wxWindow *parent, int format);
int Export(AudacityProject *project,
int channels,
wxString fName,
@@ -364,13 +333,9 @@ int ExportFLAC::Export(AudacityProject *project,
return updateResult;
}
bool ExportFLAC::DisplayOptions(wxWindow *parent, int WXUNUSED(format))
wxWindow *ExportFLAC::OptionsCreate(wxWindow *parent, int format)
{
ExportFLACOptions od(parent);
od.ShowModal();
return true;
return new ExportFLACOptions(parent, format);
}
// LL: There's a bug in libflac++ 1.1.2 that prevents us from using