mirror of
https://github.com/cookiengineer/audacity
synced 2025-08-10 09:01:13 +02:00
cleanup of exporters based on patch by Campbell Barton: Include headers into classes, remove tail comments, correct the factory method comments
This commit is contained in:
parent
31c6b74f99
commit
1fd52b3796
@ -18,8 +18,10 @@
|
||||
#include <wx/log.h>
|
||||
#include <wx/process.h>
|
||||
#include <wx/textctrl.h>
|
||||
#include <FileDialog.h>
|
||||
|
||||
#include "Export.h"
|
||||
#include "ExportCL.h"
|
||||
|
||||
#include "../Project.h"
|
||||
#include "../Mix.h"
|
||||
@ -28,7 +30,7 @@
|
||||
#include "../float_cast.h"
|
||||
#include "../widgets/FileHistory.h"
|
||||
|
||||
#include <FileDialog.h>
|
||||
|
||||
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
@ -529,22 +531,8 @@ bool ExportCL::DisplayOptions(wxWindow *parent, int format)
|
||||
return true;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
// Constructor
|
||||
//----------------------------------------------------------------------------
|
||||
ExportPlugin *New_ExportCL()
|
||||
{
|
||||
return new ExportCL();
|
||||
}
|
||||
|
||||
// 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: c1578868-82c5-4f4a-b61b-8d82536a3141
|
||||
|
||||
|
@ -11,23 +11,13 @@
|
||||
#ifndef __AUDACITY_EXPORTCL__
|
||||
#define __AUDACITY_EXPORTCL__
|
||||
|
||||
// forward declaration of the ExportPlugin class from Export.h
|
||||
class ExportPlugin;
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
// Constructor
|
||||
//----------------------------------------------------------------------------
|
||||
/** The only part of this class which is publically accessible is the
|
||||
* factory method New_ExportCL() which creates a new ExportCL object and
|
||||
* returns a pointer to it. The rest of the class declaration is in ExportCL.cpp
|
||||
*/
|
||||
ExportPlugin *New_ExportCL();
|
||||
|
||||
#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: 67f53175-a9e1-49bd-93e8-fde76820ec90
|
||||
|
||||
|
@ -45,6 +45,7 @@ function.
|
||||
#include "../WaveTrack.h"
|
||||
|
||||
#include "Export.h"
|
||||
#include "ExportFFmpeg.h"
|
||||
|
||||
#include "ExportFFmpegDialogs.h"
|
||||
|
||||
@ -926,22 +927,10 @@ bool ExportFFmpeg::DisplayOptions(wxWindow *parent, int format)
|
||||
return false;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
// 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
|
||||
|
||||
|
@ -13,21 +13,10 @@ LRN
|
||||
|
||||
class ExportPlugin;
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
// Constructor
|
||||
//----------------------------------------------------------------------------
|
||||
/** The only part of this class which is publically accessible is the
|
||||
* factory method New_ExportFFmpeg() which creates a new ExportFFmpeg object and
|
||||
* returns a pointer to it. The rest of the class declaration is in ExportFFmpeg.cpp
|
||||
*/
|
||||
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
|
||||
|
||||
|
@ -23,6 +23,7 @@ and libvorbis examples, Monty <monty@xiph.org>
|
||||
#ifdef USE_LIBFLAC
|
||||
|
||||
#include "Export.h"
|
||||
#include "ExportFLAC.h"
|
||||
|
||||
#include <wx/progdlg.h>
|
||||
#include <wx/ffile.h>
|
||||
@ -400,9 +401,6 @@ bool ExportFLAC::GetMetadata(AudacityProject *project, Tags *tags)
|
||||
return true;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
// Constructor
|
||||
//----------------------------------------------------------------------------
|
||||
ExportPlugin *New_ExportFLAC()
|
||||
{
|
||||
return new ExportFLAC();
|
||||
@ -410,14 +408,3 @@ ExportPlugin *New_ExportFLAC()
|
||||
|
||||
#endif // USE_LIBFLAC
|
||||
|
||||
// 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
|
||||
|
||||
|
||||
|
@ -13,20 +13,11 @@
|
||||
|
||||
class ExportPlugin;
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
// Constructor
|
||||
//----------------------------------------------------------------------------
|
||||
/* The only part of this class which is publically accessible is the
|
||||
* factory method New_ExportFLAC() which creates a new ExportFLAC object and
|
||||
* returns a pointer to it. The rest of the class declaration is in ExportFLAC.cpp
|
||||
*/
|
||||
ExportPlugin *New_ExportFLAC();
|
||||
|
||||
#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
|
||||
|
||||
|
@ -47,6 +47,7 @@
|
||||
#include <wx/intl.h>
|
||||
|
||||
#include "Export.h"
|
||||
#include "ExportMP2.h"
|
||||
#include "../FileIO.h"
|
||||
#include "../Internat.h"
|
||||
#include "../Mix.h"
|
||||
@ -444,9 +445,6 @@ void ExportMP2::AddFrame(struct id3_tag *tp, const wxString & n, const wxString
|
||||
}
|
||||
#endif
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
// Constructor
|
||||
//----------------------------------------------------------------------------
|
||||
ExportPlugin *New_ExportMP2()
|
||||
{
|
||||
return new ExportMP2();
|
||||
@ -454,14 +452,3 @@ ExportPlugin *New_ExportMP2()
|
||||
|
||||
#endif // #ifdef USE_LIBTWOLAME
|
||||
|
||||
// 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: c6af56b1-37fa-4d95-b982-0a24b3a49c00
|
||||
|
||||
|
@ -14,21 +14,11 @@
|
||||
|
||||
class ExportPlugin;
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
// Constructor
|
||||
//----------------------------------------------------------------------------
|
||||
/** The only part of this class which is publically accessible is the
|
||||
* factory method New_ExportMP2() which creates a new ExportMP2 object and
|
||||
* returns a pointer to it. The rest of the class declaration is in ExportMP2.cpp
|
||||
*/
|
||||
ExportPlugin *New_ExportMP2();
|
||||
|
||||
#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: 697b9941-3e7e-44c1-929e-19d34ed70151
|
||||
|
||||
|
@ -89,6 +89,7 @@
|
||||
#include "FileDialog.h"
|
||||
|
||||
#include "Export.h"
|
||||
#include "ExportMP3.h"
|
||||
|
||||
#if defined(DISABLE_DYNAMIC_LOADING_LAME)
|
||||
#include <lame/lame.h>
|
||||
@ -2060,9 +2061,6 @@ void ExportMP3::AddFrame(struct id3_tag *tp, const wxString & n, const wxString
|
||||
}
|
||||
#endif
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
// Constructor
|
||||
//----------------------------------------------------------------------------
|
||||
ExportPlugin *New_ExportMP3()
|
||||
{
|
||||
return new ExportMP3();
|
||||
@ -2092,13 +2090,3 @@ wxString GetMP3Version(wxWindow *parent, bool prompt)
|
||||
return versionString;
|
||||
}
|
||||
|
||||
// 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: c6af56b1-37fa-4d95-b982-0a24b3a49c00
|
||||
|
@ -16,10 +16,9 @@
|
||||
class ExportPlugin;
|
||||
class wxString;
|
||||
class wxWindow;
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
// Constructor
|
||||
//----------------------------------------------------------------------------
|
||||
/** Factory method New_ExportMP3() which creates a new ExportMP3 object and
|
||||
* returns a pointer to it. The rest of the class declaration is in ExportMP3.cpp
|
||||
*/
|
||||
ExportPlugin *New_ExportMP3();
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
@ -29,14 +28,3 @@ wxString GetMP3Version(wxWindow *parent, bool prompt);
|
||||
|
||||
#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: 697b9941-3e7e-44c1-929e-19d34ed70151
|
||||
|
||||
|
@ -20,6 +20,7 @@
|
||||
#ifdef USE_LIBVORBIS
|
||||
|
||||
#include "Export.h"
|
||||
#include "ExportOGG.h"
|
||||
|
||||
#include <wx/log.h>
|
||||
#include <wx/msgdlg.h>
|
||||
@ -362,9 +363,6 @@ bool ExportOGG::FillComment(AudacityProject *project, vorbis_comment *comment, T
|
||||
return true;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
// Constructor
|
||||
//----------------------------------------------------------------------------
|
||||
ExportPlugin *New_ExportOGG()
|
||||
{
|
||||
return new ExportOGG();
|
||||
@ -372,15 +370,3 @@ ExportPlugin *New_ExportOGG()
|
||||
|
||||
#endif // USE_LIBVORBIS
|
||||
|
||||
|
||||
// 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: 33184ece-e482-44d9-9ff3-b4a11b41112b
|
||||
|
||||
|
@ -13,22 +13,11 @@
|
||||
|
||||
class ExportPlugin;
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
// Constructor
|
||||
//----------------------------------------------------------------------------
|
||||
/** The only part of this class which is publically accessible is the
|
||||
* factory method New_ExportOGG() which creates a new ExportOGG object and
|
||||
* returns a pointer to it. The rest of the class declaration is in ExportOGG.cpp
|
||||
*/
|
||||
ExportPlugin *New_ExportOGG();
|
||||
|
||||
#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: 8fe98761-9ab9-4e14-af9a-3ed642cb429e
|
||||
|
||||
|
@ -36,6 +36,7 @@
|
||||
#include "../ondemand/ODManager.h"
|
||||
|
||||
#include "Export.h"
|
||||
#include "ExportPCM.h"
|
||||
|
||||
#ifdef USE_LIBID3TAG
|
||||
#include <id3tag.h>
|
||||
@ -792,21 +793,7 @@ wxString ExportPCM::GetExtension(int index)
|
||||
}
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
// Constructor
|
||||
//----------------------------------------------------------------------------
|
||||
ExportPlugin *New_ExportPCM()
|
||||
{
|
||||
return new ExportPCM();
|
||||
}
|
||||
|
||||
// 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
|
||||
|
@ -13,21 +13,11 @@
|
||||
|
||||
class ExportPlugin;
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
// Constructor
|
||||
//----------------------------------------------------------------------------
|
||||
/** The only part of this class which is publically accessible is the
|
||||
* factory method New_ExportPCM() which creates a new ExportPCM object and
|
||||
* returns a pointer to it. The rest of the class declaration is in ExportPCM.cpp
|
||||
*/
|
||||
ExportPlugin *New_ExportPCM();
|
||||
|
||||
#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
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user