Update of /cvsroot/audacity/audacity-src/src/export
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv17876/src/export
Modified Files:
Export.cpp Export.h ExportCL.cpp ExportFLAC.cpp ExportMP2.cpp
ExportMP3.cpp ExportOGG.cpp ExportPCM.cpp
Added Files:
ExportFFmpeg.cpp ExportFFmpeg.h
Log Message:
FFmpeg exporter.
--- NEW FILE: ExportFFmpeg.cpp ---
/**********************************************************************
Audacity: A Digital Audio Editor
ExportFFmpeg.cpp
LRN
**********************************************************************/
#include <wx/choice.h>
#include <wx/intl.h>
#include <wx/timer.h>
#include <wx/msgdlg.h>
#include <wx/progdlg.h>
#include <wx/string.h>
#include <wx/textctrl.h>
#include <wx/window.h>
[...1636 lines suppressed...]
//----------------------------------------------------------------------------
// Constructor
//----------------------------------------------------------------------------
ExportPlugin *New_ExportFFmpeg()
{
return new ExportFFmpeg();
}
#endif
// Indentation settings for Vim and Emacs and unique identifier for Arch, a
// version control system. Please do not modify past this point.
//
// Local Variables:
// c-basic-offset: 3
// indent-tabs-mode: nil
// End:
//
// vim: et sts=3 sw=3
// arch-tag: c1f32472-520f-4864-8086-3dba0d593e84
Index: Export.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/export/Export.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Export.h 8 Jun 2008 16:29:39 -0000 1.15
+++ Export.h 22 Jun 2008 18:35:18 -0000 1.16
@@ -88,7 +88,8 @@
double t0,
double t1,
MixerSpec *mixerSpec = NULL,
- Tags *metadata = NULL);
+ Tags *metadata = NULL,
+ int subformat = 0);
virtual bool DoExport(AudacityProject *project,
int channels,
@@ -96,7 +97,8 @@
bool selectedOnly,
double t0,
double t1,
- MixerSpec *mixerSpec);
+ MixerSpec *mixerSpec,
+ int subformat);
private:
Index: Export.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/export/Export.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- Export.cpp 14 Jun 2008 11:10:47 -0000 1.71
+++ Export.cpp 22 Jun 2008 18:35:18 -0000 1.72
@@ -54,6 +54,7 @@
#include "ExportFLAC.h"
#include "ExportCL.h"
#include "ExportMP2.h"
+#include "ExportFFmpeg.h"
#include "sndfile.h"
@@ -229,13 +230,14 @@
double t0,
double t1,
MixerSpec *mixerSpec,
- Tags *metadata)
+ Tags *metadata,
+ int subformat)
{
if (project == NULL) {
project = GetActiveProject();
}
- return DoExport(project, channels, fName, selectedOnly, t0, t1, mixerSpec);
+ return DoExport(project, channels, fName, selectedOnly, t0, t1, mixerSpec,
subformat);
}
bool ExportPlugin::DoExport(AudacityProject *project,
@@ -244,7 +246,8 @@
bool selectedOnly,
double t0,
double t1,
- MixerSpec *mixerSpec)
+ MixerSpec *mixerSpec,
+ int subformat)
{
return false;
}
@@ -276,6 +279,10 @@
// Command line export not available on Windows and Mac platforms
RegisterPlugin(New_ExportCL());
+
+#if defined(USE_FFMPEG)
+ RegisterPlugin(New_ExportFFmpeg());
+#endif
}
Exporter::~Exporter()
@@ -475,7 +482,7 @@
wxString maskString;
wxString defaultFormat = gPrefs->Read(wxT("/Export/Format"),
- wxT("WAV"));
+ wxT("WAV"));
mFilterIndex = 0;
@@ -728,7 +735,9 @@
mSelectedOnly,
mT0,
mT1,
- mMixerSpec);
+ mMixerSpec,
+ NULL,
+ mSubFormat);
if (mActualName != mFilename) {
// Remove backup
Index: ExportOGG.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/export/ExportOGG.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- ExportOGG.cpp 8 Jun 2008 16:29:40 -0000 1.40
+++ ExportOGG.cpp 22 Jun 2008 18:35:20 -0000 1.41
@@ -138,7 +138,8 @@
double t0,
double t1,
MixerSpec *mixerSpec = NULL,
- Tags *metadata = NULL);
+ Tags *metadata = NULL,
+ int subformat = 0);
private:
@@ -168,7 +169,8 @@
double t0,
double t1,
MixerSpec *mixerSpec,
- Tags *metadata)
+ Tags *metadata,
+ int subformat)
{
double rate = project->GetRate();
TrackList *tracks = project->GetTracks();
Index: ExportMP3.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/export/ExportMP3.cpp,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- ExportMP3.cpp 8 Jun 2008 16:29:40 -0000 1.87
+++ ExportMP3.cpp 22 Jun 2008 18:35:19 -0000 1.88
@@ -1628,7 +1628,8 @@
double t0,
double t1,
MixerSpec *mixerSpec = NULL,
- Tags *metadata = NULL);
+ Tags *metadata = NULL,
+ int subformat = 0);
private:
@@ -1663,7 +1664,8 @@
double t0,
double t1,
MixerSpec *mixerSpec,
- Tags *metadata)
+ Tags *metadata,
+ int subformat)
{
int rate = lrint(project->GetRate());
wxWindow *parent = project;
--- NEW FILE: ExportFFmpeg.h ---
/**********************************************************************
Audacity: A Digital Audio Editor
ExportFFmpeg.h
LRN
**********************************************************************/
#ifndef __AUDACITY_EXPORTFFMPEG__
#define __AUDACITY_EXPORTFFMPEG__
class ExportPlugin;
//----------------------------------------------------------------------------
// Constructor
//----------------------------------------------------------------------------
ExportPlugin *New_ExportFFmpeg();
#endif
// Indentation settings for Vim and Emacs and unique identifier for Arch, a
// version control system. Please do not modify past this point.
//
// Local Variables:
// c-basic-offset: 3
// indent-tabs-mode: nil
// End:
//
// vim: et sts=3 sw=3
// arch-tag: daa509db-cfa8-4327-9fd4-b572b3dd814a
Index: ExportMP2.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/export/ExportMP2.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- ExportMP2.cpp 8 Jun 2008 16:29:40 -0000 1.18
+++ ExportMP2.cpp 22 Jun 2008 18:35:19 -0000 1.19
@@ -182,7 +182,8 @@
double t0,
double t1,
MixerSpec *mixerSpec = NULL,
- Tags *metadata = NULL);
+ Tags *metadata = NULL,
+ int subformat = 0);
private:
@@ -208,7 +209,8 @@
bool ExportMP2::Export(AudacityProject *project,
int channels, wxString fName,
- bool selectionOnly, double t0, double t1, MixerSpec *mixerSpec,
Tags *metadata)
+ bool selectionOnly, double t0, double t1, MixerSpec *mixerSpec,
Tags *metadata,
+ int subformat)
{
bool stereo = (channels == 2);
long bitrate = gPrefs->Read(wxT("/FileFormats/MP2Bitrate"), 160);
Index: ExportPCM.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/export/ExportPCM.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- ExportPCM.cpp 22 Jun 2008 17:35:30 -0000 1.46
+++ ExportPCM.cpp 22 Jun 2008 18:35:20 -0000 1.47
@@ -317,7 +317,8 @@
double t0,
double t1,
MixerSpec *mixerSpec = NULL,
- Tags *metadata = NULL);
+ Tags *metadata = NULL,
+ int subformat = 0);
private:
@@ -376,7 +377,8 @@
double t0,
double t1,
MixerSpec *mixerSpec,
- Tags *metadata)
+ Tags *metadata,
+ int subformat)
{
double rate = project->GetRate();
TrackList *tracks = project->GetTracks();
Index: ExportFLAC.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/export/ExportFLAC.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- ExportFLAC.cpp 8 Jun 2008 16:29:40 -0000 1.23
+++ ExportFLAC.cpp 22 Jun 2008 18:35:19 -0000 1.24
@@ -187,7 +187,8 @@
double t0,
double t1,
MixerSpec *mixerSpec = NULL,
- Tags *metadata = NULL);
+ Tags *metadata = NULL,
+ int subformat = 0);
private:
@@ -221,7 +222,8 @@
double t0,
double t1,
MixerSpec *mixerSpec,
- Tags *metadata)
+ Tags *metadata,
+ int subformat)
{
double rate = project->GetRate();
TrackList *tracks = project->GetTracks();
Index: ExportCL.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/export/ExportCL.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- ExportCL.cpp 21 Jun 2008 11:48:55 -0000 1.26
+++ ExportCL.cpp 22 Jun 2008 18:35:19 -0000 1.27
@@ -207,7 +207,8 @@
double t0,
double t1,
MixerSpec *mixerSpec = NULL,
- Tags *metadata = NULL);
+ Tags *metadata = NULL,
+ int subformat = 0);
};
ExportCL::ExportCL()
@@ -233,7 +234,8 @@
double t0,
double t1,
MixerSpec *mixerSpec,
- Tags *metadata)
+ Tags *metadata,
+ int subformat)
{
ExportCLProcess *p;
wxString output;
@@ -323,7 +325,7 @@
ProgressDialog *progress = new ProgressDialog(_("Export"),
selectionOnly ?
_("Exporting the selected audio using command-line encoder") :
- _("Exporting the entire project using command-line encoder"));
+ _("Exporting the entire project using command-line encoder"));
// Start piping the mixed data to the command
while (!cancelling && p->IsActive() && os->IsOk()) {
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
