Update of /cvsroot/audacity/audacity-src/src/import
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv31924
Modified Files:
ImportOGG.cpp ImportFLAC.cpp ImportPCM.cpp ImportMP3.cpp
ImportQT.cpp ImportLOF.cpp
Log Message:
This one definitely got away from me...all of this just to generate a filter
list!
Index: ImportPCM.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/import/ImportPCM.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- ImportPCM.cpp 14 Apr 2007 06:58:42 -0000 1.30
+++ ImportPCM.cpp 27 May 2007 23:10:57 -0000 1.31
@@ -43,6 +43,8 @@
#include "../WaveTrack.h"
#include "ImportPlugin.h"
+#define DESC _("Uncompressed PCM Audio Files")
+
class PCMImportPlugin : public ImportPlugin
{
public:
@@ -88,7 +90,7 @@
wxString PCMImportPlugin::GetPluginFormatDescription()
{
- return wxT("Uncompressed PCM Audio Files");
+ return DESC;
}
ImportFileHandle *PCMImportPlugin::Open(wxString filename)
Index: ImportFLAC.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/import/ImportFLAC.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- ImportFLAC.cpp 12 Jan 2007 19:44:10 -0000 1.18
+++ ImportFLAC.cpp 27 May 2007 23:10:57 -0000 1.19
@@ -28,6 +28,8 @@
#define FLAC_HEADER "fLaC"
+#define DESC _("FLAC files")
+
static const wxChar *exts[] =
{
wxT("flac"),
@@ -40,7 +42,7 @@
UnusableImportPluginList *unusableImportPluginList)
{
UnusableImportPlugin* flacIsUnsupported =
- new UnusableImportPlugin(wxT("FLAC"), wxArrayString(2, exts));
+ new UnusableImportPlugin(DESC, wxArrayString(WXSIZEOF(exts), exts));
unusableImportPluginList->Append(flacIsUnsupported);
}
@@ -93,7 +95,7 @@
{
public:
FLACImportPlugin():
- ImportPlugin(wxArrayString(2, exts))
+ ImportPlugin(wxArrayString(WXSIZEOF(exts), exts))
{
}
@@ -222,7 +224,7 @@
wxString FLACImportPlugin::GetPluginFormatDescription()
{
- return wxT("FLAC");
+ return DESC;
}
@@ -304,7 +306,7 @@
wxString FLACImportFileHandle::GetFileDescription()
{
- return wxT("FLAC");
+ return DESC;
}
Index: ImportQT.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/import/ImportQT.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ImportQT.cpp 27 May 2007 21:10:09 -0000 1.4
+++ ImportQT.cpp 27 May 2007 23:10:57 -0000 1.5
@@ -15,6 +15,9 @@
#include "../Audacity.h"
#include "ImportQT.h"
#include "ImportPlugin.h"
+#include "wx/intl.h"
+
+#define DESC _("QuickTime files")
static const wxChar *exts[] =
{
@@ -29,8 +32,7 @@
UnusableImportPluginList *unusableImportPluginList)
{
UnusableImportPlugin* qtIsUnsupported =
- new UnusableImportPlugin(wxT("QuickTime"),
- wxArrayString(WXSIZEOF(exts), exts));
+ new UnusableImportPlugin(DESC, wxArrayString(WXSIZEOF(exts), exts));
unusableImportPluginList->Append(qtIsUnsupported);
}
@@ -65,7 +67,6 @@
#include "../WaveTrack.h"
-
// Prototype for the callback
static pascal Boolean
SoundConverterFillBufferCallback(SoundComponentDataPtr *outData, void
*userData);
@@ -137,7 +138,7 @@
wxString QTImportPlugin::GetPluginFormatDescription()
{
- return wxT("QuickTime");
+ return DESC;
}
ImportFileHandle *QTImportPlugin::Open(wxString Filename)
@@ -202,7 +203,7 @@
wxString QTImportFileHandle::GetFileDescription()
{
- return wxT("");
+ return DESC;
}
int QTImportFileHandle::GetFileUncompressedBytes()
Index: ImportLOF.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/import/ImportLOF.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ImportLOF.cpp 16 Apr 2007 22:51:32 -0000 1.14
+++ ImportLOF.cpp 27 May 2007 23:10:57 -0000 1.15
@@ -89,6 +89,8 @@
#define BINARY_FILE_CHECK_BUFFER_SIZE 1024
+#define DESC _("List of Files in basic text format")
+
static const wxChar *exts[] =
{
wxT("lof")
@@ -98,7 +100,7 @@
{
public:
LOFImportPlugin():
- ImportPlugin(wxArrayString(1, exts))
+ ImportPlugin(wxArrayString(WXSIZEOF(exts), exts))
{
}
@@ -169,7 +171,7 @@
wxString LOFImportPlugin::GetPluginFormatDescription()
{
- return _("List of Files in basic text format");
+ return DESC;
}
ImportFileHandle *LOFImportPlugin::Open(wxString filename)
@@ -219,7 +221,7 @@
wxString LOFImportFileHandle::GetFileDescription()
{
- return _("List of Files in basic text format");
+ return DESC;
}
int LOFImportFileHandle::GetFileUncompressedBytes()
Index: ImportOGG.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/import/ImportOGG.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- ImportOGG.cpp 23 Sep 2006 02:26:55 -0000 1.26
+++ ImportOGG.cpp 27 May 2007 23:10:57 -0000 1.27
@@ -31,6 +31,8 @@
#include "ImportOGG.h"
#include "../Internat.h"
+#define DESC _("Ogg Vorbis files")
+
static const wxChar *exts[] =
{
wxT("ogg")
@@ -44,7 +46,7 @@
UnusableImportPluginList *unusableImportPluginList)
{
UnusableImportPlugin* oggIsUnsupported =
- new UnusableImportPlugin(wxT("Ogg Vorbis"), wxArrayString(1, exts));
+ new UnusableImportPlugin(DESC, wxArrayString(WXSIZEOF(exts), exts));
unusableImportPluginList->Append(oggIsUnsupported);
}
@@ -69,7 +71,7 @@
{
public:
OggImportPlugin():
- ImportPlugin(wxArrayString(1, exts))
+ ImportPlugin(wxArrayString(WXSIZEOF(exts), exts))
{
}
@@ -113,7 +115,7 @@
wxString OggImportPlugin::GetPluginFormatDescription()
{
- return wxT("Ogg Vorbis");
+ return DESC;
}
ImportFileHandle *OggImportPlugin::Open(wxString filename)
@@ -170,7 +172,7 @@
wxString OggImportFileHandle::GetFileDescription()
{
- return wxT("Ogg Vorbis");
+ return DESC;
}
int OggImportFileHandle::GetFileUncompressedBytes()
Index: ImportMP3.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/import/ImportMP3.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- ImportMP3.cpp 28 Apr 2007 08:51:20 -0000 1.31
+++ ImportMP3.cpp 27 May 2007 23:10:57 -0000 1.32
@@ -48,7 +48,7 @@
UnusableImportPluginList *unusableImportPluginList)
{
UnusableImportPlugin* mp3IsUnsupported =
- new UnusableImportPlugin(wxT("MP3"), wxArrayString(4, exts));
+ new UnusableImportPlugin(DESC, wxArrayString(wxSIZEOF(exts), exts));
unusableImportPluginList->Append(mp3IsUnsupported);
}
@@ -74,6 +74,8 @@
#include "../WaveTrack.h"
+#define DESC _("MP3 files")
+
#define INPUT_BUFFER_SIZE 65535
#define PROGRESS_SCALING_FACTOR 100000
@@ -96,7 +98,7 @@
{
public:
MP3ImportPlugin():
- ImportPlugin(wxArrayString(4, exts))
+ ImportPlugin(wxArrayString(WXSIZEOF(exts), exts))
{
}
@@ -156,7 +158,7 @@
wxString MP3ImportPlugin::GetPluginFormatDescription()
{
- return wxT("MP3");
+ return DESC;
}
ImportFileHandle *MP3ImportPlugin::Open(wxString Filename)
@@ -184,7 +186,7 @@
wxString MP3ImportFileHandle::GetFileDescription()
{
- return wxT("MP3");
+ return DESC;
}
int MP3ImportFileHandle::GetFileUncompressedBytes()
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
