Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv4708
Modified Files:
Menus.cpp Project.cpp Menus.h
Log Message:
Support new FileDialog and add new export options
Index: Menus.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Menus.h,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- Menus.h 18 Mar 2007 01:31:51 -0000 1.97
+++ Menus.h 6 Apr 2007 10:25:47 -0000 1.98
@@ -18,7 +18,6 @@
void CreateMenusAndCommands();
void CreateRecentFilesMenu(CommandManager *c);
-void ModifyExportMenus();
void ModifyUndoMenus();
void ModifyToolbarMenus();
@@ -125,19 +124,9 @@
void OnCheckDependencies();
-void OnExportMix();
+void OnExport();
void OnExportSelection();
-void OnExportMP3Mix();
-void OnExportMP3Selection();
-void OnExportOggMix();
-void OnExportOggSelection();
-void OnExportFLACMix();
-void OnExportFLACSelection();
-void OnExportMP2Mix();
-void OnExportMP2Selection();
-
void OnExportMultiple();
-
void OnExportLabels();
void OnUpload();
Index: Menus.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Menus.cpp,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -d -r1.301 -r1.302
--- Menus.cpp 29 Mar 2007 18:17:25 -0000 1.301
+++ Menus.cpp 6 Apr 2007 10:25:47 -0000 1.302
@@ -54,7 +54,6 @@
#include "import/ImportMIDI.h"
#include "import/ImportRaw.h"
#include "export/Export.h"
-#include "export/ExportMP3.h"
#include "export/ExportMultiple.h"
#include "prefs/PrefsDialog.h"
#include "widgets/TimeTextCtrl.h"
@@ -241,62 +240,17 @@
c->AddSeparator();
- c->BeginSubMenu(_("&Export As..."));
- c->AddItem(wxT("Export"), _("&WAV..."),
FN(OnExportMix));
- c->AddItem(wxT("ExportMP3"), _("&MP3..."),
FN(OnExportMP3Mix));
-#ifdef USE_LIBVORBIS
- c->AddItem(wxT("ExportOgg"), _("Ogg &Vorbis..."),
FN(OnExportOggMix));
- // Enable Export commands only when there are tracks
- c->SetCommandFlags(AudioIONotBusyFlag | TracksExistFlag,
- AudioIONotBusyFlag | TracksExistFlag,
- wxT("ExportOgg"), NULL);
-#endif
-#ifdef USE_LIBFLAC
- c->AddItem(wxT("ExportFLAC"), _("&FLAC..."),
FN(OnExportFLACMix));
- c->SetCommandFlags(AudioIONotBusyFlag | TracksExistFlag,
- AudioIONotBusyFlag | TracksExistFlag,
- wxT("ExportFLAC"), NULL);
-#endif
-#ifdef USE_LIBTWOLAME
- c->AddItem(wxT("ExportMP2"), _("MP&2..."), FN(OnExportMP2Mix));
- c->SetCommandFlags(AudioIONotBusyFlag | TracksExistFlag,
- AudioIONotBusyFlag | TracksExistFlag,
- wxT("ExportMP2"), NULL);
-#endif
- c->EndSubMenu();
-
- c->BeginSubMenu(_("Expo&rt Selection As..."));
- c->AddItem(wxT("ExportSel"), _("&WAV..."),
FN(OnExportSelection));
- c->AddItem(wxT("ExportMP3Sel"), _("&MP3..."),
FN(OnExportMP3Selection));
-#ifdef USE_LIBVORBIS
- c->AddItem(wxT("ExportOggSel"), _("Ogg &Vorbis..."),
FN(OnExportOggSelection));
- // Enable Export Selection commands only when there's a selection
- c->SetCommandFlags(AudioIONotBusyFlag | TimeSelectedFlag |
TracksSelectedFlag,
- AudioIONotBusyFlag | TimeSelectedFlag |
TracksSelectedFlag,
- wxT("ExportOggSel"), NULL);
-#endif
-#ifdef USE_LIBFLAC
- c->AddItem(wxT("ExportFLACSel"), _("&FLAC..."),
FN(OnExportFLACSelection));
- c->SetCommandFlags(AudioIONotBusyFlag | TracksExistFlag |
TracksSelectedFlag,
- AudioIONotBusyFlag | TracksExistFlag |
TracksSelectedFlag,
- wxT("ExportFLACSel"), NULL);
-#endif
-#ifdef USE_LIBTWOLAME
- c->AddItem(wxT("ExportMP2Sel"), _("MP&2..."),
FN(OnExportMP2Selection));
- c->SetCommandFlags(AudioIONotBusyFlag | TracksExistFlag |
TracksSelectedFlag,
- AudioIONotBusyFlag | TracksExistFlag |
TracksSelectedFlag,
- wxT("ExportMP2Sel"), NULL);
-#endif
- c->EndSubMenu();
-
+ c->AddItem(wxT("Export"), _("&Export As..."),
FN(OnExport));
// Enable Export commands only when there are tracks
- c->SetCommandFlags(AudioIONotBusyFlag | TracksExistFlag,
+ c->SetCommandFlags(wxT("Export"),
AudioIONotBusyFlag | TracksExistFlag,
- wxT("Export"), wxT("ExportMP3"), NULL);
+ AudioIONotBusyFlag | TracksExistFlag);
+
+ c->AddItem(wxT("ExportSel"), _("Expo&rt Selection As..."),
FN(OnExportSelection));
// Enable Export Selection commands only when there's a selection
- c->SetCommandFlags(AudioIONotBusyFlag | TimeSelectedFlag |
TracksSelectedFlag,
+ c->SetCommandFlags(wxT("ExportSel"),
AudioIONotBusyFlag | TimeSelectedFlag |
TracksSelectedFlag,
- wxT("ExportSel"), wxT("ExportMP3Sel"), NULL);
+ AudioIONotBusyFlag | TimeSelectedFlag |
TracksSelectedFlag);
c->AddSeparator();
c->AddItem(wxT("ExportLabels"), _("Export &Labels..."),
FN(OnExportLabels));
@@ -315,24 +269,17 @@
if( mCleanSpeechMode )
{
- c->BeginSubMenu(_("&Export As..."));
- c->AddItem(wxT("Export"), _("&WAV..."),
FN(OnExportMix));
- c->AddItem(wxT("ExportMP3"), _("&MP3..."),
FN(OnExportMP3Mix));
- c->EndSubMenu();
-
- c->BeginSubMenu(_("Expo&rt Selection As..."));
- c->AddItem(wxT("ExportSel"), _("&WAV..."),
FN(OnExportSelection));
- c->AddItem(wxT("ExportMP3Sel"), _("&MP3..."),
FN(OnExportMP3Selection));
- c->EndSubMenu();
-
+ c->AddItem(wxT("Export"), _("&Export As..."),
FN(OnExport));
// Enable Export commands only when there are tracks
- c->SetCommandFlags(AudioIONotBusyFlag | TracksExistFlag,
+ c->SetCommandFlags(wxT("Export"),
AudioIONotBusyFlag | TracksExistFlag,
- wxT("Export"), wxT("ExportMP3"), NULL);
+ AudioIONotBusyFlag | TracksExistFlag);
+
+ c->AddItem(wxT("ExportSel"), _("Expo&rt Selection As..."),
FN(OnExportSelection));
// Enable Export Selection commands only when there's a selection
- c->SetCommandFlags(AudioIONotBusyFlag | TimeSelectedFlag |
TracksSelectedFlag,
+ c->SetCommandFlags(wxT("ExportSel"),
AudioIONotBusyFlag | TimeSelectedFlag |
TracksSelectedFlag,
- wxT("ExportSel"), wxT("ExportMP3Sel"), NULL);
+ AudioIONotBusyFlag | TimeSelectedFlag |
TracksSelectedFlag);
c->AddSeparator();
@@ -844,8 +791,6 @@
c->EndMenu();
- ModifyExportMenus();
-
SetMenuBar(menubar);
c->SetDefaultFlags(0, 0);
@@ -981,19 +926,6 @@
}
}
-void AudacityProject::ModifyExportMenus()
-{
- int format = ReadExportFormatPref();
- wxString pcmFormat = sf_header_shortname(format & SF_FORMAT_TYPEMASK);
-
- mCommandManager.Modify(wxT("Export"),
- wxString::Format(_("&%s..."),
- pcmFormat.c_str()));
- mCommandManager.Modify(wxT("ExportSel"),
- wxString::Format(_("&%s..."),
- pcmFormat.c_str()));
-}
-
void AudacityProject::ModifyUndoMenus()
{
wxString desc;
@@ -2242,54 +2174,18 @@
f.Close();
}
-void AudacityProject::OnExportMix()
-{
- ::ExportPCM(this, false, 0.0, mTracks->GetEndTime());
-}
-
-void AudacityProject::OnExportSelection()
-{
- ::ExportPCM(this, true, mViewInfo.sel0, mViewInfo.sel1);
-}
-
-void AudacityProject::OnExportMP3Mix()
-{
- ::ExportCompressed(this, wxT("MP3"), false, 0.0, mTracks->GetEndTime());
-}
-
-void AudacityProject::OnExportMP3Selection()
-{
- ::ExportCompressed(this, wxT("MP3"), true, mViewInfo.sel0, mViewInfo.sel1);
-}
-
-void AudacityProject::OnExportMP2Mix()
-{
- ::ExportCompressed(this, wxT("MP2"), false, 0.0, mTracks->GetEndTime());
-}
-
-void AudacityProject::OnExportMP2Selection()
-{
- ::ExportCompressed(this, wxT("MP2"), true, mViewInfo.sel0, mViewInfo.sel1);
-}
-
-void AudacityProject::OnExportOggMix()
-{
- ::ExportCompressed(this, wxT("OGG"), false, 0.0, mTracks->GetEndTime());
-}
-
-void AudacityProject::OnExportFLACMix()
+void AudacityProject::OnExport()
{
- ::ExportCompressed(this, wxT("FLAC"), false, 0.0, mTracks->GetEndTime());
-}
+ Export e(this);
-void AudacityProject::OnExportOggSelection()
-{
- ::ExportCompressed(this, wxT("OGG"), true, mViewInfo.sel0, mViewInfo.sel1);
+ e.Process(false, 0.0, mTracks->GetEndTime());
}
-void AudacityProject::OnExportFLACSelection()
+void AudacityProject::OnExportSelection()
{
- ::ExportCompressed(this, wxT("FLAC"), true, mViewInfo.sel0, mViewInfo.sel1);
+ Export e(this);
+
+ e.Process(true, mViewInfo.sel0, mViewInfo.sel1);
}
void AudacityProject::OnExportMultiple()
Index: Project.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Project.cpp,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -d -r1.298 -r1.299
--- Project.cpp 30 Mar 2007 09:49:32 -0000 1.298
+++ Project.cpp 6 Apr 2007 10:25:47 -0000 1.299
@@ -2088,8 +2088,9 @@
// and just work with .Wav, so does an export on a save.
if( mCleanSpeechMode )
{
+ Export e(this);
double endTime = mTracks->GetEndTime();
- bool flag = ::ExportPCM(this, false, 0.0, endTime);
+ bool flag = e.Process(false, 0.0, endTime);
return flag;
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
