Update of /cvsroot/audacity/audacity-src/src
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv29046
Modified Files:
Tag: Audacity_UmixIt
ControlToolBar.cpp Menus.cpp Audacity.h Menus.h
Log Message:
changes per Audiotouch client
Index: Menus.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Menus.h,v
retrieving revision 1.53.2.4.2.12
retrieving revision 1.53.2.4.2.13
diff -u -d -r1.53.2.4.2.12 -r1.53.2.4.2.13
--- Menus.h 8 Sep 2009 00:18:27 -0000 1.53.2.4.2.12
+++ Menus.h 3 Mar 2010 02:47:35 -0000 1.53.2.4.2.13
@@ -83,6 +83,9 @@
// File Menu
void OnNew();
+#if (AUDACITY_BRANDING == BRAND_AUDIOTOUCH)
+ void OnEmail();
+#endif
void OnOpen();
void OnClose();
void OnSave();
Index: Audacity.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Audacity.h,v
retrieving revision 1.20.2.17.2.11
retrieving revision 1.20.2.17.2.12
diff -u -d -r1.20.2.17.2.11 -r1.20.2.17.2.12
--- Audacity.h 8 Sep 2009 00:18:27 -0000 1.20.2.17.2.11
+++ Audacity.h 3 Mar 2010 02:47:35 -0000 1.20.2.17.2.12
@@ -20,7 +20,7 @@
// Increment this every time you release a new version
#if (AUDACITY_BRANDING == BRAND_AUDIOTOUCH)
- #define AUDACITY_VERSION_STRING "1.2.6a8"
+ #define AUDACITY_VERSION_STRING "1.2.6a9"
#elif (AUDACITY_BRANDING == BRAND_UMIXIT)
#define AUDACITY_VERSION_STRING "1.2.6.1"
#else
Index: ControlToolBar.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Attic/ControlToolBar.cpp,v
retrieving revision 1.61.2.14.2.12
retrieving revision 1.61.2.14.2.13
diff -u -d -r1.61.2.14.2.12 -r1.61.2.14.2.13
--- ControlToolBar.cpp 8 Sep 2009 00:18:26 -0000 1.61.2.14.2.12
+++ ControlToolBar.cpp 3 Mar 2010 02:47:32 -0000 1.61.2.14.2.13
@@ -1276,6 +1276,12 @@
}
#if (AUDACITY_BRANDING == BRAND_AUDIOTOUCH)
+ if (p->m_bWantAppendRecording)
+ {
+ ViewInfo* pViewInfo = p->GetViewInfo();
+ pViewInfo->sel0 = t0;
+ pViewInfo->sel1 = t0;
+ }
p->OnZoomFitV();
#endif
}
Index: Menus.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Menus.cpp,v
retrieving revision 1.151.2.26.2.19
retrieving revision 1.151.2.26.2.20
diff -u -d -r1.151.2.26.2.19 -r1.151.2.26.2.20
--- Menus.cpp 8 Sep 2009 00:18:26 -0000 1.151.2.26.2.19
+++ Menus.cpp 3 Mar 2010 02:47:34 -0000 1.151.2.26.2.20
@@ -25,6 +25,9 @@
#include <wx/textfile.h>
#include <wx/progdlg.h>
#include <wx/scrolbar.h>
+#include <wx/scrolbar.h>
+
+#include <wx/net/email.h>
#include "Project.h"
@@ -151,7 +154,8 @@
// For Audiotouch, commands re-ordered, and
// export commands renamed to "save as" commands and given new key codes.
c->AddItem("Export", _("Save As...\tCtrl+S"),
FN(OnExportMix));
- c->AddItem("ExportSel", _("Save Selection As...\tCtrl+Shift+S"),
FN(OnExportSelection));
+ // per R Barr, Mar 1, 2010 c->AddItem("ExportSel", _("Save
Selection As...\tCtrl+Shift+S"), FN(OnExportSelection));
+ c->AddItem("Open", _("&Email...\tCtrl+E"), FN(OnEmail)); //vvv
Set enable flags.
c->AddItem("Open", _("&Open...\tCtrl+O"),
FN(OnOpen));
c->AddItem("[blank]", _(""), NULL);
c->AddSeparator();
@@ -166,10 +170,10 @@
gPrefs->SetPath("..");
c->AddSeparator();
c->AddItem("ExportOgg", _("Save As Ogg Vorbis...\tCtrl+G"),
FN(OnExportOggMix));
- c->AddItem("ExportOggSel", _("Save Selection As Ogg
Vorbis...\tCtrl+Shift+G"), FN(OnExportOggSelection));
+ // per R Barr, Mar 1, 2010 c->AddItem("ExportOggSel", _("Save
Selection As Ogg Vorbis...\tCtrl+Shift+G"), FN(OnExportOggSelection));
c->AddSeparator();
c->AddItem("ExportMP3", _("Save As MP3...\tCtrl+M"),
FN(OnExportMP3Mix));
- c->AddItem("ExportMP3Sel", _("Save Selection As MP3...\tCtrl+Shift+M"),
FN(OnExportMP3Selection));
+ // per R Barr, Mar 1, 2010 c->AddItem("ExportMP3Sel", _("Save
Selection As MP3...\tCtrl+Shift+M"), FN(OnExportMP3Selection));
c->AddSeparator();
c->AddItem("Save", _("&Save Project\tCtrl+P"),
FN(OnSave));
c->SetCommandFlags("Save",
@@ -180,7 +184,8 @@
c->AddItem("New", _("&New\tCtrl+N"),
FN(OnNew));
c->SetCommandFlags("New", 0, 0);
c->AddItem("Close", _("&Close\tCtrl+W"),
FN(OnClose));
-#else // (AUDACITY_BRANDING != BRAND_AUDIOTOUCH)
+#else
+ // (AUDACITY_BRANDING != BRAND_AUDIOTOUCH)
c->AddItem("New", _("&New\tCtrl+N"),
FN(OnNew));
c->SetCommandFlags("New", 0, 0);
c->AddItem("Open", _("&Open...\tCtrl+O"),
FN(OnOpen));
@@ -1211,7 +1216,7 @@
void AudacityProject::OnLockUnlock()
{
ControlToolBar *toolbar = GetControlToolBar();
- wxCommandEvent evt; //vvv
+ wxCommandEvent evt;
toolbar->OnLock(evt);
}
#endif
@@ -1543,6 +1548,64 @@
CreateNewAudacityProject(gParentWindow);
}
+#if (AUDACITY_BRANDING == BRAND_AUDIOTOUCH)
+ void AudacityProject::OnEmail()
+ {
+ wxString path =
gPrefs->Read("/DefaultOpenPath",FROMFILENAME(::wxGetCwd()));
+
+ // TODO: Build the list of file types dynamically
+
+ wxFileDialog dlog(this, _("Select one or more audio files..."),
+ path, "",
+ _("All files (*.*)|*.*|"
+ "WAV files (*.wav)|*.wav|"
+ "AIFF files (*.aif)|*.aif|"
+ "AU files (*.au)|*.au|"
+ "MP3 files (*.mp3)|*.mp3|"
+ "Ogg Vorbis files (*.ogg)|*.ogg|"
+ "List of Files (*.lof)|*.lof"),
+ wxOPEN | wxMULTIPLE);
+
+ int result = dlog.ShowModal();
+
+ if (result != wxID_OK)
+ return;
+
+ wxArrayString selectedFiles;
+ unsigned int ff;
+
+ dlog.GetPaths(selectedFiles);
+
+ wxString fileName = wxT("");
+ for(ff=0; ff<selectedFiles.GetCount(); ff++) {
+ fileName = selectedFiles[ff];
+
+ path =::wxPathOnly(fileName);
+ gPrefs->Write("/DefaultOpenPath", path);
+ }
+
+ wxMailMessage msg(
+ _("Audiotouch audio file attached"), // const wxString& subject
+ _("replace...@somewhere.com"), // const wxString& to
+ // const wxString& body,
+ _("The attached audio file was generated in Audiotouch.\n\n
http://www.audiotouch.au/\n\nIf the attached audio file is in .wav or .mp3
formats, it should play on your computer with your installed software.\n\nIf
the attached audio file is .ogg (open source) format, you may need to downalod
free software to play it. Try http://www.vorbis.com/.";),
+ wxEmptyString, // const wxString& from = wxEmptyString,
+ fileName // const wxString& attachment = wxEmptyString, //vvvvv Need
to handle multiple files?
+ //vvv const wxString& attachmentTitle = wxEmptyString
+ );
+ if (!wxEmail::Send(msg))
+ wxMessageBox(_("Email failed."), _("Email failed."), wxICON_ERROR);
+
+ //v This is another way to do it without having to use
+ // wxEmail and the extra "net" contrib lib, but always
+ // opens the default browser, too.
+ //
+ // OpenInDefaultBrowser(
+ // wxHtmlLinkInfo(
+ //
wxT("mailto:<recipient>&attach=\"C:/V_data/sfw_dev/Audacity_Audiotouch/audacity/win/Output\"")));
+ }
+#endif
+
void AudacityProject::OnOpen()
{
ShowOpenDialog(this);
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
