[Audacity-cvs] audacity-src/src Menus.cpp, 1.151.2.26.2.20, 1.151.2.26.2.21
Update of /cvsroot/audacity/audacity-src/src
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13940
Modified Files:
Tag: Audacity_UmixIt
Menus.cpp
Log Message:
changes per Audiotouch client
Index: Menus.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/Menus.cpp,v
retrieving revision 1.151.2.26.2.20
retrieving revision 1.151.2.26.2.21
diff -u -d -r1.151.2.26.2.20 -r1.151.2.26.2.21
--- Menus.cpp 3 Mar 2010 02:47:34 - 1.151.2.26.2.20
+++ Menus.cpp 16 Mar 2010 01:21:44 - 1.151.2.26.2.21
@@ -153,7 +153,7 @@
#if (AUDACITY_BRANDING == BRAND_AUDIOTOUCH)
// 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(Export, _(Save As and Exit...\tCtrl+S),
FN(OnExportMix));
// per R Barr, Mar 1, 2010c-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));
@@ -169,17 +169,17 @@
mRecentFiles-Load(*gPrefs);
gPrefs-SetPath(..);
c-AddSeparator();
- c-AddItem(ExportOgg, _(Save As Ogg Vorbis...\tCtrl+G),
FN(OnExportOggMix));
+ c-AddItem(ExportOgg, _(Save As Ogg Vorbis...\tCtrl+G),
FN(OnExportOggMix));
// per R Barr, Mar 1, 2010c-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(ExportMP3, _(Save As MP3...\tCtrl+M),
FN(OnExportMP3Mix));
// per R Barr, Mar 1, 2010c-AddItem(ExportMP3Sel, _(Save
Selection As MP3...\tCtrl+Shift+M), FN(OnExportMP3Selection));
c-AddSeparator();
- c-AddItem(Save, _(Save Project\tCtrl+P),
FN(OnSave));
+ c-AddItem(Save, _(Save Project and Exit\tCtrl+P),
FN(OnSave));
c-SetCommandFlags(Save,
AudioIONotBusyFlag | UnsavedChangesFlag,
AudioIONotBusyFlag | UnsavedChangesFlag);
- c-AddItem(SaveAs, _(Save Project As...\tCtrl+Shift+P),
FN(OnSaveAs));
+ c-AddItem(SaveAs, _(Save Project As and
Exit...\tCtrl+Shift+P), FN(OnSaveAs));
c-AddSeparator();
c-AddItem(New,_(New\tCtrl+N),
FN(OnNew));
c-SetCommandFlags(New, 0, 0);
@@ -812,11 +812,12 @@
#if (AUDACITY_BRANDING == BRAND_AUDIOTOUCH)
// For Audiotouch, export commands renamed to save as commands,
re-ordered, given new key codes.
mCommandManager.Modify(Export,
- wxString::Format(_(Save As %s...),
- (const char *)pcmFormat));
- mCommandManager.Modify(ExportSel,
- wxString::Format(_(Save Selection As %s...),
+ wxString::Format(_(Save As %s and Exit...),
(const char *)pcmFormat));
+ // per R Barr, Mar 1, 2010
+ //mCommandManager.Modify(ExportSel,
+ // wxString::Format(_(Save Selection As %s and
Exit...),
+ // (const char *)pcmFormat));
#else // (AUDACITY_BRANDING != BRAND_AUDIOTOUCH)
mCommandManager.Modify(Export,
wxString::Format(_(Export As %s...),
@@ -1576,23 +1577,31 @@
dlog.GetPaths(selectedFiles);
+ wxString body = _(The attached audio file was generated in
Audiotouch.\n\n);
+ body += _(http://www.audiotouch.com.au/files/email_options.pdf\n\n;);
+ body += _(If the attached audio file is in .wav or .mp3 formats, it
should play on your computer with your installed software.\n\n);
+ body += _(If the attached audio file is .ogg (open source) format, you
may need to download free software to play it. Try http://www.vorbis.com/.;);
+ wxMailMessage msg(
+ _(Audiotouch audio file attached), // const wxString subject
+ _(replace...@somewhere.com), // const wxString to
+ body, // const wxString body,
+ wxEmptyString // const wxString from = wxEmptyString,
+ // const wxString attachment = wxEmptyString,
+ // const wxString attachmentTitle = wxEmptyString
+ );
+
+ // Add the attachments.
wxString fileName = wxT();
for(ff=0; ffselectedFiles.GetCount(); ff++) {
fileName = selectedFiles[ff];
-
- path =::wxPathOnly(fileName);
- gPrefs-Write(/DefaultOpenPath, path);
+ msg.AddAttachment(fileName);
}
+
+ // Rather than update the default path for each file,
+ // do
[Audacity-cvs] audacity-src/src/export Export.cpp, 1.21.2.4.2.1, 1.21.2.4.2.2
Update of /cvsroot/audacity/audacity-src/src/export In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13940/export Modified Files: Tag: Audacity_UmixIt Export.cpp Log Message: changes per Audiotouch client Index: Export.cpp === RCS file: /cvsroot/audacity/audacity-src/src/export/Export.cpp,v retrieving revision 1.21.2.4.2.1 retrieving revision 1.21.2.4.2.2 diff -u -d -r1.21.2.4.2.1 -r1.21.2.4.2.2 --- Export.cpp 11 Jun 2007 22:08:53 - 1.21.2.4.2.1 +++ Export.cpp 16 Mar 2010 01:21:39 - 1.21.2.4.2.2 @@ -406,10 +406,11 @@ if (success actualName != fName) ::wxRenameFile(FILENAME(fName), FILENAME(actualName)); - #if (AUDACITY_BRANDING == BRAND_AUDIOTOUCH) - if (success) - project-OnClose(); - #endif + //v Removed per Robert Barr, 2010-03-10. + //#if (AUDACITY_BRANDING == BRAND_AUDIOTOUCH) + // if (success) + // project-OnClose(); + //#endif return success; } -- Download Intel#174; 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
[Audacity-cvs] audacity-src/src ControlToolBar.cpp, 1.61.2.14.2.12, 1.61.2.14.2.13 Menus.cpp, 1.151.2.26.2.19, 1.151.2.26.2.20 Audacity.h, 1.20.2.17.2.11, 1.20.2.17.2.12 Menus.h, 1.53.2.4.2.12, 1.53.2
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 - 1.53.2.4.2.12
+++ Menus.h 3 Mar 2010 02:47:35 - 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 - 1.20.2.17.2.11
+++ Audacity.h 3 Mar 2010 02:47:35 - 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 - 1.61.2.14.2.12
+++ ControlToolBar.cpp 3 Mar 2010 02:47:32 - 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 - 1.151.2.26.2.19
+++ Menus.cpp 3 Mar 2010 02:47:34 - 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, 2010c-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, 2010c-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, 2010c-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
[Audacity-cvs] audacity-src/win audacity_audiotouch.iss, 1.1.2.6, 1.1.2.7 audacity.vcproj, 1.1.2.7.2.5, 1.1.2.7.2.6
Update of /cvsroot/audacity/audacity-src/win In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv29102 Modified Files: Tag: Audacity_UmixIt audacity_audiotouch.iss audacity.vcproj Log Message: changes per Audiotouch client Index: audacity_audiotouch.iss === RCS file: /cvsroot/audacity/audacity-src/win/Attic/audacity_audiotouch.iss,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -u -d -r1.1.2.6 -r1.1.2.7 --- audacity_audiotouch.iss 8 Sep 2009 21:42:11 - 1.1.2.6 +++ audacity_audiotouch.iss 3 Mar 2010 02:47:50 - 1.1.2.7 @@ -3,7 +3,7 @@ [Setup] ; compiler-related directives -OutputBaseFilename=audacity-audiotouch-win-1.2.6a8 +OutputBaseFilename=audacity-audiotouch-win-1.2.6a9 SetupIconFile=Audacity.ico WizardImageFile=audacity_InnoWizardImage.bmp Index: audacity.vcproj === RCS file: /cvsroot/audacity/audacity-src/win/Attic/audacity.vcproj,v retrieving revision 1.1.2.7.2.5 retrieving revision 1.1.2.7.2.6 diff -u -d -r1.1.2.7.2.5 -r1.1.2.7.2.6 --- audacity.vcproj 22 Mar 2007 02:05:13 - 1.1.2.7.2.5 +++ audacity.vcproj 3 Mar 2010 02:47:51 - 1.1.2.7.2.6 @@ -20,7 +20,7 @@ Tool Name=VCCLCompilerTool Optimization=0 - AdditionalIncludeDirectories=quot;$(WXWIN)\lib\mswdquot;;.;quot;$(WXWIN)\includequot;;..\src\include;..\src\include\win32;quot;..\lib-src\allegroquot;;quot;..\lib-src\expatquot;;quot;..\lib-src\libid3tagquot;;quot;..\lib-src\portaudio\pa_commonquot;;quot;..\lib-src\libsndfile\Win32quot;;quot;..\lib-src\libsndfile\srcquot;;quot;..\lib-src\libmadquot;;quot;..\lib-src\libogg\includequot;;quot;..\lib-src\libvorbis\includequot;;quot;..\lib-src\libnyquist\nyxquot;;quot;..\lib-src\portmixer\px_commonquot;;quot;..\lib-src\libsamplerate\srcquot;;quot;..\lib-src\libflac\includequot;;quot;..\lib-src\soundtouchquot;;quot;..\lib-src\libresample\includequot; + AdditionalIncludeDirectories=quot;$(WXWIN)\lib\mswdquot;;.;quot;$(WXWIN)\includequot;;quot;$(WXWIN)\contrib\includequot;;..\src\include;..\src\include\win32;quot;..\lib-src\allegroquot;;quot;..\lib-src\expatquot;;quot;..\lib-src\libid3tagquot;;quot;..\lib-src\portaudio\pa_commonquot;;quot;..\lib-src\libsndfile\Win32quot;;quot;..\lib-src\libsndfile\srcquot;;quot;..\lib-src\libmadquot;;quot;..\lib-src\libogg\includequot;;quot;..\lib-src\libvorbis\includequot;;quot;..\lib-src\libnyquist\nyxquot;;quot;..\lib-src\portmixer\px_commonquot;;quot;..\lib-src\libsamplerate\srcquot;;quot;..\lib-src\libflac\includequot;;quot;..\lib-src\soundtouchquot;;quot;..\lib-src\libresample\includequot; PreprocessorDefinitions=_DEBUG;DEBUG=1;__WXDEBUG__;__WX__;WIN32;_WINDOWS;__WINDOWS__;__WXMSW__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT RuntimeLibrary=1 UsePrecompiledHeader=2 @@ -38,7 +38,7 @@ Tool Name=VCLinkerTool AdditionalOptions=/IGNORE:4049 - AdditionalDependencies=expatd.lib sndfiled.lib libFLACd.lib PAStaticWMMED.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib + AdditionalDependencies=netd.lib expatd.lib sndfiled.lib libFLACd.lib PAStaticWMMED.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib OutputFile=.\Debug/audacity.exe LinkIncremental=1 SuppressStartupBanner=TRUE @@ -92,7 +92,7 @@ InlineFunctionExpansion=2 OptimizeForProcessor=3 OptimizeForWindowsApplication=TRUE - AdditionalIncludeDirectories=quot;$(WXWIN)\lib\mswquot;;.;quot;$(WXWIN)\includequot;;..\src\include;..\src\include\win32;quot;..\lib-src\allegroquot;;quot;..\lib-src\expatquot;;quot;..\lib-src\libid3tagquot;;quot;..\lib-src\portaudio\pa_commonquot;;quot;..\lib-src\libsndfile\Win32quot;;quot;..\lib-src\libsndfile\srcquot;;quot;..\lib-src\libmadquot;;quot;..\lib-src\libogg\includequot;;quot;..\lib-src\libvorbis\includequot;;quot;..\lib-src\libnyquist\nyxquot;;quot;..\lib-src\portmixer\px_commonquot;;quot;..\lib-src\libsamplerate\srcquot;;quot;..\lib-src\libflac\includequot;;quot;..\lib-src\soundtouchquot;;quot;..\lib-src\libresample\includequot; +
Re: [Audacity-cvs] audacity-src/src AboutDialog.cpp,1.75,1.76
Follow the link at the bottom of every email on this list, https://lists.sourceforge.net/lists/listinfo/audacity-cvs Find the unsubscribe button at the bottom of that page. Diana Howell wrote: Dell, I receive these as well. There must be a place to remove yourself from this subscription, on the site, but I don't know where it is. Diana -Original Message- From: Dell Slack [mailto:dsl...@telus.net] Sent: Friday, January 01, 2010 1:28 AM To: 'Updates to CVS repository for Audacity' Subject: Re: [Audacity-cvs] audacity-src/src AboutDialog.cpp,1.75,1.76 Importance: High Please stop sending me messages from Audacity, thank you -Original Message- From: Gale Andrews [mailto:windint...@users.sourceforge.net] Sent: Thursday, December 31, 2009 9:38 PM To: audacity-cvs@lists.sourceforge.net Subject: [Audacity-cvs] audacity-src/src AboutDialog.cpp,1.75,1.76 Update of /cvsroot/audacity/audacity-src/src In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22208 Modified Files: AboutDialog.cpp Log Message: Bump copyright date to 2010 and remove it from translatable string so updating it doesn't break translation Index: AboutDialog.cpp === RCS file: /cvsroot/audacity/audacity-src/src/AboutDialog.cpp,v retrieving revision 1.75 retrieving revision 1.76 diff -u -d -r1.75 -r1.76 --- AboutDialog.cpp 7 Nov 2009 17:17:45 - 1.75 +++ AboutDialog.cpp 1 Jan 2010 05:38:05 - 1.76 @@ -264,8 +264,11 @@ GetCreditsByRole(roleThanks) + wxT(pbr/center) + - _(bAudacityreg;/b software is copyright copy; 1999-2009 Audacity Team. brThe name bAudacityreg;/b is a registered trademark of Dominic Mazzoni.) + - wxT(/font/body/html); + _(bAudacityreg;/b software is copyright)+ + wxT(copy; 1999-2010 Audacity Team.br) + + + _(The name bAudacityreg;/b is a registered trademark of Dominic Mazzoni.) + + wxT(/font/body/html); this-SetBackgroundColour(theTheme.Colour( clrAboutBoxBackground )); -- This SF.Net email is sponsored by the Verizon Developer Community Take advantage of Verizon's best-in-class app development support A streamlined, 14 day to market process makes app distribution fast and easy Join now and get one step closer to millions of Verizon customers http://p.sf.net/sfu/verizon-dev2dev ___ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs No virus found in this incoming message. Checked by AVG - www.avg.com Version: 9.0.725 / Virus Database: 270.14.123/2595 - Release Date: 12/31/09 00:52:00 -- This SF.Net email is sponsored by the Verizon Developer Community Take advantage of Verizon's best-in-class app development support A streamlined, 14 day to market process makes app distribution fast and easy Join now and get one step closer to millions of Verizon customers http://p.sf.net/sfu/verizon-dev2dev ___ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs -- This SF.Net email is sponsored by the Verizon Developer Community Take advantage of Verizon's best-in-class app development support A streamlined, 14 day to market process makes app distribution fast and easy Join now and get one step closer to millions of Verizon customers http://p.sf.net/sfu/verizon-dev2dev ___ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs -- This SF.Net email is sponsored by the Verizon Developer Community Take advantage of Verizon's best-in-class app development support A streamlined, 14 day to market process makes app distribution fast and easy Join now and get one step closer to millions of Verizon customers http://p.sf.net/sfu/verizon-dev2dev ___ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src Audacity.h,1.74,1.75
Update of /cvsroot/audacity/audacity-src/src In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21161/audacity/src Modified Files: Audacity.h Log Message: Simplify unnecessary nesting. Index: Audacity.h === RCS file: /cvsroot/audacity/audacity-src/src/Audacity.h,v retrieving revision 1.74 retrieving revision 1.75 diff -u -d -r1.74 -r1.75 --- Audacity.h 5 Dec 2009 06:40:41 - 1.74 +++ Audacity.h 12 Dec 2009 01:39:56 - 1.75 @@ -22,7 +22,7 @@ // As of November 2009, we can have alphas of a beta release or // alphas of a stable release, typically the nightly builds. -// Most of the time we're in development IS_ALPHA should be defined +// Most of the time we're in development, so IS_ALPHA should be defined // to 1. #define IS_ALPHA 1 @@ -34,12 +34,10 @@ #if IS_ALPHA #define AUDACITY_SUFFIX wxT(-alpha-) __TDATE__ +#elif (IS_BETA) + #define AUDACITY_SUFFIXwxT(-beta) #else - #if (IS_BETA) - #define AUDACITY_SUFFIXwxT(-beta) - #else - #define AUDACITY_SUFFIXwxT() // for a stable release - #endif + #define AUDACITY_SUFFIXwxT() // for a stable release #endif #define AUDACITY_MAKESTR( x ) #x -- Return on Information: Google Enterprise Search pays you back Get the facts. http://p.sf.net/sfu/google-dev2dev ___ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs
Re: [Audacity-cvs] audacity-src/win audacity_unicode.iss,1.28,1.29
I guess this comment is useful, but if you install 1.2.6, or look at its
installer script, you can see what the tradition is...
http://audacity.cvs.sourceforge.net/viewvc/audacity/audacity-src/win/audacity.iss?revision=1.12.2.22view=markuppathrev=AUDACITY_1_2
DefaultDirName={pf}\Audacity
Ahh, so pure, so simple.
But it sure has been a long time!
- V
Martyn wrote:
Update of /cvsroot/audacity/audacity-src/win
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1043
Modified Files:
audacity_unicode.iss
Log Message:
Note on Stable release
Index: audacity_unicode.iss
===
RCS file: /cvsroot/audacity/audacity-src/win/audacity_unicode.iss,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- audacity_unicode.iss 29 Nov 2009 01:05:54 - 1.28
+++ audacity_unicode.iss 5 Dec 2009 01:56:44 - 1.29
@@ -19,6 +19,7 @@
AppSupportURL=http://audacity.sourceforge.net
AppUpdatesURL=http://audacity.sourceforge.net
ChangesAssociations=yes
+; Change the following line for a Stable release, to what I din't know (MJS)
DefaultDirName={pf}\Audacity 1.3 Beta (Unicode)
; Always warn if dir exists, because we'll overwrite previous Audacity.
DirExistsWarning=yes
@@ -57,7 +58,6 @@
; No longer allow user to choose whether to associate AUP file type with
Audacity.
; Name: associate_aup; Description: Associate Audacity project files;
GroupDescription: Other tasks:; Flags: checkedonce
-
[Files]
; Don't display in separate window, rather as InfoAfterFile. Source:
..\README.txt; DestDir: {app}; Flags: ignoreversion isreadme
Source: ..\README.txt; DestDir: {app}; Flags: ignoreversion
@@ -136,3 +136,4 @@
+
--
Join us December 9, 2009 for the Red Hat Virtual Experience,
a free event focused on virtualization and cloud computing.
Attend in-depth sessions from your desk. Your couch. Anywhere.
http://p.sf.net/sfu/redhat-sfdev2dev
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/win audacity_unicode.iss,1.30,1.31
Update of /cvsroot/audacity/audacity-src/win
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv2696
Modified Files:
audacity_unicode.iss
Log Message:
Document naming conventions.
Index: audacity_unicode.iss
===
RCS file: /cvsroot/audacity/audacity-src/win/audacity_unicode.iss,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- audacity_unicode.iss6 Dec 2009 05:15:23 - 1.30
+++ audacity_unicode.iss7 Dec 2009 06:03:06 - 1.31
@@ -19,8 +19,11 @@
AppSupportURL=http://audacity.sourceforge.net
AppUpdatesURL=http://audacity.sourceforge.net
ChangesAssociations=yes
-; Change the following line for a Stable release, to what I din't know (MJS)
+
+; For a beta release, e.g.: DefaultDirName={pf}\Audacity 1.3 Beta (Unicode)
+; For a stable release: DefaultDirName={pf}\Audacity
DefaultDirName={pf}\Audacity 1.3 Beta (Unicode)
+
; Always warn if dir exists, because we'll overwrite previous Audacity.
DirExistsWarning=yes
DisableProgramGroupPage=yes
@@ -141,3 +144,4 @@
+
--
Join us December 9, 2009 for the Red Hat Virtual Experience,
a free event focused on virtualization and cloud computing.
Attend in-depth sessions from your desk. Your couch. Anywhere.
http://p.sf.net/sfu/redhat-sfdev2dev
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
Re: [Audacity-cvs] audacity-src/win audacity_unicode.iss,1.28,1.29
Well, yes of course, it's useful, Vaughan. Prompted me to update it. :-)
- V
Vaughan Johnson wrote:
I guess this comment is useful, but if you install 1.2.6, or look at its
installer script, you can see what the tradition is...
http://audacity.cvs.sourceforge.net/viewvc/audacity/audacity-src/win/audacity.iss?revision=1.12.2.22view=markuppathrev=AUDACITY_1_2
DefaultDirName={pf}\Audacity
Ahh, so pure, so simple.
But it sure has been a long time!
- V
Martyn wrote:
Update of /cvsroot/audacity/audacity-src/win
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1043
Modified Files:
audacity_unicode.iss
Log Message:
Note on Stable release
Index: audacity_unicode.iss
===
RCS file: /cvsroot/audacity/audacity-src/win/audacity_unicode.iss,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- audacity_unicode.iss 29 Nov 2009 01:05:54 - 1.28
+++ audacity_unicode.iss 5 Dec 2009 01:56:44 - 1.29
@@ -19,6 +19,7 @@
AppSupportURL=http://audacity.sourceforge.net
AppUpdatesURL=http://audacity.sourceforge.net
ChangesAssociations=yes
+; Change the following line for a Stable release, to what I din't know (MJS)
DefaultDirName={pf}\Audacity 1.3 Beta (Unicode)
; Always warn if dir exists, because we'll overwrite previous Audacity.
DirExistsWarning=yes
@@ -57,7 +58,6 @@
; No longer allow user to choose whether to associate AUP file type with
Audacity.
; Name: associate_aup; Description: Associate Audacity project files;
GroupDescription: Other tasks:; Flags: checkedonce
-
[Files]
; Don't display in separate window, rather as InfoAfterFile. Source:
..\README.txt; DestDir: {app}; Flags: ignoreversion isreadme
Source: ..\README.txt; DestDir: {app}; Flags: ignoreversion
@@ -136,3 +136,4 @@
+
--
Join us December 9, 2009 for the Red Hat Virtual Experience,
a free event focused on virtualization and cloud computing.
Attend in-depth sessions from your desk. Your couch. Anywhere.
http://p.sf.net/sfu/redhat-sfdev2dev
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
Re: [Audacity-cvs] htdocs Competitive_Ad_Filter.txt,1.24,1.25
Added this to the AdSense filters. Btw, AdSense alphabetizes '.' after '-', so it appears after audacity-software.org rather than before the audacity- sites. I'd like the lists to match, but I can't get to CVS right now. - V Gale Andrews wrote: Update of /cvsroot/audacity/htdocs In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10976 Modified Files: Competitive_Ad_Filter.txt Log Message: add audacity.download-latest.com -spotted in Google search for Audacity and in our Adsense ads Index: Competitive_Ad_Filter.txt === RCS file: /cvsroot/audacity/htdocs/Competitive_Ad_Filter.txt,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- Competitive_Ad_Filter.txt 2 Aug 2009 01:59:15 - 1.24 +++ Competitive_Ad_Filter.txt 4 Dec 2009 11:45:11 - 1.25 @@ -2,6 +2,7 @@ 2009-version.info appcraft.org/shop_mobile-ringtone-converter_590_0_45.html +audacity.download-latest.com audacity-download.com audacity-pro-2009.com audacity-pro-2009.org -- Join us December 9, 2009 for the Red Hat Virtual Experience, a free event focused on virtualization and cloud computing. Attend in-depth sessions from your desk. Your couch. Anywhere. http://p.sf.net/sfu/redhat-sfdev2dev ___ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/win release.txt,1.19,1.20
Update of /cvsroot/audacity/audacity-src/win
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10553
Modified Files:
release.txt
Log Message:
new section about testing and naming release candidates
Index: release.txt
===
RCS file: /cvsroot/audacity/audacity-src/win/release.txt,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- release.txt 30 Nov 2009 23:39:03 - 1.19
+++ release.txt 4 Dec 2009 04:20:19 - 1.20
@@ -1,8 +1,5 @@
How to Build Audacity(R) Releases for Microsoft Windows(R)
-Copyright 2007-2009, Vaughan Johnson
-22 October 2007
-Additional authors:
-Martyn Shaw (MJS).
+Copyright 2007-2009, Vaughan Johnson, Martyn Shaw (MJS).
This file is currently accurate for Audacity version 1.3.10.
@@ -148,7 +145,7 @@
For stable releases, this should just be
Audacity (Unicode)
- * AppVerName=Audacity 1.3.9 (Unicode)
+ * AppVerName=Audacity 1.3.10 (Unicode)
* DefaultDirName={pf}\Audacity 1.3 Beta (Unicode)
For stable releases, this should just be
@@ -162,15 +159,26 @@
to style sheets may 'break' the mw2html.py script and cause it to
leave in / miss out some vital bits.
- f. Rename it as necessary, e.g.,
- audacity-win-unicode-1.3.9rc1.exe.
+ f. Rename it as a release candidate, e.g.,
+ audacity-win-unicode-1.3.9rc1.exe for
+ release candidate 1.
5. To create the zip version, go to the installed version,
e.g., C:\Program Files\Audacity 1.3 Beta (Unicode),
remove the unins*.* files and the help folder, then
zip the folder and rename it e.g.,
- audacity-win-unicode-1.3.9.zip
+ audacity-win-unicode-1.3.10rc1.zip
+
+
+TESTING
+
+Test the rc1 release candidate. If changes are necessary, name
+successive candidates rcN.
+
+When the final rcN is approved, simply remove the rcN
+suffix from the name on the exe and zip files, and those
+are the release installer and zip.
===
\ No newline at end of file
--
Join us December 9, 2009 for the Red Hat Virtual Experience,
a free event focused on virtualization and cloud computing.
Attend in-depth sessions from your desk. Your couch. Anywhere.
http://p.sf.net/sfu/redhat-sfdev2dev
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src MixerBoard.cpp,1.24,1.25
Update of /cvsroot/audacity/audacity-src/src
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6127
Modified Files:
MixerBoard.cpp
Log Message:
Remove check on constant (basically unused) flag.
Fix a comment.
Index: MixerBoard.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/MixerBoard.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- MixerBoard.cpp 24 Sep 2009 00:59:04 - 1.24
+++ MixerBoard.cpp 30 Nov 2009 19:34:09 - 1.25
@@ -398,8 +398,9 @@
i++;
}
- bool bWantPostFadeValues = true; //v Turn this into a checkbox on
MixerBoard?
- if (bSuccess bWantPostFadeValues)
+ //const bool bWantPostFadeValues = true; //v Turn this into a checkbox on
MixerBoard?
+ //if (bSuccess bWantPostFadeValues)
+ if (bSuccess)
{
for (i = 0; i nFramesPerBuffer; i++)
{
@@ -417,7 +418,7 @@
if (bSuccess)
mMeter-UpdateDisplay(
- 2, // If mono, show left track values in both meters, as in
MeterToolBar. kNumChannels,
+ 2, // If mono, show left track values in both meters, as in
MeterToolBar, rather than kNumChannels.
nFramesPerBuffer,
maxLeft, rmsLeft,
maxRight, rmsRight,
--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src Menus.cpp,1.537,1.538
Update of /cvsroot/audacity/audacity-src/src In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv9921 Modified Files: Menus.cpp Log Message: Al Dimond's patch for bugs opening or creating new project while audio I/O is busy. Index: Menus.cpp === RCS file: /cvsroot/audacity/audacity-src/src/Menus.cpp,v retrieving revision 1.537 retrieving revision 1.538 diff -u -d -r1.537 -r1.538 --- Menus.cpp 5 Nov 2009 00:32:03 - 1.537 +++ Menus.cpp 30 Nov 2009 19:40:48 - 1.538 @@ -204,12 +204,12 @@ c-SetDefaultFlags(AudioIONotBusyFlag, AudioIONotBusyFlag); c-AddItem(wxT(New), _(New), FN(OnNew), wxT(Ctrl+N), - AlwaysEnabledFlag, - AlwaysEnabledFlag); + AudioIONotBusyFlag, + AudioIONotBusyFlag); c-AddItem(wxT(Open), _(Open...), FN(OnOpen), wxT(Ctrl+O), - AlwaysEnabledFlag, - AlwaysEnabledFlag); + AudioIONotBusyFlag, + AudioIONotBusyFlag); / -- Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july ___ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/win audacity.iss,1.39,1.40
Update of /cvsroot/audacity/audacity-src/win
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv14305
Modified Files:
audacity.iss
Log Message:
Fix the min req'd versions of Windows in the ascii script, as had been done for
the unicode script.
Index: audacity.iss
===
RCS file: /cvsroot/audacity/audacity-src/win/audacity.iss,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- audacity.iss30 Nov 2009 01:36:51 - 1.39
+++ audacity.iss30 Nov 2009 19:46:14 - 1.40
@@ -27,8 +27,8 @@
; No longer force them to accept the license, just display it.
LicenseFile=..\LICENSE.txt
InfoBeforeFile=..\LICENSE.txt
InfoAfterFile=..\README.txt
-; min versions: Win95, NT 4.0
-MinVersion=4.0,4.0
+; min versions: Win 95, Win 2000 - allow to run on non-Unicode Windows
versions in case we ever support this.
+MinVersion=4.0,5.0
[Languages]
Name: english; MessagesFile: compiler:Default.isl
@@ -53,9 +53,9 @@
Name: spanish; MessagesFile: compiler:Languages\Spanish.isl
[Tasks]
-Name: desktopicon; Description: Create a desktop icon; GroupDescription:
Additional icons:; MinVersion: 4,4
+Name: desktopicon; Description: Create a desktop icon; GroupDescription:
Additional icons:
; No longer allow user to choose whether to associate AUP file type with
Audacity.
-; Name: associate_aup; Description: Associate Audacity project files;
GroupDescription: Other tasks:; Flags: checkedonce; MinVersion: 4,4
+; Name: associate_aup; Description: Associate Audacity project files;
GroupDescription: Other tasks:; Flags: checkedonce
[Files]
@@ -94,7 +94,7 @@
[Icons]
Name: {commonprograms}\Audacity 1.3 Beta; Filename: {app}\audacity.exe
-Name: {userdesktop}\Audacity 1.3 Beta; Filename: {app}\audacity.exe;
MinVersion: 4,4; Tasks: desktopicon
+Name: {userdesktop}\Audacity 1.3 Beta; Filename: {app}\audacity.exe;
Tasks: desktopicon
[InstallDelete]
; Get rid of Audacity 1.0.0 stuff that's no longer used.
@@ -133,3 +133,6 @@
Filename: {app}\audacity.exe; Description: Launch Audacity; Flags: nowait
postinstall skipifsilent
+
+
+
--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src Audacity.h,1.71,1.72
Update of /cvsroot/audacity/audacity-src/src In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5715 Modified Files: Audacity.h Log Message: for AUDACITY_SUFFIX: Replace -alpha-date with -beta for 1.3.10 release. Use IS_BETA to set automatically for beta vs stable release. Index: Audacity.h === RCS file: /cvsroot/audacity/audacity-src/src/Audacity.h,v retrieving revision 1.71 retrieving revision 1.72 diff -u -d -r1.71 -r1.72 --- Audacity.h 1 Sep 2009 18:09:31 - 1.71 +++ Audacity.h 30 Nov 2009 21:40:08 - 1.72 @@ -25,7 +25,19 @@ #define AUDACITY_RELEASE 3 #define AUDACITY_REVISION 10 #define AUDACITY_MODLEVEL 0 -#define AUDACITY_SUFFIXwxT(-alpha-) __TDATE__ // wxT() + +#if (IS_BETA) + #define AUDACITY_SUFFIXwxT(-beta) +#else + #define AUDACITY_SUFFIXwxT() // for a stable release +#endif +// As of November 2009, we can have alphas of a beta release or +// alphas of a stable release, typically the nightly builds. +// Most of the time we're in development, the following #define +// should be uncommented, to override the above. +// It should be commented out only when we're building a +// beta or stable release. +// #define AUDACITY_SUFFIX wxT(-alpha-) __TDATE__ #define AUDACITY_MAKESTR( x ) #x #define AUDACITY_QUOTE( x ) AUDACITY_MAKESTR( x ) -- Join us December 9, 2009 for the Red Hat Virtual Experience, a free event focused on virtualization and cloud computing. Attend in-depth sessions from your desk. Your couch. Anywhere. http://p.sf.net/sfu/redhat-sfdev2dev ___ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/win release.txt,1.17,1.18
Update of /cvsroot/audacity/audacity-src/win In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5924 Modified Files: release.txt Log Message: Add some more #defines to check when building for a release. Index: release.txt === RCS file: /cvsroot/audacity/audacity-src/win/release.txt,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- release.txt 30 Nov 2009 01:36:51 - 1.17 +++ release.txt 30 Nov 2009 21:40:57 - 1.18 @@ -44,8 +44,20 @@ We cannot publicly post a build that supports ASIO, for licensing reasons (more detail in compile.txt). - c. If building a 'Stable' build (rather than a Beta), set IS_BETA to 0 - in Audacity.h. + c. Check that the following #defines in Audacity.h are up-to-date: + IS_BETA + + AUDACITY_VERSION + + AUDACITY_RELEASE + + AUDACITY_REVISION + + AUDACITY_SUFFIX + Especially check the overriding -alpha-date line. + + (Vaughan believes we have never changed + AUDACITY_MODLEVEL, so it can be ignored.) d. It's a good idea to not only do a Build Clean Solution beforehand, but to also delete the directory -- Join us December 9, 2009 for the Red Hat Virtual Experience, a free event focused on virtualization and cloud computing. Attend in-depth sessions from your desk. Your couch. Anywhere. http://p.sf.net/sfu/redhat-sfdev2dev ___ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/win release.txt,1.13,1.14
Update of /cvsroot/audacity/audacity-src/win In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17332 Modified Files: release.txt Log Message: indenting, typos, notes on possibly incorrect info Index: release.txt === RCS file: /cvsroot/audacity/audacity-src/win/release.txt,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- release.txt 26 Nov 2009 00:46:58 - 1.13 +++ release.txt 28 Nov 2009 02:09:22 - 1.14 @@ -3,7 +3,7 @@ 22 October 2007 -This version is currently accurate for Audacity version 1.3.10. +This file is currently accurate for Audacity version 1.3.10. If the advice here is inaccurate or incomplete, please email audacity-de...@lists.sourceforge.net. See also http://audacityteam.org/wiki/index.php?title=Developing_On_Windows;. @@ -18,54 +18,63 @@ 1. Remove the old manual and make sure you can rebuild a new one - Make sure you have python installed and on your path. - Delete audacity\help\manual if it exists. - The manual should be built in audacity\help\manual by the main Solution (step 2 below). - (If you have disabled the 'Help' project during testing you will have to build it seperatly). - (If you just want to get the manual, go to audacity\scripts\mw2html_audacity, run wiki2htm and wait for it to complete.) + a. Make sure you have python installed and on your path. + + b. Delete audacity\help\manual if it exists. + + c. The manual should be built in audacity\help\manual by the + main Solution (step 2 below). + + If you have disabled the 'Help' project uring testing you will have to + build it separately. + + If you just want to get the manual, go to + audacity\scripts\mw2html_audacity, run wiki2htm and wait for + it to complete. 2. Build the release executable. - a. Make sure you have got a current source version from CVS. + a. Make sure you have a current source version from CVS. - b. Make sure to turn off ASIO support (see compile.txt) if you are - creating the installer for public release. - We cannot publicly post a build that supports ASIO, for - licensing reasons (more detail in compile.txt). + b. Make sure to turn off ASIO support (see compile.txt) if you are + creating the installer for public release. + We cannot publicly post a build that supports ASIO, for + licensing reasons (more detail in compile.txt). - c. If building the 'Release' build (rather than a Beta), set IS_BETA to 0 - in Audacity.h. + c. If building the 'Release' build (rather than a Beta), set IS_BETA to 0 + in Audacity.h. + [*** I think this is incorrect. - Vaughan, Nov 27, 2009.] - d. It's a good idea to not only do a Build Clean Solution - beforehand, but to also delete the directory - (e.g., audacity\win\unicode_release). + d. It's a good idea to not only do a Build Clean Solution + beforehand, but to also delete the directory + (e.g., audacity\win\unicode_release). - e. Make sure to build the locale project, either - separately or as part of Build Batch Build. You will need - msgfmt.zip in your PATH for that. Get it from - http://audacity.sourceforge.net/files/msgfmt.zip + e. Make sure to build the locale project, either + separately or as part of Build Batch Build. You will need + msgfmt.zip in your PATH for that. Get it from + http://audacity.sourceforge.net/files/msgfmt.zip 3. Copy other necessities to release build folder. - a. We are still keeping some of the LADSPA plug-ins in the - Audacity installer, even though we are now offering a - separate installer that includes all the LADSPA plug-ins - built from version 0.4.15. These are the ones we include + a. We are still keeping some of the LADSPA plug-ins in the + Audacity installer, even though we are now offering a + separate installer that includes all the LADSPA plug-ins + built from version 0.4.15. These are the ones we include - * gverb_1216.dll - * hard_limiter_1413.dll - * sc4_1882.dll - - Check http://plugin.org.uk/; for updates. - If none, just grab the dlls from a previous release. - If updated, build these via the - audacity\win\LADSPA_plugins-win project (see - audacity\win\LADSPA_plugins-win\readme_LADSPA_plugins-win.txt). - - Once you have these DLL files, put them in the plug-ins - folder, e.g., audacity\win\unicode_release\plug-ins. + * gverb_1216.dll +
[Audacity-cvs] audacity-src/win release.txt,1.14,1.15
Update of /cvsroot/audacity/audacity-src/win In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7 Modified Files: release.txt Log Message: more small fixes Index: release.txt === RCS file: /cvsroot/audacity/audacity-src/win/release.txt,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- release.txt 28 Nov 2009 02:09:22 - 1.14 +++ release.txt 28 Nov 2009 02:52:59 - 1.15 @@ -18,14 +18,14 @@ 1. Remove the old manual and make sure you can rebuild a new one - a. Make sure you have python installed and on your path. + a. Make sure you have Python installed and on your PATH. b. Delete audacity\help\manual if it exists. c. The manual should be built in audacity\help\manual by the main Solution (step 2 below). - If you have disabled the 'Help' project uring testing you will have to + If you have disabled the 'Help' project during testing you will have to build it separately. If you just want to get the manual, go to -- Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july ___ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src TimerRecordDialog.cpp,1.16,1.17
Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv11851
Modified Files:
TimerRecordDialog.cpp
Log Message:
Change default duration to 1 hour, per suggestion by waxcylinder and Ed M, and
change initial focus on duration control.
Index: TimerRecordDialog.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/TimerRecordDialog.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- TimerRecordDialog.cpp 17 Oct 2009 22:49:17 - 1.16
+++ TimerRecordDialog.cpp 23 Oct 2009 18:10:52 - 1.17
@@ -70,7 +70,7 @@
wxDefaultSize, wxCAPTION)
{
m_DateTime_Start = wxDateTime::UNow();
- m_TimeSpan_Duration = wxTimeSpan::Minutes(5); // default 5 minute duration
+ m_TimeSpan_Duration = wxTimeSpan::Minutes(60); // default 1 hour duration
m_DateTime_End = m_DateTime_Start + m_TimeSpan_Duration;
m_pDatePickerCtrl_Start = NULL;
@@ -84,9 +84,9 @@
ShuttleGui S(this, eIsCreating);
this-PopulateOrExchange(S);
- // Set initial focus to 0 of 05m in Duration TimeTextCtrl, instead of
OK button (default).
+ // Set initial focus to 1 of 01h in Duration TimeTextCtrl, instead of
OK button (default).
m_pTimeTextCtrl_Duration-SetFocus();
- m_pTimeTextCtrl_Duration-SetFieldFocus(4);
+ m_pTimeTextCtrl_Duration-SetFieldFocus(3);
m_timer.SetOwner(this, TIMER_ID);
m_timer.Start(kTimerInterval);
--
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src/import ImportOGG.cpp, 1.36, 1.37 ImportPlugin.h, 1.16, 1.17
Update of /cvsroot/audacity/audacity-src/src/import In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv32446/import Modified Files: ImportOGG.cpp ImportPlugin.h Log Message: Update comments that refer to wxWindows to use wxWidgets. Index: ImportOGG.cpp === RCS file: /cvsroot/audacity/audacity-src/src/import/ImportOGG.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- ImportOGG.cpp 23 Mar 2009 00:32:54 - 1.36 +++ ImportOGG.cpp 20 Oct 2009 23:08:27 - 1.37 @@ -68,7 +68,7 @@ #include wx/intl.h /* ffile.h must be included AFTER at least one other wx header that includes * wx/setup.h, otherwise #ifdefs erronously collapse it to nothing. This is - * a bug in wxWindows (ffile.h should itself include wx/setup.h), and it + * a bug in wxWidgets (ffile.h should itself include wx/setup.h), and it * was a bitch to track down. */ #include wx/ffile.h Index: ImportPlugin.h === RCS file: /cvsroot/audacity/audacity-src/src/import/ImportPlugin.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- ImportPlugin.h 2 Feb 2009 17:11:04 - 1.16 +++ ImportPlugin.h 20 Oct 2009 23:08:27 - 1.17 @@ -16,7 +16,7 @@ UnusableImportPlugin, ImportPluginList and UnusableImportPluginList. Since this is part of libaudacity, it must not use any GUI parts - of wxWindows. + of wxWidgets. *////** -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference ___ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src/prefs DirectoriesPrefs.cpp, 1.43, 1.44 ThemePrefs.cpp, 1.20, 1.21 ThemePrefs.h, 1.8, 1.9
Update of /cvsroot/audacity/audacity-src/src/prefs
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv32446/prefs
Modified Files:
DirectoriesPrefs.cpp ThemePrefs.cpp ThemePrefs.h
Log Message:
Update comments that refer to wxWindows to use wxWidgets.
Index: ThemePrefs.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/prefs/ThemePrefs.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- ThemePrefs.cpp 4 Apr 2009 18:03:55 - 1.20
+++ ThemePrefs.cpp 20 Oct 2009 23:08:27 - 1.21
@@ -7,7 +7,7 @@
James Crook
Audacity is free software.
- This file is licensed under the wxWindows license, see License.txt
+ This file is licensed under the wxWidgets license, see License.txt
//**
Index: ThemePrefs.h
===
RCS file: /cvsroot/audacity/audacity-src/src/prefs/ThemePrefs.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ThemePrefs.h4 Apr 2009 10:55:58 - 1.8
+++ ThemePrefs.h20 Oct 2009 23:08:27 - 1.9
@@ -7,7 +7,7 @@
James Crook
Audacity is free software.
- This file is licensed under the wxWindows license, see License.txt
+ This file is licensed under the wxWidgets license, see License.txt
**/
Index: DirectoriesPrefs.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/prefs/DirectoriesPrefs.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- DirectoriesPrefs.cpp18 Oct 2009 08:02:15 - 1.43
+++ DirectoriesPrefs.cpp20 Oct 2009 23:08:27 - 1.44
@@ -180,7 +180,7 @@
}
if (!tempDir.Mkdir(0755, wxPATH_MKDIR_FULL)) {
- /* wxWindows throws up a decent looking dialog */
+ /* wxWidgets throws up a decent looking dialog */
return false;
}
}
--
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src/widgets AttachableScrollBar.cpp, 1.5, 1.6 AttachableScrollBar.h, 1.3, 1.4 Ruler.h, 1.32, 1.33
Update of /cvsroot/audacity/audacity-src/src/widgets
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv32446/widgets
Modified Files:
AttachableScrollBar.cpp AttachableScrollBar.h Ruler.h
Log Message:
Update comments that refer to wxWindows to use wxWidgets.
Index: AttachableScrollBar.h
===
RCS file: /cvsroot/audacity/audacity-src/src/widgets/AttachableScrollBar.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- AttachableScrollBar.h 18 Jun 2007 16:10:55 - 1.3
+++ AttachableScrollBar.h 20 Oct 2009 23:08:27 - 1.4
@@ -10,7 +10,7 @@
their scrolling.
Audacity is free software.
- This file is licensed under the wxWindows license, see License.txt
+ This file is licensed under the wxWidgets license, see License.txt
**/
Index: Ruler.h
===
RCS file: /cvsroot/audacity/audacity-src/src/widgets/Ruler.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- Ruler.h 21 Aug 2009 19:11:37 - 1.32
+++ Ruler.h 20 Oct 2009 23:08:27 - 1.33
@@ -239,7 +239,7 @@
// has border, selection markers, play marker.
// Once TrackPanel uses wxSizers, we will derive it from some
// wxWindow and the GetSize and SetSize functions
-// will then be wxWindows functions instead.
+// will then be wxWidgets functions instead.
class AUDACITY_DLL_API AdornedRulerPanel : public wxPanel
{
public:
Index: AttachableScrollBar.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/widgets/AttachableScrollBar.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- AttachableScrollBar.cpp 28 Mar 2007 04:14:05 - 1.5
+++ AttachableScrollBar.cpp 20 Oct 2009 23:08:27 - 1.6
@@ -7,7 +7,7 @@
James Crook
Audacity is free software.
- This file is licensed under the wxWindows license, see License.txt
+ This file is licensed under the wxWidgets license, see License.txt
*//**
--
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src/effects ChangePitch.cpp,1.54,1.55
Update of /cvsroot/audacity/audacity-src/src/effects In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv32446/effects Modified Files: ChangePitch.cpp Log Message: Update comments that refer to wxWindows to use wxWidgets. Index: ChangePitch.cpp === RCS file: /cvsroot/audacity/audacity-src/src/effects/ChangePitch.cpp,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- ChangePitch.cpp 16 Aug 2009 14:44:20 - 1.54 +++ ChangePitch.cpp 20 Oct 2009 23:08:27 - 1.55 @@ -714,7 +714,7 @@ // helper fns -// NOTE: wxWindows ref (C:\wxWindows_2.4.0\docs\htmlhelp) says +// NOTE: wxWidgets ref (C:\wxWidgets_2.4.0\docs\htmlhelp) says // wxRadioButton::SetSelection does not cause a // wxEVT_COMMAND_RadioButton_SELECTED event to get emitted, but it // calls SetFocus, which sure as heck DOES select the radio button. -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference ___ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src/effects/ladspa LadspaEffect.cpp, 1.54, 1.55
Update of /cvsroot/audacity/audacity-src/src/effects/ladspa In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv32446/effects/ladspa Modified Files: LadspaEffect.cpp Log Message: Update comments that refer to wxWindows to use wxWidgets. Index: LadspaEffect.cpp === RCS file: /cvsroot/audacity/audacity-src/src/effects/ladspa/LadspaEffect.cpp,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- LadspaEffect.cpp18 Jun 2009 00:40:06 - 1.54 +++ LadspaEffect.cpp20 Oct 2009 23:08:27 - 1.55 @@ -519,7 +519,7 @@ this-inputControls = inputControls; this-sampleRate = sampleRate; #ifdef __WXMSW__ - // On Windows, for some reason, wxWindows calls OnTextCtrl during creation + // On Windows, for some reason, wxWidgets calls OnTextCtrl during creation // of the text control, and LadspaEffectDialog::OnTextCtrl calls HandleText, // which assumes all the fields have been initialized. // This can give us a bad pointer crash, so manipulate inSlider to -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference ___ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src AboutDialog.cpp, 1.72, 1.73 AudacityApp.cpp, 1.250, 1.251 Experimental.h, 1.66, 1.67 Languages.cpp, 1.36, 1.37 Prefs.cpp, 1.26, 1.27 Prefs.h, 1.13, 1.14 Project.cpp, 1.
Update of /cvsroot/audacity/audacity-src/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv32446 Modified Files: AboutDialog.cpp AudacityApp.cpp Experimental.h Languages.cpp Prefs.cpp Prefs.h Project.cpp ShuttleGui.cpp ShuttleGui.h Theme.cpp Theme.h TrackPanel.cpp Log Message: Update comments that refer to wxWindows to use wxWidgets. Index: Languages.cpp === RCS file: /cvsroot/audacity/audacity-src/src/Languages.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- Languages.cpp 8 Sep 2009 17:54:08 - 1.36 +++ Languages.cpp 20 Oct 2009 23:08:26 - 1.37 @@ -17,10 +17,10 @@ language names (like Español, Français, and Português). We use our own list of translations of language names (i.e. Français instead of French) but we fallback on the language - name in wxWindows if we don't have it listed. + name in wxWidgets if we don't have it listed. This code is designed to work well with all of the current - languages, but adapt to any language that wxWindows supports. + languages, but adapt to any language that wxWidgets supports. Other languages will only be supported if they're added to the database using wxLocale::AddLanguage. Index: AboutDialog.cpp === RCS file: /cvsroot/audacity/audacity-src/src/AboutDialog.cpp,v retrieving revision 1.72 retrieving revision 1.73 diff -u -d -r1.72 -r1.73 --- AboutDialog.cpp 18 Oct 2009 07:55:30 - 1.72 +++ AboutDialog.cpp 20 Oct 2009 23:08:26 - 1.73 @@ -417,7 +417,7 @@ _(Audio playback and recording), wxString(wxT(v19))); informationStr += wxT(trtd); // start new row - // wxWindows version: + // wxWidgets version: informationStr += wxVERSION_STRING; informationStr += wxT(/tdtd/td); /* unicode or not? */ Index: AudacityApp.cpp === RCS file: /cvsroot/audacity/audacity-src/src/AudacityApp.cpp,v retrieving revision 1.250 retrieving revision 1.251 diff -u -d -r1.250 -r1.251 --- AudacityApp.cpp 15 Oct 2009 19:56:48 - 1.250 +++ AudacityApp.cpp 20 Oct 2009 23:08:26 - 1.251 @@ -969,7 +969,7 @@ LoadModules(*mCmdHandler); // Locale - // wxWindows 2.3 has a much nicer wxLocale API. We can make this code much + // wxWidgets 2.3 has a much nicer wxLocale API. We can make this code much // better once we move to wx 2.3/2.4. wxString lang = gPrefs-Read(wxT(/Locale/Language), wxT()); @@ -1277,7 +1277,7 @@ wxString presetsDefaultLoc = wxFileName(userdatadir, wxT(presets)).GetFullPath(); - // Stop wxWindows from printing its own error messages (not used ... does this really do anything?) + // Stop wxWidgets from printing its own error messages (not used ... does this really do anything?) wxLogNull logNo; // Try temp dir that was stored in prefs first @@ -1326,7 +1326,7 @@ tempFromPrefs = wxT(); #endif - // Stop wxWindows from printing its own error messages + // Stop wxWidgets from printing its own error messages wxLogNull logNo; Index: Theme.h === RCS file: /cvsroot/audacity/audacity-src/src/Theme.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- Theme.h 10 Feb 2009 03:44:20 - 1.16 +++ Theme.h 20 Oct 2009 23:08:27 - 1.17 @@ -7,7 +7,7 @@ James Crook Audacity is free software. - This file is licensed under the wxWindows license, see License.txt + This file is licensed under the wxWidgets license, see License.txt **/ Index: Prefs.h === RCS file: /cvsroot/audacity/audacity-src/src/Prefs.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- Prefs.h 9 Jul 2008 07:30:40 - 1.13 +++ Prefs.h 20 Oct 2009 23:08:26 - 1.14 @@ -7,7 +7,7 @@ Dominic Mazzoni Markus Meyer - Audacity uses wxWindows' wxFileConfig class to handle preferences. + Audacity uses wxWidgets' wxFileConfig class to handle preferences. In Audacity versions prior to 1.3.1, it used wxConfig, which would store the prefs in a platform-dependent way (e.g. in the registry on Windows). Now it always stores the settings in a configuration file Index: TrackPanel.cpp === RCS file: /cvsroot/audacity/audacity-src/src/TrackPanel.cpp,v retrieving revision 1.477 retrieving revision 1.478 diff -u -d -r1.477 -r1.478 --- TrackPanel.cpp 13 Sep 2009 03:19:20 - 1.477 +++ TrackPanel.cpp 20 Oct 2009 23:08:27 - 1.478 @@ -6419,7 +6419,7 @@ Refresh(false);
[Audacity-cvs] audacity-src/src/commands CommandManager.cpp, 1.76, 1.77
Update of /cvsroot/audacity/audacity-src/src/commands
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv32446/commands
Modified Files:
CommandManager.cpp
Log Message:
Update comments that refer to wxWindows to use wxWidgets.
Index: CommandManager.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/commands/CommandManager.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- CommandManager.cpp 12 Sep 2009 06:05:41 - 1.76
+++ CommandManager.cpp 20 Oct 2009 23:08:27 - 1.77
@@ -619,7 +619,7 @@
{
ID++;
- //Skip the reserved identifiers used by wxWindows
+ //Skip the reserved identifiers used by wxWidgets
if((ID = wxID_LOWEST) (ID = wxID_HIGHEST))
ID = wxID_HIGHEST+1;
--
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src/effects/vamp VampEffect.cpp, 1.14, 1.15
Update of /cvsroot/audacity/audacity-src/src/effects/vamp In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv32446/effects/vamp Modified Files: VampEffect.cpp Log Message: Update comments that refer to wxWindows to use wxWidgets. Index: VampEffect.cpp === RCS file: /cvsroot/audacity/audacity-src/src/effects/vamp/VampEffect.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- VampEffect.cpp 2 Jun 2009 05:03:15 - 1.14 +++ VampEffect.cpp 20 Oct 2009 23:08:27 - 1.15 @@ -334,7 +334,7 @@ mParameters = plugin-getParameterDescriptors(); #ifdef __WXMSW__ - // On Windows, for some reason, wxWindows calls OnTextCtrl during creation + // On Windows, for some reason, wxWidgets calls OnTextCtrl during creation // of the text control, and VampEffectDialog::OnTextCtrl calls HandleText, // which assumes all the fields have been initialized. // This can give us a bad pointer crash, so manipulate inSlider to -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference ___ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src TimerRecordDialog.cpp,1.15,1.16
Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv2905
Modified Files:
TimerRecordDialog.cpp
Log Message:
Decrease timer interval so timed recording stops closer to the specified time.
Index: TimerRecordDialog.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/TimerRecordDialog.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- TimerRecordDialog.cpp 8 Jun 2009 08:01:25 - 1.15
+++ TimerRecordDialog.cpp 17 Oct 2009 22:49:17 - 1.16
@@ -44,7 +44,7 @@
ID_TIMETEXT_DURATION
};
-const int kTimerInterval = 500; // every 500 ms = 2 updates per second
+const int kTimerInterval = 50; // ms
static double wxDateTime_to_AudacityTime(wxDateTime dateTime)
{
@@ -243,7 +243,7 @@
this-OnTimer(dummyTimerEvent);
// Loop for progress display during recording.
- while (bIsRecording updateResult == eProgressSuccess)
+ while (bIsRecording (updateResult == eProgressSuccess))
{
wxMilliSleep(kTimerInterval);
updateResult = progress.Update();
--
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src MixerBoard.cpp, 1.23, 1.24 MixerBoard.h, 1.14, 1.15
Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28031
Modified Files:
MixerBoard.cpp MixerBoard.h
Log Message:
Just get rid of the Pre Fade Meter checkbox.
If there's demand, it will probably be for affecting all MixerBoard meters.
Index: MixerBoard.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/MixerBoard.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- MixerBoard.cpp 15 Sep 2009 03:23:18 - 1.23
+++ MixerBoard.cpp 24 Sep 2009 00:59:04 - 1.24
@@ -90,7 +90,6 @@
ID_SLIDER_GAIN,
ID_TOGGLEBUTTON_MUTE,
ID_TOGGLEBUTTON_SOLO,
- ID_CHECKBOX_PREFADE,
};
BEGIN_EVENT_TABLE(MixerTrackCluster, wxPanel)
@@ -104,7 +103,6 @@
//v EVT_COMMAND_SCROLL(ID_SLIDER_GAIN,
MixerTrackCluster::OnSliderScroll_Gain)
EVT_COMMAND(ID_TOGGLEBUTTON_MUTE, wxEVT_COMMAND_BUTTON_CLICKED,
MixerTrackCluster::OnButton_Mute)
EVT_COMMAND(ID_TOGGLEBUTTON_SOLO, wxEVT_COMMAND_BUTTON_CLICKED,
MixerTrackCluster::OnButton_Solo)
- EVT_CHECKBOX(ID_CHECKBOX_PREFADE, MixerTrackCluster::OnCheckBox_PreFade)
END_EVENT_TABLE()
MixerTrackCluster::MixerTrackCluster(wxWindow* parent,
@@ -213,19 +211,11 @@
// meter
ctrlPos.y += (bSoloNone ? 0 : MUTE_SOLO_HEIGHT) + kDoubleInset;
- mCheckBox_PreFade =
- new wxCheckBox(this, ID_CHECKBOX_PREFADE,
- _(Pre), ctrlPos, wxDefaultSize);
- mCheckBox_PreFade-SetValue(false);
-
- ctrlSize = mCheckBox_PreFade-GetSize();
- ctrlPos.y += ctrlSize.GetHeight();
const int nMeterHeight =
nGainSliderHeight -
(MUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH + kDoubleInset) -
(PAN_HEIGHT + kDoubleInset) -
- (MUTE_SOLO_HEIGHT + (bSoloNone ? 0 : MUTE_SOLO_HEIGHT) + kDoubleInset) -
- ctrlSize.GetHeight();
+ (MUTE_SOLO_HEIGHT + (bSoloNone ? 0 : MUTE_SOLO_HEIGHT) + kDoubleInset);
ctrlSize.Set(kRightSideStackWidth, nMeterHeight);
mMeter =
new Meter(this, -1, // wxWindow* parent, wxWindowID id,
@@ -237,7 +227,6 @@
mStaticText_TrackName-SetToolTip(mLeftTrack-GetName());
mToggleButton_Mute-SetToolTip(_(Mute));
mToggleButton_Solo-SetToolTip(_(Solo));
- mCheckBox_PreFade-SetToolTip(_(Show meter pre/post fade.));
mMeter-SetToolTip(_(Signal Level Meter));
#endif // wxUSE_TOOLTIPS
@@ -271,12 +260,10 @@
mToggleButton_Solo-Show(!bSoloNone);
- wxSize ctrlSize = mCheckBox_PreFade-GetSize();
const int nRequiredHeightAboveMeter =
MUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH + kDoubleInset +
PAN_HEIGHT + kDoubleInset +
- MUTE_SOLO_HEIGHT + (bSoloNone ? 0 : MUTE_SOLO_HEIGHT) + kDoubleInset +
- ctrlSize.GetHeight();
+ MUTE_SOLO_HEIGHT + (bSoloNone ? 0 : MUTE_SOLO_HEIGHT) + kDoubleInset;
const int nMeterY =
kDoubleInset + // margin at top
TRACK_NAME_HEIGHT + kDoubleInset +
@@ -402,7 +389,7 @@
else
{
// Mono: Start with raw values same as left.
- // To be modified by pre/post fade and channel pan/gain.
+ // To be modified by bWantPostFadeValues and channel pan/gain.
maxRight[i] = maxLeft[i];
rmsRight[i] = rmsLeft[i];
}
@@ -411,8 +398,8 @@
i++;
}
- // If we want post fade values, modify values by gain factor.
- if (bSuccess !mCheckBox_PreFade-GetValue())
+ bool bWantPostFadeValues = true; //v Turn this into a checkbox on
MixerBoard?
+ if (bSuccess bWantPostFadeValues)
{
for (i = 0; i nFramesPerBuffer; i++)
{
@@ -600,10 +587,6 @@
mProject-RefreshTPTrack(mLeftTrack);
}
-void MixerTrackCluster::OnCheckBox_PreFade(wxCommandEvent event)
-{
-}
-
// class MusicalInstrument
Index: MixerBoard.h
===
RCS file: /cvsroot/audacity/audacity-src/src/MixerBoard.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- MixerBoard.h15 Sep 2009 20:03:24 - 1.14
+++ MixerBoard.h24 Sep 2009 00:59:04 - 1.15
@@ -22,7 +22,6 @@
#include wx/scrolwin.h
#include wx/statbmp.h
#include wx/stattext.h
-#include wx/checkbox.h
#include widgets/AButton.h
#include widgets/ASlider.h
@@ -104,7 +103,6 @@
void OnSlider_Pan(wxCommandEvent event);
void OnButton_Mute(wxCommandEvent event);
void OnButton_Solo(wxCommandEvent event);
- void OnCheckBox_PreFade(wxCommandEvent event);
//v void OnSliderScroll_Gain(wxScrollEvent event);
public:
@@ -122,8 +120,6 @@
AButton* mToggleButton_Solo;
MixerTrackSlider* mSlider_Pan;
MixerTrackSlider* mSlider_Gain;
-
- wxCheckBox* mCheckBox_PreFade;
Meter* mMeter;
public:
--
Come build with us! The BlackBerryreg; Developer Conference in SF, CA
is the only developer event you need to
[Audacity-cvs] audacity-src/src MixerBoard.cpp, 1.22, 1.23 MixerBoard.h, 1.12, 1.13
Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12105
Modified Files:
MixerBoard.cpp MixerBoard.h
Log Message:
Add a pre/post fade checkbox for the meter in each track strip.
Index: MixerBoard.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/MixerBoard.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- MixerBoard.cpp 10 Sep 2009 06:28:25 - 1.22
+++ MixerBoard.cpp 15 Sep 2009 03:23:18 - 1.23
@@ -86,23 +86,25 @@
enum {
ID_BITMAPBUTTON_MUSICAL_INSTRUMENT = 13000,
- ID_TOGGLEBUTTON_MUTE,
- ID_TOGGLEBUTTON_SOLO,
ID_SLIDER_PAN,
ID_SLIDER_GAIN,
+ ID_TOGGLEBUTTON_MUTE,
+ ID_TOGGLEBUTTON_SOLO,
+ ID_CHECKBOX_PREFADE,
};
BEGIN_EVENT_TABLE(MixerTrackCluster, wxPanel)
EVT_CHAR(MixerTrackCluster::OnKeyEvent)
EVT_MOUSE_EVENTS(MixerTrackCluster::OnMouseEvent)
+ EVT_PAINT(MixerTrackCluster::OnPaint)
EVT_BUTTON(ID_BITMAPBUTTON_MUSICAL_INSTRUMENT,
MixerTrackCluster::OnButton_MusicalInstrument)
- EVT_COMMAND(ID_TOGGLEBUTTON_MUTE, wxEVT_COMMAND_BUTTON_CLICKED,
MixerTrackCluster::OnButton_Mute)
- EVT_COMMAND(ID_TOGGLEBUTTON_SOLO, wxEVT_COMMAND_BUTTON_CLICKED,
MixerTrackCluster::OnButton_Solo)
- EVT_PAINT(MixerTrackCluster::OnPaint)
EVT_SLIDER(ID_SLIDER_PAN, MixerTrackCluster::OnSlider_Pan)
EVT_SLIDER(ID_SLIDER_GAIN, MixerTrackCluster::OnSlider_Gain)
//v EVT_COMMAND_SCROLL(ID_SLIDER_GAIN,
MixerTrackCluster::OnSliderScroll_Gain)
+ EVT_COMMAND(ID_TOGGLEBUTTON_MUTE, wxEVT_COMMAND_BUTTON_CLICKED,
MixerTrackCluster::OnButton_Mute)
+ EVT_COMMAND(ID_TOGGLEBUTTON_SOLO, wxEVT_COMMAND_BUTTON_CLICKED,
MixerTrackCluster::OnButton_Solo)
+ EVT_CHECKBOX(ID_CHECKBOX_PREFADE, MixerTrackCluster::OnCheckBox_PreFade)
END_EVENT_TABLE()
MixerTrackCluster::MixerTrackCluster(wxWindow* parent,
@@ -211,11 +213,19 @@
// meter
ctrlPos.y += (bSoloNone ? 0 : MUTE_SOLO_HEIGHT) + kDoubleInset;
+ mCheckBox_PreFade =
+ new wxCheckBox(this, ID_CHECKBOX_PREFADE,
+ _(Pre), ctrlPos, wxDefaultSize);
+ mCheckBox_PreFade-SetValue(false);
+
+ ctrlSize = mCheckBox_PreFade-GetSize();
+ ctrlPos.y += ctrlSize.GetHeight();
const int nMeterHeight =
nGainSliderHeight -
(MUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH + kDoubleInset) -
(PAN_HEIGHT + kDoubleInset) -
- (MUTE_SOLO_HEIGHT + (bSoloNone ? 0 : MUTE_SOLO_HEIGHT) + kDoubleInset);
+ (MUTE_SOLO_HEIGHT + (bSoloNone ? 0 : MUTE_SOLO_HEIGHT) + kDoubleInset) -
+ ctrlSize.GetHeight();
ctrlSize.Set(kRightSideStackWidth, nMeterHeight);
mMeter =
new Meter(this, -1, // wxWindow* parent, wxWindowID id,
@@ -227,6 +237,7 @@
mStaticText_TrackName-SetToolTip(mLeftTrack-GetName());
mToggleButton_Mute-SetToolTip(_(Mute));
mToggleButton_Solo-SetToolTip(_(Solo));
+ mCheckBox_PreFade-SetToolTip(_(Show meter pre/post fade.));
mMeter-SetToolTip(_(Signal Level Meter));
#endif // wxUSE_TOOLTIPS
@@ -260,10 +271,12 @@
mToggleButton_Solo-Show(!bSoloNone);
+ wxSize ctrlSize = mCheckBox_PreFade-GetSize();
const int nRequiredHeightAboveMeter =
MUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH + kDoubleInset +
PAN_HEIGHT + kDoubleInset +
- MUTE_SOLO_HEIGHT + (bSoloNone ? 0 : MUTE_SOLO_HEIGHT) + kDoubleInset;
+ MUTE_SOLO_HEIGHT + (bSoloNone ? 0 : MUTE_SOLO_HEIGHT) + kDoubleInset +
+ ctrlSize.GetHeight();
const int nMeterY =
kDoubleInset + // margin at top
TRACK_NAME_HEIGHT + kDoubleInset +
@@ -389,7 +402,7 @@
else
{
// Mono: Start with raw values same as left.
- // To be modified by bWantPostFadeValues and channel pan/gain.
+ // To be modified by pre/post fade and channel pan/gain.
maxRight[i] = maxLeft[i];
rmsRight[i] = rmsLeft[i];
}
@@ -398,8 +411,8 @@
i++;
}
- bool bWantPostFadeValues = true; //vvv Turn this into a pref, default true.
- if (bSuccess bWantPostFadeValues)
+ // If we want post fade values, modify values by gain factor.
+ if (bSuccess !mCheckBox_PreFade-GetValue())
{
for (i = 0; i nFramesPerBuffer; i++)
{
@@ -525,6 +538,31 @@
this-HandleSelect(bShiftDown);
}
+void MixerTrackCluster::OnSlider_Gain(wxCommandEvent event)
+{
+ this-HandleSliderGain();
+}
+
+//v void MixerTrackCluster::OnSliderScroll_Gain(wxScrollEvent event)
+//{
+ //int sliderValue = (int)(mSlider_Gain-Get()); //v
mSlider_Gain-GetValue();
+ //#ifdef __WXMSW__
+ // // Negate because wxSlider on Windows has min at top, max at bottom.
+ // // mSlider_Gain-GetValue() is in [-6,36]. wxSlider has min at top, so
this is [-36dB,6dB].
+ // sliderValue = -sliderValue;
+ //#endif
+ //wxString str = _(Gain: );
+ //if (sliderValue 0)
+ // str += +;
+ //str +=
[Audacity-cvs] audacity-src/src/blockfile ODPCMAliasBlockFile.cpp, 1.22, 1.23
Update of /cvsroot/audacity/audacity-src/src/blockfile
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv19472/src/blockfile
Modified Files:
ODPCMAliasBlockFile.cpp
Log Message:
Fit of passion.
Pit of fashion.
Index: ODPCMAliasBlockFile.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/blockfile/ODPCMAliasBlockFile.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- ODPCMAliasBlockFile.cpp 24 Aug 2009 17:25:59 - 1.22
+++ ODPCMAliasBlockFile.cpp 10 Sep 2009 06:20:22 - 1.23
@@ -382,7 +382,7 @@
return retval;
}
-///Calls write summary, and makes sure it is only done once in a thread-safe
fasion.
+///Calls write summary, and makes sure it is only done once in a thread-safe
fashion.
void ODPCMAliasBlockFile::DoWriteSummary()
{
mWriteSummaryMutex.Lock();
--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src MixerBoard.cpp, 1.21, 1.22 MixerBoard.h, 1.11, 1.12 Project.cpp, 1.451, 1.452 Project.h, 1.164, 1.165 TrackPanel.h, 1.139, 1.140
Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv21132/src
Modified Files:
MixerBoard.cpp MixerBoard.h Project.cpp Project.h TrackPanel.h
Log Message:
Fix bugs in MixerBoard handling of Solo Button style Simple.
Add MixerBoard handling for Solo Button style None.
Fix Solaris compile bug.
Index: Project.h
===
RCS file: /cvsroot/audacity/audacity-src/src/Project.h,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -d -r1.164 -r1.165
--- Project.h 21 Aug 2009 19:18:47 - 1.164
+++ Project.h 10 Sep 2009 06:28:25 - 1.165
@@ -389,7 +389,9 @@
static bool GetCacheBlockFiles();
- bool IsSimpleSolo() { return mSoloPref == wxT(Simple); };
+ public:
+ bool IsSoloSimple() { return mSoloPref == wxT(Simple); };
+ bool IsSoloNone() { return mSoloPref == wxT(None); };
private:
Index: MixerBoard.h
===
RCS file: /cvsroot/audacity/audacity-src/src/MixerBoard.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- MixerBoard.h22 Aug 2009 00:00:42 - 1.11
+++ MixerBoard.h10 Sep 2009 06:28:25 - 1.12
@@ -193,10 +193,11 @@
wxBitmap* GetMusicalInstrumentBitmap(const WaveTrack* pLeftTrack);
bool HasSolo();
- void IncrementSoloCount(int nIncrement = 1);
void RefreshTrackCluster(const WaveTrack* pLeftTrack, bool bEraseBackground
= true);
void RefreshTrackClusters(bool bEraseBackground = true);
+ void ResizeTrackClusters();
+
void ResetMeters();
void UpdateName(const WaveTrack* pLeftTrack);
@@ -240,7 +241,6 @@
MusicalInstrumentArray mMusicalInstruments;
AudacityProject* mProject;
MixerBoardScrolledWindow* mScrolledWindow; // Holds the MixerTrackClusters
and handles scrolling.
- unsigned int mSoloCount;
double mPrevT1;
TrackList* mTracks;
@@ -270,4 +270,5 @@
#endif // __AUDACITY_MIXER_BOARD__
-#endif // EXPERIMENTAL_MIXER_BOARD
\ No newline at end of file
+#endif // EXPERIMENTAL_MIXER_BOARD
+
Index: TrackPanel.h
===
RCS file: /cvsroot/audacity/audacity-src/src/TrackPanel.h,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -d -r1.139 -r1.140
--- TrackPanel.h26 Jul 2009 02:44:50 - 1.139
+++ TrackPanel.h10 Sep 2009 06:28:25 - 1.140
@@ -392,7 +392,6 @@
int IdOfFormat( int format );
// Accessors...
- bool IsSimpleSolo(){ return mSoloPref==wxT(Simple);};
bool HasSoloButton(){ return mSoloPref!=wxT(None);};
//JKC: These two belong in the label track.
Index: MixerBoard.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/MixerBoard.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- MixerBoard.cpp 31 Aug 2009 01:20:11 - 1.21
+++ MixerBoard.cpp 10 Sep 2009 06:28:25 - 1.22
@@ -205,15 +205,17 @@
*(mMixerBoard-mImageSoloDown),
*(mMixerBoard-mImageSoloDisabled),
true); // toggle button
this-UpdateSolo();
+ bool bSoloNone = mProject-IsSoloNone();
+ mToggleButton_Solo-Show(!bSoloNone);
// meter
- ctrlPos.y += MUTE_SOLO_HEIGHT + kDoubleInset;
+ ctrlPos.y += (bSoloNone ? 0 : MUTE_SOLO_HEIGHT) + kDoubleInset;
const int nMeterHeight =
nGainSliderHeight -
(MUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH + kDoubleInset) -
(PAN_HEIGHT + kDoubleInset) -
- (MUTE_SOLO_HEIGHT + MUTE_SOLO_HEIGHT + kDoubleInset);
+ (MUTE_SOLO_HEIGHT + (bSoloNone ? 0 : MUTE_SOLO_HEIGHT) + kDoubleInset);
ctrlSize.Set(kRightSideStackWidth, nMeterHeight);
mMeter =
new Meter(this, -1, // wxWindow* parent, wxWindowID id,
@@ -223,9 +225,9 @@
#if wxUSE_TOOLTIPS
mStaticText_TrackName-SetToolTip(mLeftTrack-GetName());
- mToggleButton_Mute-SetToolTip(_T(Mute));
- mToggleButton_Solo-SetToolTip(_T(Solo));
- mMeter-SetToolTip(_T(Signal Level Meter));
+ mToggleButton_Mute-SetToolTip(_(Mute));
+ mToggleButton_Solo-SetToolTip(_(Solo));
+ mMeter-SetToolTip(_(Signal Level Meter));
#endif // wxUSE_TOOLTIPS
#ifdef __WXMAC__
@@ -245,7 +247,8 @@
this-SetSize(-1, newClusterHeight);
- // Change only the heights of mSlider_Gain and mMeter.
+ // Change only the heights of mSlider_Gain and mMeter.
+ // But update shown status of mToggleButton_Solo, which affects top of
mMeter.
const int nGainSliderHeight =
newClusterHeight -
(kInset + // margin above mStaticText_TrackName
@@ -253,12 +256,20 @@
kQuadrupleInset; // margin below gain slider
mSlider_Gain-SetSize(-1, nGainSliderHeight);
- const int nMeterHeight =
[Audacity-cvs] audacity-src/win audacity_audiotouch.iss, 1.1.2.5, 1.1.2.6
Update of /cvsroot/audacity/audacity-src/win In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27237 Modified Files: Tag: Audacity_UmixIt audacity_audiotouch.iss Log Message: For Audiotouch custom version: Increment version. Index: audacity_audiotouch.iss === RCS file: /cvsroot/audacity/audacity-src/win/Attic/audacity_audiotouch.iss,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -u -d -r1.1.2.5 -r1.1.2.6 --- audacity_audiotouch.iss 2 Jul 2009 22:40:39 - 1.1.2.5 +++ audacity_audiotouch.iss 8 Sep 2009 21:42:11 - 1.1.2.6 @@ -3,7 +3,7 @@ [Setup] ; compiler-related directives -OutputBaseFilename=audacity-audiotouch-win-1.2.6a7 +OutputBaseFilename=audacity-audiotouch-win-1.2.6a8 SetupIconFile=Audacity.ico WizardImageFile=audacity_InnoWizardImage.bmp -- Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july ___ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src AudioIO.cpp, 1.100.2.27.2.2, 1.100.2.27.2.3 ControlToolBar.cpp, 1.61.2.14.2.11, 1.61.2.14.2.12 Menus.cpp, 1.151.2.26.2.18, 1.151.2.26.2.19 Project.cpp, 1.178.2.17.2.31,
Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv5830
Modified Files:
Tag: Audacity_UmixIt
AudioIO.cpp ControlToolBar.cpp Menus.cpp Project.cpp
TrackPanel.cpp Audacity.h AudioIO.h Menus.h
Log Message:
For Audiotouch custom version: Add Append Recording toggle.
Index: Audacity.h
===
RCS file: /cvsroot/audacity/audacity-src/src/Audacity.h,v
retrieving revision 1.20.2.17.2.10
retrieving revision 1.20.2.17.2.11
diff -u -d -r1.20.2.17.2.10 -r1.20.2.17.2.11
--- Audacity.h 2 Jul 2009 22:40:38 - 1.20.2.17.2.10
+++ Audacity.h 8 Sep 2009 00:18:27 - 1.20.2.17.2.11
@@ -20,7 +20,7 @@
// Increment this every time you release a new version
#if (AUDACITY_BRANDING == BRAND_AUDIOTOUCH)
- #define AUDACITY_VERSION_STRING 1.2.6a7
+ #define AUDACITY_VERSION_STRING 1.2.6a8
#elif (AUDACITY_BRANDING == BRAND_UMIXIT)
#define AUDACITY_VERSION_STRING 1.2.6.1
#else
Index: AudioIO.h
===
RCS file: /cvsroot/audacity/audacity-src/src/AudioIO.h,v
retrieving revision 1.33.2.6
retrieving revision 1.33.2.6.2.1
diff -u -d -r1.33.2.6 -r1.33.2.6.2.1
--- AudioIO.h 23 Mar 2006 09:01:15 - 1.33.2.6
+++ AudioIO.h 8 Sep 2009 00:18:27 - 1.33.2.6.2.1
@@ -134,6 +134,8 @@
sampleFormat GetCaptureFormat() { return mCaptureFormat; }
int GetNumCaptureChannels() { return mNumCaptureChannels; }
+ void SetWantLatencyCorrection(const bool bWant) { mWantLatencyCorrection =
bWant; };
+
private:
bool StartPortAudioStream(double sampleRate,
@@ -181,6 +183,8 @@
boolmNoModifyDevice;
#endif
double mLastRecordingOffset;
+ boolmWantLatencyCorrection;
+
unsigned intmNumCaptureChannels;
unsigned intmNumPlaybackChannels;
sampleFormatmCaptureFormat;
Index: ControlToolBar.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/Attic/ControlToolBar.cpp,v
retrieving revision 1.61.2.14.2.11
retrieving revision 1.61.2.14.2.12
diff -u -d -r1.61.2.14.2.11 -r1.61.2.14.2.12
--- ControlToolBar.cpp 29 Mar 2009 06:52:45 - 1.61.2.14.2.11
+++ ControlToolBar.cpp 8 Sep 2009 00:18:26 - 1.61.2.14.2.12
@@ -1145,7 +1145,7 @@
}
else
{
-//vvv evt.GetClassInfo();
+//v evt.GetClassInfo();
}
#else
mRecord-PopUp();
@@ -1192,6 +1192,14 @@
double t1 = p-GetSel1();
if (t1 == t0)
t1 = 10.0; // record for a long, long time (tens of years)
+ #if (AUDACITY_BRANDING == BRAND_AUDIOTOUCH)
+ if (p-m_bWantAppendRecording)
+ {
+t0 = t-GetEndTime();
+t1 = 10.0; // record for a long, long time (tens of
years)
+ }
+ gAudioIO-SetWantLatencyCorrection(!p-m_bWantAppendRecording);
+ #endif
/* TODO: set up stereo tracks if that is how the user has set up
* their preferences, and choose sample format based on prefs */
Index: AudioIO.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/AudioIO.cpp,v
retrieving revision 1.100.2.27.2.2
retrieving revision 1.100.2.27.2.3
diff -u -d -r1.100.2.27.2.2 -r1.100.2.27.2.3
--- AudioIO.cpp 26 Feb 2007 09:36:22 - 1.100.2.27.2.2
+++ AudioIO.cpp 8 Sep 2009 00:18:25 - 1.100.2.27.2.3
@@ -143,6 +143,7 @@
AudioIO::AudioIO()
{
+ mWantLatencyCorrection = true;
mAudioThreadShouldCallFillBuffersOnce = false;
mAudioThreadFillBuffersLoopRunning = false;
#if USE_PORTAUDIO_V19
@@ -996,11 +997,12 @@
if( mCaptureTracks.GetCount() 0 )
{
for( unsigned int i = 0; i mCaptureTracks.GetCount(); i++ )
-{
- delete mCaptureBuffers[i];
- mCaptureTracks[i]-Flush();
+ {
+delete mCaptureBuffers[i];
+mCaptureTracks[i]-Flush();
+if (mWantLatencyCorrection)
mCaptureTracks[i]-Offset(mLastRecordingOffset);
-}
+ }
delete[] mCaptureBuffers;
}
Index: TrackPanel.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/TrackPanel.cpp,v
retrieving revision 1.212.2.15.2.21
retrieving revision 1.212.2.15.2.22
diff -u -d -r1.212.2.15.2.21 -r1.212.2.15.2.22
--- TrackPanel.cpp 18 Mar 2009 22:44:16 - 1.212.2.15.2.21
+++ TrackPanel.cpp 8 Sep 2009 00:18:27 - 1.212.2.15.2.22
@@ -4576,20 +4576,19 @@
return OnFloatID;// Compiler food.
}
-/// Puts a check mark at a given position in a menu, clearing all other check
marks.
+// Puts a check mark at a given position in a menu, clearing all other check
marks.
void
Re: [Audacity-cvs] [Audacity-devel] audacity-src/win/Projects/Audacity Audacity.vcproj, 1.53, 1.54
Definitely, I agree. Thanks for fixing it, Martyn. Your fix looks right to me. - V Martyn Shaw wrote: Ouch! LRN wrote: Update of /cvsroot/audacity/audacity-src/win/Projects/Audacity In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv10949/win/Projects/Audacity Modified Files: Audacity.vcproj Log Message: Forward-ported FFmpeg-0.5 compatibility code Index: Audacity.vcproj === RCS file: /cvsroot/audacity/audacity-src/win/Projects/Audacity/Audacity.vcproj,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- Audacity.vcproj 17 Aug 2009 22:11:36 - 1.53 +++ Audacity.vcproj 31 Aug 2009 21:38:28 - 1.54 @@ -133,7 +133,7 @@ Tool Name=VCCLCompilerTool Optimization=0 - AdditionalIncludeDirectories=quot;$(WXWIN)\lib\vc_dll\mswudquot;;quot;$(WXWIN)\includequot;;..\..;..\..\..\src\include\win32;..\..\..\src\include;quot;..\..\..\lib-src\FileDialogquot;;quot;..\..\..\lib-src\expatquot;;quot;..\..\..\lib-src\ffmpeg\win32quot;;quot;..\..\..\lib-src\ffmpegquot;;quot;..\..\..\lib-src\lib-widget-extraquot;;quot;..\..\..\lib-src\libflac\includequot;;quot;..\..\..\lib-src\libid3tagquot;;quot;..\..\..\lib-src\liblrdfquot;;quot;..\..\..\lib-src\libmadquot;;quot;..\..\..\lib-src\libnyquistquot;;quot;..\..\..\lib-src\libogg\includequot;;quot;..\..\..\lib-src\libresample\includequot;;quot;..\..\..\lib-src\libsamplerate\srcquot;;quot;..\..\..\lib-src\libscorealignquot;;..\libsndfile;quot;..\..\..\lib-src\libvampquot;;quot;..\..\..\lib-src\libvorbis\includequot;;quot;..\..\..\lib-src\portaudio-v19\includequot;;quot;..\..\..\lib-src\portmixer\includequot;;quot;..\..\..\lib-src\portsmfquot;;quot;..\..\..\lib- src\redland\raptor\srcquot;;quot;..\..\..\lib-src\slv2quot;;quot;..\..\..\lib-src\sbsms\includequot;;quot;..\..\..\lib-src\soundtouch\includequot;;quot;..\..\..\lib-src\twolame\libtwolamequot;;quot;..\..\..\lib-src\portmidi\pm_commonquot;;quot;..\..\..\lib-src\portmidi\pm_winquot;;quot;..\..\..\lib-src\portmidi\porttimequot; + AdditionalIncludeDirectories=quot;d:\projects\wxWidgets-2.8.8\lib\vc_dll\mswudquot;;quot;d:\projects\wxWidgets-2.8.8\includequot;;..\..;..\..\..\src\include\win32;..\..\..\src\include;quot;..\..\..\lib-src\FileDialogquot;;quot;..\..\..\lib-src\expatquot;;quot;..\..\..\lib-src\lib-widget-extraquot;;quot;..\..\..\lib-src\libflac\includequot;;quot;..\..\..\lib-src\libid3tagquot;;quot;..\..\..\lib-src\liblrdfquot;;quot;..\..\..\lib-src\libmadquot;;quot;..\..\..\lib-src\libnyquistquot;;quot;..\..\..\lib-src\libogg\includequot;;quot;..\..\..\lib-src\libresample\includequot;;quot;..\..\..\lib-src\libsamplerate\srcquot;;quot;..\..\..\lib-src\libscorealignquot;;..\libsndfile;quot;..\..\..\lib-src\libvampquot;;quot;..\..\..\lib-src\libvorbis\includequot;;quot;..\..\..\lib-src\portaudio-v19\includequot;;quot;..\..\..\lib-src\portmixer\includequot;;quot;..\..\..\lib-src\portsmfquot;;quot;..\..\..\lib-src\redland\raptor\srcquot;;quot;..\.. \..\lib-src\slv2quot;;quot;..\..\..\lib-src\sbsms\includequot;;quot;..\..\..\lib-src\soundtouch\includequot;;quot;..\..\..\lib-src\twolame\libtwolamequot;;quot;..\..\..\lib-src\portmidi\pm_commonquot;;quot;..\..\..\lib-src\portmidi\pm_winquot;;quot;..\..\..\lib-src\portmidi\porttimequot;;quot;..\..\..\lib-src\ffmpeg\win32quot;;quot;..\..\..\lib-src\ffmpeg\stablequot; Ouch! Use $(WXWIN)! Ouch again! lib-src\ffmpeg\stable is not in CVS. I changed it to point to lib-src\ffmpeg so at least I can compile again. I've no idea if that is a good plan. Please check that patches work on a clean checkout in future. TTFN Martyn PreprocessorDefinitions=BUILDING_AUDACITY;FLAC__NO_DLL;__STDC_CONSTANT_MACROS;WXUSINGDLL;__WXMSW__;__WXDEBUG__;_DEBUG;WIN32;STRICT StringPooling=true BasicRuntimeChecks=3 -- Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july ___ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs -- Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now.
[Audacity-cvs] audacity-src/src MixerBoard.cpp,1.20,1.21
Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv6433
Modified Files:
MixerBoard.cpp
Log Message:
Another layout revision:
* Put all controls but track name and gain slider in right side stack.
* Moved Mute/Solo back to near Pan slider.
Index: MixerBoard.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/MixerBoard.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- MixerBoard.cpp 21 Aug 2009 23:09:35 - 1.20
+++ MixerBoard.cpp 31 Aug 2009 01:20:11 - 1.21
@@ -81,9 +81,8 @@
#define PAN_HEIGHT 24
#define kLeftSideStackWidth MUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH -
kDoubleInset //v Change when numbers shown on slider scale.
-#define kRightSideStackWidthMUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH +
kInset
-#define kRequiredHeightBelowMeter (2 * (kDoubleInset + MUTE_SOLO_HEIGHT)) +
kQuadrupleInset // mute/solo buttons stacked at bottom right
-#define kMixerTrackClusterWidth kLeftSideStackWidth + kRightSideStackWidth
+ kQuadrupleInset // kInset margin on both sides
+#define kRightSideStackWidthMUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH +
kDoubleInset
+#define kMixerTrackClusterWidth kLeftSideStackWidth + kRightSideStackWidth
+ kQuadrupleInset // kDoubleInset margin on both sides
enum {
ID_BITMAPBUTTON_MUSICAL_INSTRUMENT = 13000,
@@ -120,8 +119,6 @@
this-SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
- // Create the controls programmatically.
-
// Not sure why, but sizers weren't getting offset vertically,
// probably because not using wxDefaultPosition,
// so positions are calculated explicitly below, and sizers code was
removed.
@@ -137,34 +134,12 @@
//mStaticText_TrackName-SetBackgroundColour(this-GetTrackColor());
- // pan slider
- ctrlPos.x = size.GetWidth() / 10;
- ctrlPos.y += TRACK_NAME_HEIGHT + kDoubleInset;
- ctrlSize = wxSize((size.GetWidth() * 4 / 5), PAN_HEIGHT);
-
- // The width of the pan slider must be odd (don't ask).
- if (!(ctrlSize.x 1))
- ctrlSize.x--;
-
- mSlider_Pan =
- new MixerTrackSlider(
-this, ID_SLIDER_PAN,
-/* i18n-hint: Title of the Pan slider, used to move the sound left
or right */
-_(Pan),
-ctrlPos, ctrlSize, PAN_SLIDER, true);
-
- this-UpdatePan();
-
-
// gain slider at left
ctrlPos.x = kDoubleInset;
- ctrlPos.y += PAN_HEIGHT + kDoubleInset;
-
+ ctrlPos.y += TRACK_NAME_HEIGHT + kDoubleInset;
const int nGainSliderHeight =
size.GetHeight() - ctrlPos.y - kQuadrupleInset;
- ctrlSize =
- wxSize(kLeftSideStackWidth - kQuadrupleInset, nGainSliderHeight);
-
+ ctrlSize.Set(kLeftSideStackWidth - kQuadrupleInset, nGainSliderHeight);
mSlider_Gain =
new MixerTrackSlider(
this, ID_SLIDER_GAIN,
@@ -172,23 +147,14 @@
_(Gain),
ctrlPos, ctrlSize, DB_SLIDER, true,
true, 0.0, wxVERTICAL);
-
- // too much color:
mSlider_Gain-SetBackgroundColour(this-GetTrackColor());
- // too dark:
mSlider_Gain-SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW));
- //#ifdef __WXMAC__
- // mSlider_Gain-SetBackgroundColour(wxColour(220, 220, 220));
- //#else
- // mSlider_Gain-SetBackgroundColour(wxColour(192, 192, 192));
- //#endif
-
this-UpdateGain();
- // meter and other controls at right
+ // other controls and meter at right
// musical instrument image
- ctrlPos.x = kInset + kLeftSideStackWidth;
- ctrlSize = wxSize(MUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH,
MUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH);
+ ctrlPos.x += kLeftSideStackWidth + kInset; // + kInset to center it in
right side stack
+ ctrlSize.Set(MUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH,
MUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH);
wxBitmap* bitmap = mMixerBoard-GetMusicalInstrumentBitmap(mLeftTrack);
wxASSERT(bitmap);
mBitmapButton_MusicalInstrument =
@@ -198,22 +164,28 @@
_(Musical Instrument));
- // meter
+ // pan slider
+ ctrlPos.x -= kInset; // Remove inset for instrument, so Pan is at leftmost
of left side stack.
ctrlPos.y += MUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH + kDoubleInset;
- const int nMeterHeight =
- nGainSliderHeight -
- (MUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH + kDoubleInset) -
- kQuadrupleInset - kRequiredHeightBelowMeter;
- ctrlSize.Set(kRightSideStackWidth, nMeterHeight);
- mMeter =
- new Meter(this, -1, // wxWindow* parent, wxWindowID id,
-false, // bool isInput
-ctrlPos, ctrlSize, // const wxPoint pos = wxDefaultPosition,
const wxSize size = wxDefaultSize,
-Meter::MixerTrackCluster); // Style style = HorizontalStereo,
+ ctrlSize.Set(kRightSideStackWidth, PAN_HEIGHT);
[Audacity-cvs] audacity-src/src Audacity.h,1.69,1.70
Update of /cvsroot/audacity/audacity-src/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv423 Modified Files: Audacity.h Log Message: update for release Index: Audacity.h === RCS file: /cvsroot/audacity/audacity-src/src/Audacity.h,v retrieving revision 1.69 retrieving revision 1.70 diff -u -d -r1.69 -r1.70 --- Audacity.h 26 Jul 2009 01:56:43 - 1.69 +++ Audacity.h 25 Aug 2009 19:17:10 - 1.70 @@ -25,7 +25,7 @@ #define AUDACITY_RELEASE 3 #define AUDACITY_REVISION 9 #define AUDACITY_MODLEVEL 0 -#define AUDACITY_SUFFIXwxT(-alpha-) __TDATE__ // wxT() +#define AUDACITY_SUFFIXwxT() // wxT(-alpha-) __TDATE__ #define AUDACITY_MAKESTR( x ) #x #define AUDACITY_QUOTE( x ) AUDACITY_MAKESTR( x ) -- Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july ___ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src LyricsWindow.cpp,1.7,1.8
Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv10817
Modified Files:
LyricsWindow.cpp
Log Message:
Eliminate highlight style because it's not yet working in the port from
UmixIt.
Index: LyricsWindow.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/LyricsWindow.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- LyricsWindow.cpp7 Aug 2009 04:45:41 - 1.7
+++ LyricsWindow.cpp25 Aug 2009 05:53:15 - 1.8
@@ -75,44 +75,49 @@
SetIcon(ic);
#endif
- wxToolBar* pToolBar = this-CreateToolBar();
- const int kHorizMargin = 8;
- wxRadioButton* pRadioButton_BouncingBall =
- new wxRadioButton(pToolBar, kID_RadioButton_BouncingBall, _(Bouncing
Ball), wxPoint(kHorizMargin, 4),
- wxDefaultSize, wxRB_GROUP);
- // Reposition to center vertically.
- wxSize tbSize = pToolBar-GetSize();
- wxSize btnSize = pRadioButton_BouncingBall-GetSize();
- int top = (tbSize.GetHeight() - btnSize.GetHeight()) / 2;
- pRadioButton_BouncingBall-Move(kHorizMargin, top);
- pToolBar-AddControl(pRadioButton_BouncingBall);
-
- int left = kHorizMargin + btnSize.GetWidth() + kHorizMargin; //vvv Doesn't
actually work. Probably need sizers.
- wxRadioButton* pRadioButton_Highlight =
- new wxRadioButton(pToolBar, kID_RadioButton_Highlight, _(Highlight),
wxPoint(left, top));
- pToolBar-AddControl(pRadioButton_Highlight);
- pRadioButton_Highlight-Enable(false); //v not working right in ported
version, so disabled.
+ wxPoint panelPos(0, 0);
+ wxSize panelSize = gSize;
- #if defined(__WXMAC__)
- wxColour face = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
- pRadioButton_BouncingBall-SetBackgroundColour(face);
- pRadioButton_Highlight-SetBackgroundColour(face);
- #endif
+ //v not yet working right in ported version, so choice is disabled.
+ //wxToolBar* pToolBar = this-CreateToolBar();
+ //const int kHorizMargin = 8;
+ //wxRadioButton* pRadioButton_BouncingBall =
+ // new wxRadioButton(pToolBar, kID_RadioButton_BouncingBall, _(Bouncing
Ball), wxPoint(kHorizMargin, 4),
+ // wxDefaultSize, wxRB_GROUP);
+ Reposition to center vertically.
+ //wxSize tbSize = pToolBar-GetSize();
+ //wxSize btnSize = pRadioButton_BouncingBall-GetSize();
+ //int top = (tbSize.GetHeight() - btnSize.GetHeight()) / 2;
+ //pRadioButton_BouncingBall-Move(kHorizMargin, top);
+ //pToolBar-AddControl(pRadioButton_BouncingBall);
+ //
+ //int left = kHorizMargin + btnSize.GetWidth() + kHorizMargin; //vvv
Doesn't actually work. Probably need sizers.
+ //wxRadioButton* pRadioButton_Highlight =
+ // new wxRadioButton(pToolBar, kID_RadioButton_Highlight, _(Highlight),
wxPoint(left, top));
+ //pToolBar-AddControl(pRadioButton_Highlight);
+ //
+ //panelPos.x += tbSize.GetHeight();
+ //panelSize.y -= tbSize.GetHeight())
+ //
+ //#if defined(__WXMAC__)
+ // wxColour face = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
+ // pRadioButton_BouncingBall-SetBackgroundColour(face);
+ // pRadioButton_Highlight-SetBackgroundColour(face);
+ //#endif
+ //
+ //pToolBar-Realize();
- pToolBar-Realize();
+ mLyricsPanel = new Lyrics(this, -1, panelPos, panelSize);
- mLyricsPanel =
- new Lyrics(this, -1,
- wxPoint(0, tbSize.GetHeight()),
- wxSize(gSize.GetWidth(), gSize.GetHeight() -
tbSize.GetHeight()));
- switch (mLyricsPanel-GetLyricsStyle())
- {
- case Lyrics::kBouncingBallLyrics:
- pRadioButton_BouncingBall-SetValue(true); break;
- case Lyrics::kHighlightLyrics:
- default:
- pRadioButton_Highlight-SetValue(true); break;
- }
+ //v Highlight style is broken in ported version.
+ //switch (mLyricsPanel-GetLyricsStyle())
+ //{
+ // case Lyrics::kBouncingBallLyrics:
+ // pRadioButton_BouncingBall-SetValue(true); break;
+ // case Lyrics::kHighlightLyrics:
+ // default:
+ // pRadioButton_Highlight-SetValue(true); break;
+ //}
}
LyricsWindow::~LyricsWindow()
--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src/widgets ASlider.cpp, 1.82, 1.83 ASlider.h, 1.34, 1.35 Ruler.cpp, 1.63, 1.64 Ruler.h, 1.31, 1.32
Update of /cvsroot/audacity/audacity-src/src/widgets
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9042/audacity/src/widgets
Modified Files:
ASlider.cpp ASlider.h Ruler.cpp Ruler.h
Log Message:
interim version on the road to getting Ruler to show scale on MixerBoard gain
sliders.
This just shows the old slider tick marks because Ruler doesn't yet line up
correctly.
Index: Ruler.h
===
RCS file: /cvsroot/audacity/audacity-src/src/widgets/Ruler.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- Ruler.h 23 Feb 2009 22:40:01 - 1.31
+++ Ruler.h 21 Aug 2009 19:11:37 - 1.32
@@ -139,7 +139,7 @@
void TickCustom(int labelIdx, bool major, bool minor);
public:
- bool mbTicksOnly;
+ bool mbTicksOnly; // true = no line the length of the ruler
bool mbTicksAtExtremes;
wxRect mRect;
Index: Ruler.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/widgets/Ruler.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- Ruler.cpp 21 Jun 2009 01:00:10 - 1.63
+++ Ruler.cpp 21 Aug 2009 19:11:37 - 1.64
@@ -1250,7 +1250,12 @@
if (mFlip)
mDC-DrawLine(mLeft, mTop, mLeft, mBottom+1);
else
-mDC-DrawLine(mRect.x-mRect.width, mTop, mRect.x-mRect.width,
mBottom+1);
+ {
+// These calculations tappear to be wrong, and to never have been
used (so not tested) prior to MixerBoard.
+//mDC-DrawLine(mRect.x-mRect.width, mTop,
mRect.x-mRect.width, mBottom+1);
+const int nLineX = mRight - 1;
+mDC-DrawLine(nLineX, mTop, nLineX, mBottom+1);
+ }
}
}
Index: ASlider.h
===
RCS file: /cvsroot/audacity/audacity-src/src/widgets/ASlider.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- ASlider.h 31 Jul 2009 08:35:51 - 1.34
+++ ASlider.h 21 Aug 2009 19:11:37 - 1.35
@@ -201,6 +201,8 @@
wxWindow *mPopWin;
+ Ruler* mpRuler;
+
bool mIsDragging;
wxBitmap *mBitmap;
Index: ASlider.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/widgets/ASlider.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- ASlider.cpp 7 Aug 2009 04:45:37 - 1.82
+++ ASlider.cpp 21 Aug 2009 19:11:37 - 1.83
@@ -451,7 +451,7 @@
if (mOrientation == wxHORIZONTAL)
mThumbBitmap = theTheme.Bitmap( bmpSliderThumb );
else
- //vvv \todo Convert this to an image in AllThemeResources, as
bmpSliderThumb.
+ //vvv \todo Convert this to an image in AllThemeResources, as
bmpSliderThumb. Make an alpha also, as for horizontal slider thumb?
{
wxImage thumbImage(wxBitmap(SliderThumb_Vertical).ConvertToImage());
mThumbBitmap = new wxBitmap(thumbImage);
@@ -460,10 +460,11 @@
// mThumbBitmap = new wxBitmap( SliderThumb );
// mThumbBitmap-SetMask( new wxMask( wxBitmap( SliderThumbAlpha ),
*wxBLACK ) );
+ mpRuler = NULL; // Do this and Move() before Draw().
+ Move(pos);
Draw();
mPopWin = NULL;
- Move(pos);
CreatePopWin();
}
@@ -474,6 +475,7 @@
delete mThumbBitmap;
}
delete mPopWin;
+ delete mpRuler;
}
wxWindowID LWSlider::GetId()
@@ -649,8 +651,13 @@
dc-SetBackground( wxBrush( TransparentColour ) );
dc-Clear();
+ // Draw the line along which the thumb moves.
AColor::Dark(dc, false);
- AColor::Line(*dc, mLeftX, mCenterY+1, mRightX+2, mCenterY+1);
+ if (mOrientation == wxHORIZONTAL)
+ AColor::Line(*dc, mLeftX, mCenterY+1, mRightX+2, mCenterY+1);
+ else //v if (mStyle != DB_SLIDER) // Let the ruler do it for vertical
DB_SLIDER.
+ AColor::Line(*dc, mCenterX+1, mTopY, mCenterX+1, mBottomY+2);
+
// Draw +/- or L/R first. We need to draw these before the tick marks.
if (mStyle == PAN_SLIDER)
@@ -697,45 +704,81 @@
AColor::Line(*dc, mRightX-5, mCenterY-10, mRightX-1, mCenterY-10);
AColor::Line(*dc, mRightX-3, mCenterY-12, mRightX-3, mCenterY-8);
}
- else
+ else
{
- AColor::Line(*dc, mCenterX-12, mBottomY-3, mCenterX-8, mBottomY-3);
- AColor::Line(*dc, mCenterX-12, mTopY+3, mCenterX-8, mTopY+3);
- AColor::Line(*dc, mCenterX-10, mTopY, mCenterX-10, mTopY+5);
+ // Vertical DB_SLIDER is for gain slider in MixerBoard.
+ // We use a Ruler instead of marks ticks.
+ // Draw '+' and '-' only for other vertical sliders.
+ if (mStyle != DB_SLIDER)
+ {
+AColor::Line(*dc, mCenterX-12, mBottomY-3, mCenterX-8,
mBottomY-3);
+AColor::Line(*dc, mCenterX-12, mTopY+3, mCenterX-8, mTopY+3);
+
[Audacity-cvs] audacity-src/src FreqWindow.cpp,1.78,1.79
Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9239/audacity/src
Modified Files:
FreqWindow.cpp
Log Message:
comment on quirk in vertical ruler range
Index: FreqWindow.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/FreqWindow.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- FreqWindow.cpp 30 Jul 2009 12:39:29 - 1.78
+++ FreqWindow.cpp 21 Aug 2009 19:13:38 - 1.79
@@ -314,7 +314,7 @@
vRuler = new RulerPanel(this, wxID_ANY);
vRuler-ruler.SetBounds(0, 0, 100, 100); // Ruler can't handle small sizes
vRuler-ruler.SetOrientation(wxVERTICAL);
- vRuler-ruler.SetRange(10.0, -dBRange);
+ vRuler-ruler.SetRange(10.0, -dBRange); // Note inversion for vertical.
vRuler-ruler.SetFormat(Ruler::LinearDBFormat);
vRuler-ruler.SetUnits(_(dB));
vRuler-ruler.SetLabelEdges(false);
@@ -525,7 +525,7 @@
}
int w1, w2, h;
vRuler-ruler.GetMaxSize(w1, h);
- vRuler-ruler.SetRange(mYMax, mYMin);
+ vRuler-ruler.SetRange(mYMax, mYMin); // Note inversion for vertical.
vRuler-ruler.GetMaxSize(w2, h);
if( w1 != w2 ) // Reduces flicker
{
--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src Menus.cpp,1.519,1.520
Update of /cvsroot/audacity/audacity-src/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9438/audacity/src Modified Files: Menus.cpp Log Message: Make (Un)Mute All Tracks commands update MixerBoard. Index: Menus.cpp === RCS file: /cvsroot/audacity/audacity-src/src/Menus.cpp,v retrieving revision 1.519 retrieving revision 1.520 diff -u -d -r1.519 -r1.520 --- Menus.cpp 17 Aug 2009 17:20:44 - 1.519 +++ Menus.cpp 21 Aug 2009 19:14:58 - 1.520 @@ -5370,6 +5370,10 @@ ModifyState(); RedrawProject(); + #ifdef EXPERIMENTAL_MIXER_BOARD + if (mMixerBoard) + mMixerBoard-UpdateMute(); + #endif } void AudacityProject::OnUnMuteAllTracks() @@ -5385,6 +5389,10 @@ ModifyState(); RedrawProject(); + #ifdef EXPERIMENTAL_MIXER_BOARD + if (mMixerBoard) + mMixerBoard-UpdateMute(); + #endif } void AudacityProject::OnLockPlayRegion() -- Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july ___ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src MixerBoard.cpp, 1.18, 1.19 MixerBoard.h, 1.8, 1.9
Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9597/audacity/src
Modified Files:
MixerBoard.cpp MixerBoard.h
Log Message:
more rearrangements
Index: MixerBoard.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/MixerBoard.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- MixerBoard.cpp 21 Aug 2009 14:20:52 - 1.18
+++ MixerBoard.cpp 21 Aug 2009 19:16:23 - 1.19
@@ -71,15 +71,19 @@
// class MixerTrackCluster
-#define kInset 4
-#define kDoubleInset (2 * kInset)
-#define kTripleInset (3 * kInset)
-#define kQuadrupleInset (4 * kInset)
+#define kInset 4
+#define kDoubleInset (2 * kInset)
+#define kQuadrupleInset(4 * kInset)
-#define TRACK_NAME_HEIGHT 18
-#define MUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH 48
-#define MUTE_SOLO_HEIGHT 16
-#define PAN_HEIGHT 24
+#define TRACK_NAME_HEIGHT18
+#define MUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH 48
+#define MUTE_SOLO_HEIGHT 16
+#define PAN_HEIGHT 24
+
+#define kLeftSideStackWidth MUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH -
kDoubleInset //v Change when numbers shown on slider scale.
+#define kRightSideStackWidthMUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH +
kInset
+#define kRequiredHeightBelowMeter (2 * (kDoubleInset + MUTE_SOLO_HEIGHT)) +
kQuadrupleInset // mute/solo buttons stacked at bottom right
+#define kMixerTrackClusterWidth kLeftSideStackWidth + kRightSideStackWidth
+ kDoubleInset // kInset margin on both sides
enum {
ID_MUSICAL_INSTRUMENT_IMAGE = 13000,
@@ -132,11 +136,11 @@
// pan slider
- ctrlPos.x = (size.GetWidth() / 10);
- ctrlPos.y += TRACK_NAME_HEIGHT + kQuadrupleInset;
+ ctrlPos.x = size.GetWidth() / 10;
+ ctrlPos.y += TRACK_NAME_HEIGHT + kDoubleInset;
ctrlSize = wxSize((size.GetWidth() * 4 / 5), PAN_HEIGHT);
- // The width of the pan slider must be odd (per Dominic, don't ask).
+ // The width of the pan slider must be odd (don't ask).
if (!(ctrlSize.x 1))
ctrlSize.x--;
@@ -150,20 +154,14 @@
this-UpdatePan();
- const int kHalfWidth = (size.GetWidth() / 2);
- // Instead of an even split of the cluster width,
- // give extra pixels to the meter.
- const int kExtraWidthForMeter = 16;
-
// gain slider at left
ctrlPos.x = kInset;
ctrlPos.y += PAN_HEIGHT + kDoubleInset;
- const int kGainSliderHeight =
- size.GetHeight() - ctrlPos.y - kDoubleInset;
+ const int nGainSliderHeight =
+ size.GetHeight() - ctrlPos.y - kQuadrupleInset;
ctrlSize =
- wxSize((kHalfWidth - kDoubleInset - kExtraWidthForMeter),
- kGainSliderHeight);
+ wxSize(kLeftSideStackWidth - kDoubleInset, nGainSliderHeight);
mSlider_Gain =
new MixerTrackSlider(
@@ -185,10 +183,9 @@
// meter and other controls at right
- const int kMeterStackX = kHalfWidth - kExtraWidthForMeter;
// musical instrument image
- ctrlPos.x = ((size.GetWidth() - kMeterStackX -
MUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH) / 2) + kMeterStackX; // Center in right
stack.
+ ctrlPos.x = kInset + kLeftSideStackWidth;
ctrlSize = wxSize(MUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH,
MUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH);
wxBitmap* bitmap = mMixerBoard-GetMusicalInstrumentBitmap(mLeftTrack);
wxASSERT(bitmap);
@@ -197,16 +194,12 @@
// meter
- ctrlPos.x = kMeterStackX;
ctrlPos.y += MUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH + kDoubleInset;
-
- const int kRequiredHeightBelowMeter = //v Make this a global?
- (2 * (kDoubleInset + MUTE_SOLO_HEIGHT)) + kDoubleInset; // mute/solo
buttons stacked at bottom right
- const int kMeterHeight =
- kGainSliderHeight -
+ const int nMeterHeight =
+ nGainSliderHeight -
(MUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH + kDoubleInset) -
- kRequiredHeightBelowMeter;
- ctrlSize.Set(kHalfWidth - kInset + kExtraWidthForMeter, kMeterHeight);
+ kQuadrupleInset - kRequiredHeightBelowMeter;
+ ctrlSize.Set(kRightSideStackWidth, nMeterHeight);
mMeter =
new Meter(this, -1, // wxWindow* parent, wxWindowID id,
false, // bool isInput
@@ -214,7 +207,7 @@
Meter::MixerTrackCluster); // Style style = HorizontalStereo,
// mute/solo buttons stacked below meter
- ctrlPos.y += kMeterHeight + kDoubleInset;
+ ctrlPos.y += nMeterHeight + kQuadrupleInset;
ctrlSize = wxSize(mMixerBoard-mMuteSoloWidth, MUTE_SOLO_HEIGHT);
mToggleButton_Mute =
new AButton(this, ID_TOGGLEBUTTON_MUTE,
@@ -227,7 +220,7 @@
*(mMixerBoard-mImageMuteDown), *(mMixerBoard-mImageMuteDisabled));
this-UpdateMute();
- ctrlPos.y += kDoubleInset + MUTE_SOLO_HEIGHT;
+ ctrlPos.y += MUTE_SOLO_HEIGHT;
mToggleButton_Solo =
new AButton(this, ID_TOGGLEBUTTON_SOLO,
[Audacity-cvs] audacity-src/src Project.cpp, 1.449, 1.450 Project.h, 1.163, 1.164
Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9803/audacity/src
Modified Files:
Project.cpp Project.h
Log Message:
Make MixerBoard and TrackPanel use the same code for updating track mute and
solo, so Simple and Standard modes are done in one place.
This is along the ideas of Al Dimond's patch. Thanks, Al.
Index: Project.h
===
RCS file: /cvsroot/audacity/audacity-src/src/Project.h,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -d -r1.163 -r1.164
--- Project.h 17 Aug 2009 18:32:24 - 1.163
+++ Project.h 21 Aug 2009 19:18:47 - 1.164
@@ -255,6 +255,14 @@
bool GetStickyFlag() { return mStickyFlag; };
void SetStickyFlag(bool flag) { mStickyFlag = flag; };
+ // exclusive mute means mute the chosen track and unmute all others.
+ void HandleTrackMute(Track *t, const bool exclusive);
+
+ // Type of solo (standard or simple) follows the set preference, unless
+ // alternate == true, which causes the opposite behavior.
+ void HandleTrackSolo(Track *t, const bool alternate);
+
+
// Snap To
void SetSnapTo(bool state);
@@ -380,6 +388,10 @@
void DeleteCurrentAutoSaveFile();
static bool GetCacheBlockFiles();
+
+ bool IsSimpleSolo() { return mSoloPref == wxT(Simple); };
+
+ private:
// The project's name and file info
wxString mFileName;
@@ -454,6 +466,7 @@
ToolManager *mToolManager;
bool mShowSplashScreen;
wxString mHelpPref;
+ wxString mSoloPref;
private:
int mAudioIOToken;
Index: Project.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/Project.cpp,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -d -r1.449 -r1.450
--- Project.cpp 17 Aug 2009 18:32:24 - 1.449
+++ Project.cpp 21 Aug 2009 19:18:47 - 1.450
@@ -941,17 +941,19 @@
void AudacityProject::UpdatePrefsVariables()
{
- gPrefs-Read(wxT(/GUI/EmptyCanBeDirty), mEmptyCanBeDirty, true );
-// gPrefs-Read(wxT(/GUI/UpdateSpectrogram),
mViewInfo.bUpdateSpectrogram, true);
+ gPrefs-Read(wxT(/AudioFiles/ShowId3Dialog), mShowId3Dialog, true);
+ gPrefs-Read(wxT(/AudioFiles/NormalizeOnLoad),mNormalizeOnLoad, false);
+
+ gPrefs-Read(wxT(/Batch/CleanSpeechMode), mCleanSpeechMode, false);
+
gPrefs-Read(wxT(/GUI/AutoScroll), mViewInfo.bUpdateTrackIndicator,
true);
- gPrefs-Read(wxT(/GUI/TracksFitVerticallyZoomed),
mTracksFitVerticallyZoomed, false);
+ gPrefs-Read(wxT(/GUI/EmptyCanBeDirty), mEmptyCanBeDirty, true );
+ gPrefs-Read(wxT(/GUI/Help), mHelpPref, wxT(InBrowser) );
gPrefs-Read(wxT(/GUI/SelectAllOnNone), mSelectAllOnNone, true);
gPrefs-Read(wxT(/GUI/ShowSplashScreen), mShowSplashScreen, true);
- gPrefs-Read(wxT(/GUI/Help), mHelpPref, wxT(InBrowser) );
-
- gPrefs-Read(wxT(/Batch/CleanSpeechMode), mCleanSpeechMode, false);
- gPrefs-Read(wxT(/AudioFiles/ShowId3Dialog), mShowId3Dialog, true);
- gPrefs-Read(wxT(/AudioFiles/NormalizeOnLoad),mNormalizeOnLoad, false);
+ gPrefs-Read(wxT(/GUI/Solo), mSoloPref, wxT(Standard) );
+ gPrefs-Read(wxT(/GUI/TracksFitVerticallyZoomed),
mTracksFitVerticallyZoomed, false);
+ // gPrefs-Read(wxT(/GUI/UpdateSpectrogram),
mViewInfo.bUpdateSpectrogram, true);
gPrefs-Read(wxT(/SamplingRate/DefaultProjectSampleRate), mRate,
AudioIO::GetOptimalSupportedSampleRate());
mDefaultFormat = (sampleFormat)
gPrefs-Read(wxT(/SamplingRate/DefaultProjectSampleFormat), floatSample);
@@ -4213,6 +4215,129 @@
return (GetStickyFlag() (mLastFlags LabelTracksExistFlag));
}
+void AudacityProject::HandleTrackMute(Track *t, const bool exclusive)
+{
+ // exclusive mute means mute the chosen track and unmute all others.
+ if (exclusive)
+ {
+ TrackListIterator iter(mTracks);
+ Track *i = iter.First();
+ while (i) {
+ if (i == t) {
+i-SetMute(true);
+if(i-GetLinked()) { // also mute the linked track
+ i = iter.Next();
+ i-SetMute(true);
+}
+ }
+ else {
+i-SetMute(false);
+ }
+ i-SetSolo(false);
+ i = iter.Next();
+ }
+ }
+ else
+ {
+ // Normal click toggles this track.
+ t-SetMute(!t-GetMute());
+ if(t-GetLinked()) // set mute the same on both, if a pair
+ {
+ bool muted = t-GetMute();
+ TrackListIterator iter(mTracks);
+ Track *i = iter.First();
+ while (i != t) { // search for this track
+i = iter.Next();
+ }
+ i = iter.Next(); // get the next one, since linked
+ i-SetMute(muted); // and mute it as well
+ }
+
+ if( IsSimpleSolo() )
+ {
+ TrackListIterator iter(mTracks);
+ Track *i = iter.First();
+ int nPlaying=0;
+
+ // We also set a solo indicator if we have just
[Audacity-cvs] audacity-src/src TrackPanel.cpp,1.474,1.475
Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9876/audacity/src
Modified Files:
TrackPanel.cpp
Log Message:
Make MixerBoard and TrackPanel use the same code for updating track mute and
solo, so Simple and Standard modes are done in one place.
This is along the ideas of Al Dimond's patch. Thanks, Al.
Index: TrackPanel.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/TrackPanel.cpp,v
retrieving revision 1.474
retrieving revision 1.475
diff -u -d -r1.474 -r1.475
--- TrackPanel.cpp 15 Aug 2009 16:29:43 - 1.474
+++ TrackPanel.cpp 21 Aug 2009 19:19:37 - 1.475
@@ -5990,72 +5990,12 @@
void TrackPanel::OnTrackMute(bool shiftDown, Track *t)
{
- if(!t) {
+ if (!t) {
t = GetFocusedTrack();
- if(!t) return;
- }
-
- if (shiftDown)
- {
- // Cosmetic...
- // Shift-click mutes this track and unmutes other tracks.
- TrackListIterator iter(mTracks);
- Track *i = iter.First();
- while (i) {
- if (i == t) {
-i-SetMute(true);
-if(i-GetLinked()) { // also mute the linked track
- i = iter.Next();
- i-SetMute(true);
-}
- }
- else {
-i-SetMute(false);
- }
- i-SetSolo(false);
- i = iter.Next();
- }
- }
- else {
- // Normal click toggles this track.
- t-SetMute(!t-GetMute());
- if(t-GetLinked()) // set mute the same on both, if a pair
- {
- bool muted = t-GetMute();
- TrackListIterator iter(mTracks);
- Track *i = iter.First();
- while (i != t) { // search for this track
-i = iter.Next();
- }
- i = iter.Next(); // get the next one, since linked
- i-SetMute(muted); // and mute it as well
- }
-
- if( IsSimpleSolo() )
- {
- TrackListIterator iter(mTracks);
- Track *i = iter.First();
- int nPlaying=0;
-
- // We also set a solo indicator if we have just one track / stereo
pair playing.
- // otherwise clear solo on everything.
- while (i) {
-if( !i-GetMute())
-{
- nPlaying += 1;
- if(i-GetLinked())
- i = iter.Next(); // don't count this one as it is linked
-}
-i = iter.Next();
- }
-
- i = iter.First();
- while (i) {
-i-SetSolo( (nPlaying==1) !i-GetMute() ); // will set both
of a stereo pair
-i = iter.Next();
- }
- }
+ if (!t || (t-GetKind() != Track::Wave))
+ return;
}
+ GetProject()-HandleTrackMute(t, shiftDown);
#ifdef EXPERIMENTAL_MIXER_BOARD
// Update mixer board, too.
@@ -6074,63 +6014,13 @@
void TrackPanel::OnTrackSolo(bool shiftDown, Track *t)
{
- if(!t) {
- t = GetFocusedTrack();
- if(!t) return;
- }
-
- bool bSoloMultiple = !IsSimpleSolo() ^ shiftDown;
-
- // Standard and Simple solo have opposite defaults:
- // Standard - Behaves as individual buttons, shift=radio buttons
- // Simple - Behaves as radio buttons, shift=individual
- // In addition, Simple solo will mute/unmute tracks
- // when in standard radio button mode.
- if ( bSoloMultiple )
- {
- t-SetSolo( !t-GetSolo() );
- if(t-GetLinked())
- {
- bool soloed = t-GetSolo();
- TrackListIterator iter(mTracks);
- Track *i = iter.First();
- while (i != t) { // search for this track
-i = iter.Next();
- }
- i = iter.Next(); // get the next one, since linked
- i-SetSolo(soloed); // and solo it as well
- }
- }
- else
+ if (!t)
{
- // Normal click solo this track only, mute everything else.
- // OR unmute and unsolo everything.
- TrackListIterator iter(mTracks);
- Track *i = iter.First();
- bool bWasSolo = t-GetSolo();
- while (i) {
- if( i==t )
- {
-i-SetSolo(!bWasSolo);
-if( IsSimpleSolo() )
- i-SetMute(false);
-if(t-GetLinked())
-{
- i = iter.Next();
- i-SetSolo(!bWasSolo);
- if( IsSimpleSolo() )
- i-SetMute(false);
-}
- }
- else
- {
-i-SetSolo(false);
-if( IsSimpleSolo() )
- i-SetMute(!bWasSolo);
- }
- i = iter.Next();
- }
+ t = GetFocusedTrack();
+ if (!t || (t-GetKind() != Track::Wave))
+ return;
}
+ GetProject()-HandleTrackSolo(t, shiftDown);
#ifdef EXPERIMENTAL_MIXER_BOARD
// Update mixer board, too.
--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008
[Audacity-cvs] audacity-src/src MixerBoard.cpp, 1.19, 1.20 MixerBoard.h, 1.9, 1.10
Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv26486
Modified Files:
MixerBoard.cpp MixerBoard.h
Log Message:
* Made bevel for selected track wider so selection state is more visible.
* Changed tooltip for track name to be the name rather than Track Name.
* Made clicking on the instrument select the track, so it does something in the
meantime, pending an image menu.
Index: MixerBoard.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/MixerBoard.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- MixerBoard.cpp 21 Aug 2009 19:16:23 - 1.19
+++ MixerBoard.cpp 21 Aug 2009 23:09:35 - 1.20
@@ -83,10 +83,10 @@
#define kLeftSideStackWidth MUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH -
kDoubleInset //v Change when numbers shown on slider scale.
#define kRightSideStackWidthMUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH +
kInset
#define kRequiredHeightBelowMeter (2 * (kDoubleInset + MUTE_SOLO_HEIGHT)) +
kQuadrupleInset // mute/solo buttons stacked at bottom right
-#define kMixerTrackClusterWidth kLeftSideStackWidth + kRightSideStackWidth
+ kDoubleInset // kInset margin on both sides
+#define kMixerTrackClusterWidth kLeftSideStackWidth + kRightSideStackWidth
+ kQuadrupleInset // kInset margin on both sides
enum {
- ID_MUSICAL_INSTRUMENT_IMAGE = 13000,
+ ID_BITMAPBUTTON_MUSICAL_INSTRUMENT = 13000,
ID_TOGGLEBUTTON_MUTE,
ID_TOGGLEBUTTON_SOLO,
ID_SLIDER_PAN,
@@ -96,6 +96,8 @@
BEGIN_EVENT_TABLE(MixerTrackCluster, wxPanel)
EVT_CHAR(MixerTrackCluster::OnKeyEvent)
EVT_MOUSE_EVENTS(MixerTrackCluster::OnMouseEvent)
+
+ EVT_BUTTON(ID_BITMAPBUTTON_MUSICAL_INSTRUMENT,
MixerTrackCluster::OnButton_MusicalInstrument)
EVT_COMMAND(ID_TOGGLEBUTTON_MUTE, wxEVT_COMMAND_BUTTON_CLICKED,
MixerTrackCluster::OnButton_Mute)
EVT_COMMAND(ID_TOGGLEBUTTON_SOLO, wxEVT_COMMAND_BUTTON_CLICKED,
MixerTrackCluster::OnButton_Solo)
EVT_PAINT(MixerTrackCluster::OnPaint)
@@ -126,8 +128,8 @@
// (Still available in Audacity_UmixIt branch off 1.2.6.)
// track name
- wxPoint ctrlPos(kInset, kInset);
- wxSize ctrlSize(size.GetWidth() - kDoubleInset, TRACK_NAME_HEIGHT);
+ wxPoint ctrlPos(kDoubleInset, kDoubleInset);
+ wxSize ctrlSize(size.GetWidth() - kQuadrupleInset, TRACK_NAME_HEIGHT);
mStaticText_TrackName =
new wxStaticText(this, -1, mLeftTrack-GetName(), ctrlPos, ctrlSize,
wxALIGN_CENTRE | wxST_NO_AUTORESIZE | wxSUNKEN_BORDER);
@@ -155,13 +157,13 @@
// gain slider at left
- ctrlPos.x = kInset;
+ ctrlPos.x = kDoubleInset;
ctrlPos.y += PAN_HEIGHT + kDoubleInset;
const int nGainSliderHeight =
size.GetHeight() - ctrlPos.y - kQuadrupleInset;
ctrlSize =
- wxSize(kLeftSideStackWidth - kDoubleInset, nGainSliderHeight);
+ wxSize(kLeftSideStackWidth - kQuadrupleInset, nGainSliderHeight);
mSlider_Gain =
new MixerTrackSlider(
@@ -189,8 +191,11 @@
ctrlSize = wxSize(MUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH,
MUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH);
wxBitmap* bitmap = mMixerBoard-GetMusicalInstrumentBitmap(mLeftTrack);
wxASSERT(bitmap);
- mStaticBitmap_MusicalInstrument =
- new wxStaticBitmap(this, -1, *bitmap, ctrlPos, ctrlSize);
+ mBitmapButton_MusicalInstrument =
+ new wxBitmapButton(this, ID_BITMAPBUTTON_MUSICAL_INSTRUMENT, *bitmap,
+ ctrlPos, ctrlSize,
+ wxBU_AUTODRAW, wxDefaultValidator,
+ _(Musical Instrument));
// meter
@@ -230,7 +235,7 @@
this-UpdateSolo();
#if wxUSE_TOOLTIPS
- mStaticText_TrackName-SetToolTip(_T(Track Name));
+ mStaticText_TrackName-SetToolTip(mLeftTrack-GetName());
mToggleButton_Mute-SetToolTip(_T(Mute));
mToggleButton_Solo-SetToolTip(_T(Solo));
mMeter-SetToolTip(_T(Signal Level Meter));
@@ -326,8 +331,13 @@
void MixerTrackCluster::UpdateName()
{
- mStaticText_TrackName-SetLabel(mLeftTrack-GetName());
-
mStaticBitmap_MusicalInstrument-SetBitmap(*(mMixerBoard-GetMusicalInstrumentBitmap(mLeftTrack)));
+ const wxString newName = mLeftTrack-GetName();
+ mStaticText_TrackName-SetLabel(newName);
+ #if wxUSE_TOOLTIPS
+ mStaticText_TrackName-SetToolTip(newName);
+ #endif
+ mBitmapButton_MusicalInstrument-SetBitmapLabel(
+ *(mMixerBoard-GetMusicalInstrumentBitmap(mLeftTrack)));
}
void MixerTrackCluster::UpdateMute()
@@ -447,6 +457,43 @@
// event handlers
+void MixerTrackCluster::HandleSelect(const bool bShiftDown)
+{
+ if (bShiftDown)
+ {
+ // ShiftDown = Just toggle selection on this track.
+ bool bSelect = !mLeftTrack-GetSelected();
+ mLeftTrack-SetSelected(bSelect);
+ if (mRightTrack)
+ mRightTrack-SetSelected(bSelect);
+
+ // Refresh only this
[Audacity-cvs] audacity-src/src LyricsWindow.cpp, 1.6, 1.7 MixerBoard.cpp, 1.16, 1.17
Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12650/audacity/src
Modified Files:
LyricsWindow.cpp MixerBoard.cpp
Log Message:
incremental layout changes for MixerBoard
Index: LyricsWindow.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/LyricsWindow.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- LyricsWindow.cpp5 Aug 2009 20:11:59 - 1.6
+++ LyricsWindow.cpp7 Aug 2009 04:45:41 - 1.7
@@ -53,8 +53,8 @@
parent-GetName().c_str()).c_str())),
wxPoint(100, 300), gSize,
//v Bug in wxFRAME_FLOAT_ON_PARENT:
-// If both the project frame and MixerBoardFrame are minimized and
you restore MixerBoardFrame, you can't restore project frame until you close
-// MixerBoardFrame, but then project frame and MixerBoardFrame are
restored but MixerBoardFrames is unresponsive because it thinks it's not shown.
+// If both the project frame and LyricsWindow are minimized and
you restore LyricsWindow, you can't restore project frame until you close
+// LyricsWindow, but then project frame and LyricsWindow are
restored but LyricsWindow is unresponsive because it thinks it's not shown.
//wxDEFAULT_FRAME_STYLE | wxFRAME_FLOAT_ON_PARENT)
wxDEFAULT_FRAME_STYLE)
{
Index: MixerBoard.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/MixerBoard.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- MixerBoard.cpp 5 Aug 2009 20:11:59 - 1.16
+++ MixerBoard.cpp 7 Aug 2009 04:45:41 - 1.17
@@ -131,50 +131,45 @@
//mStaticText_TrackName-SetBackgroundColour(this-GetTrackColor());
- // musical instrument image
- ctrlPos.x = (size.GetWidth() - MUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH) / 2; //
center
- ctrlPos.y += TRACK_NAME_HEIGHT + kDoubleInset;
- ctrlSize = wxSize(MUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH,
MUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH);
- wxBitmap* bitmap = mMixerBoard-GetMusicalInstrumentBitmap(mLeftTrack);
- wxASSERT(bitmap);
- mStaticBitmap_MusicalInstrument =
- new wxStaticBitmap(this, -1, *bitmap, ctrlPos, ctrlSize);
-
-
- int nHalfWidth = (size.GetWidth() / 2);
-
// pan slider
ctrlPos.x = (size.GetWidth() / 10);
- ctrlPos.y += MUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH + kQuadrupleInset;
+ ctrlPos.y += TRACK_NAME_HEIGHT + kQuadrupleInset;
ctrlSize = wxSize((size.GetWidth() * 4 / 5), PAN_HEIGHT);
- // The width of the pan slider must be odd (don't ask)
+ // The width of the pan slider must be odd (per Dominic, don't ask).
if (!(ctrlSize.x 1))
ctrlSize.x--;
- /* i18n-hint: Title of the Pan slider, used to move the sound left or right
*/
mSlider_Pan =
- new MixerTrackSlider(this, ID_SLIDER_PAN, _(Pan), ctrlPos, ctrlSize,
PAN_SLIDER, true);
+ new MixerTrackSlider(
+this, ID_SLIDER_PAN,
+/* i18n-hint: Title of the Pan slider, used to move the sound left
or right */
+_(Pan),
+ctrlPos, ctrlSize, PAN_SLIDER, true);
this-UpdatePan();
+ const int kHalfWidth = (size.GetWidth() / 2);
+ // Instead of an even split of the cluster width,
+ // give extra pixels to the meter.
+ const int kExtraWidthForMeter = 16;
+
// gain slider at left
- ctrlPos.x = kDoubleInset;
- ctrlPos.y += PAN_HEIGHT + kQuadrupleInset;
+ ctrlPos.x = kInset;
+ ctrlPos.y += PAN_HEIGHT + kDoubleInset;
- // Instead of an even split of the cluster width, give extra pixels to the
meter
- const int kExtraWidthForMeter = 16;
const int kGainSliderHeight =
- size.GetHeight() - ctrlPos.y - kQuadrupleInset;
+ size.GetHeight() - ctrlPos.y - kDoubleInset;
ctrlSize =
- wxSize((nHalfWidth - kQuadrupleInset - kExtraWidthForMeter),
+ wxSize((kHalfWidth - kDoubleInset - kExtraWidthForMeter),
kGainSliderHeight);
- /* i18n-hint: Title of the Gain slider, used to adjust the volume */
mSlider_Gain =
new MixerTrackSlider(
-this, ID_SLIDER_GAIN, _(Gain),
+this, ID_SLIDER_GAIN,
+/* i18n-hint: Title of the Gain slider, used to adjust the volume
*/
+_(Gain),
ctrlPos, ctrlSize, DB_SLIDER, true,
true, 0.0, wxVERTICAL);
@@ -190,11 +185,28 @@
// meter and other controls at right
- ctrlPos.x = nHalfWidth - kExtraWidthForMeter;
- const int kReqdHeightBelowMeter =
+ const int kMeterStackX = kHalfWidth - kExtraWidthForMeter;
+
+ // musical instrument image
+ ctrlPos.x = ((size.GetWidth() - kMeterStackX -
MUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH) / 2) + kMeterStackX; // Center in right
stack.
+ ctrlSize =
[Audacity-cvs] audacity-src/src LyricsWindow.cpp, 1.5, 1.6 MixerBoard.cpp, 1.15, 1.16 MixerBoard.h, 1.7, 1.8 Project.cpp, 1.447, 1.448 TrackPanel.cpp, 1.472, 1.473
Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv7226
Modified Files:
LyricsWindow.cpp MixerBoard.cpp MixerBoard.h Project.cpp
TrackPanel.cpp
Log Message:
Made the MixerBoard track strips shorter (fit in 480) and narrower.
Changed the layout some, e.g., mute/solo stacked at bottom right. (More
adjustments to come!)
Experiments with wxFRAME_FLOAT_ON_PARENT. Due to apparent wxWidgets bug, not
using it.
Fixed bug Gale reported:
A user has pointed out that if you set a region to Loop play, the
Mixer
Board meters only reflect play the first time the loop is played;
after
that, they lock.
Index: Project.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/Project.cpp,v
retrieving revision 1.447
retrieving revision 1.448
diff -u -d -r1.447 -r1.448
--- Project.cpp 4 Aug 2009 04:19:22 - 1.447
+++ Project.cpp 5 Aug 2009 20:11:59 - 1.448
@@ -3431,7 +3431,7 @@
if (!mMixerBoard)
return;
mMixerBoard-UpdateTrackClusters();
- mMixerBoard-UpdateMeters(gAudioIO-GetStreamTime());
+ mMixerBoard-UpdateMeters(gAudioIO-GetStreamTime(), (mLastPlayMode ==
loopedPlay));
}
#endif
Index: LyricsWindow.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/LyricsWindow.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- LyricsWindow.cpp29 Jul 2009 00:26:32 - 1.5
+++ LyricsWindow.cpp5 Aug 2009 20:11:59 - 1.6
@@ -52,23 +52,28 @@
wxT( - %s),
parent-GetName().c_str()).c_str())),
wxPoint(100, 300), gSize,
+//v Bug in wxFRAME_FLOAT_ON_PARENT:
+// If both the project frame and MixerBoardFrame are minimized and
you restore MixerBoardFrame, you can't restore project frame until you close
+// MixerBoardFrame, but then project frame and MixerBoardFrame are
restored but MixerBoardFrames is unresponsive because it thinks it's not shown.
+//wxDEFAULT_FRAME_STYLE | wxFRAME_FLOAT_ON_PARENT)
wxDEFAULT_FRAME_STYLE)
{
-#ifdef __WXMAC__
- // WXMAC doesn't support wxFRAME_FLOAT_ON_PARENT, so we do
- SetWindowClass((WindowRef) MacGetWindowRef(), kFloatingWindowClass);
-#endif
+ //vvv Still necessary? It's commented out in ToolManager and Meter, so I
did so here.
+ // #ifdef __WXMAC__
+ // // WXMAC doesn't support wxFRAME_FLOAT_ON_PARENT, so we do
+ // SetWindowClass((WindowRef) MacGetWindowRef(), kFloatingWindowClass);
+ // #endif
mProject = parent;
// loads either the XPM or the windows resource, depending on the platform
-#if !defined(__WXMAC__) !defined(__WXX11__)
- #ifdef __WXMSW__
- wxIcon ic(wxICON(AudacityLogo));
- #else
- wxIcon ic(wxICON(AudacityLogo48x48));
+ #if !defined(__WXMAC__) !defined(__WXX11__)
+ #ifdef __WXMSW__
+ wxIcon ic(wxICON(AudacityLogo));
+ #else
+ wxIcon ic(wxICON(AudacityLogo48x48));
+ #endif
+ SetIcon(ic);
#endif
- SetIcon(ic);
-#endif
wxToolBar* pToolBar = this-CreateToolBar();
const int kHorizMargin = 8;
@@ -88,11 +93,11 @@
pToolBar-AddControl(pRadioButton_Highlight);
pRadioButton_Highlight-Enable(false); //v not working right in ported
version, so disabled.
-#if defined(__WXMAC__)
- wxColour face = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
- pRadioButton_BouncingBall-SetBackgroundColour(face);
- pRadioButton_Highlight-SetBackgroundColour(face);
-#endif
+ #if defined(__WXMAC__)
+ wxColour face = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
+ pRadioButton_BouncingBall-SetBackgroundColour(face);
+ pRadioButton_Highlight-SetBackgroundColour(face);
+ #endif
pToolBar-Realize();
Index: MixerBoard.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/MixerBoard.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- MixerBoard.cpp 2 Aug 2009 02:24:44 - 1.15
+++ MixerBoard.cpp 5 Aug 2009 20:11:59 - 1.16
@@ -141,35 +141,11 @@
new wxStaticBitmap(this, -1, *bitmap, ctrlPos, ctrlSize);
- // mute/solo buttons
int nHalfWidth = (size.GetWidth() / 2);
- ctrlPos.x = ((nHalfWidth - mMixerBoard-mMuteSoloWidth) / 2) + kInset;
- ctrlPos.y += MUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH + kQuadrupleInset;
- ctrlSize = wxSize(mMixerBoard-mMuteSoloWidth, MUTE_SOLO_HEIGHT);
- mToggleButton_Mute =
- new AButton(this, ID_TOGGLEBUTTON_MUTE,
- ctrlPos, ctrlSize,
- *(mMixerBoard-mImageMuteUp),
*(mMixerBoard-mImageMuteOver),
- *(mMixerBoard-mImageMuteDown),
[Audacity-cvs] audacity-src/src/widgets Meter.cpp,1.55,1.56
Update of /cvsroot/audacity/audacity-src/src/widgets
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv7226/widgets
Modified Files:
Meter.cpp
Log Message:
Made the MixerBoard track strips shorter (fit in 480) and narrower.
Changed the layout some, e.g., mute/solo stacked at bottom right. (More
adjustments to come!)
Experiments with wxFRAME_FLOAT_ON_PARENT. Due to apparent wxWidgets bug, not
using it.
Fixed bug Gale reported:
A user has pointed out that if you set a region to Loop play, the
Mixer
Board meters only reflect play the first time the loop is played;
after
that, they lock.
Index: Meter.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/widgets/Meter.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- Meter.cpp 5 Aug 2009 00:04:43 - 1.55
+++ Meter.cpp 5 Aug 2009 20:12:00 - 1.56
@@ -1258,17 +1258,17 @@
1,
100);
-#if defined(__WXMAC__)
- // WXMAC doesn't support wxFRAME_FLOAT_ON_PARENT, so we do
- //
- // LL: I've commented this out because if you have, for instance, the meter
- // toolbar undocked and large and then you open a dialog like an
effect,
- // the dialog may appear behind the dialog and you can't move either
one.
- //
- // However, I'm leaving it here because I don't remember why I'd
included
- // it in the first place.
-// SetWindowClass((WindowRef)d.MacGetWindowRef(), kFloatingWindowClass);
-#endif
+ //#if defined(__WXMAC__)
+ // WXMAC doesn't support wxFRAME_FLOAT_ON_PARENT, so we do
+ //
+ // LL: I've commented this out because if you have, for instance, the
meter
+ // toolbar undocked and large and then you open a dialog like an
effect,
+ // the dialog may appear behind the dialog and you can't move
either one.
+ //
+ // However, I'm leaving it here because I don't remember why I'd
included
+ // it in the first place.
+ // SetWindowClass((WindowRef)d.MacGetWindowRef(), kFloatingWindowClass);
+ //#endif
if (d.ShowModal() == wxID_OK) {
mMeterRefreshRate = d.GetValue();
--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src/widgets Meter.cpp,1.54,1.55
Update of /cvsroot/audacity/audacity-src/src/widgets
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv2215
Modified Files:
Meter.cpp
Log Message:
Commit change for 3-digit meter scale numbers.
Add missing #ifdef for AUTOMATIC_VOLUME.
Index: Meter.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/widgets/Meter.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- Meter.cpp 4 Aug 2009 16:06:31 - 1.54
+++ Meter.cpp 5 Aug 2009 00:04:43 - 1.55
@@ -927,7 +927,7 @@
// For any vertical style, also need mRightSize big enough for Ruler
width.
int rulerWidth;
int rulerHeight;
- dc.GetTextExtent(wxT(-88), rulerWidth, rulerHeight); // -88 is
nice and wide.
+ dc.GetTextExtent(wxT(-888), rulerWidth, rulerHeight); // -888 is
nice and wide.
if (mRightSize.x rulerWidth)
mRightSize.x = rulerWidth;
}
@@ -1232,13 +1232,15 @@
void Meter::OnAutomaticVolume(wxCommandEvent evt)
{
- if (gAudioIO-AVIsActive()) {
- gAudioIO-AVDisable();
- AudacityProject *p = GetActiveProject();
- if (p) p-TP_DisplayStatusMessage(_(Automatic Volume stopped as
requested by user.));
- }
- else
- gAudioIO-AVInitialize();
+ #ifdef AUTOMATIC_VOLUME
+ if (gAudioIO-AVIsActive()) {
+ gAudioIO-AVDisable();
+ AudacityProject *p = GetActiveProject();
+ if (p) p-TP_DisplayStatusMessage(_(Automatic Volume stopped as
requested by user.));
+ }
+ else
+ gAudioIO-AVInitialize();
+ #endif
}
void Meter::OnFloat(wxCommandEvent evt)
--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
Re: [Audacity-cvs] htdocs Competitive_Ad_Filter.txt,1.23,1.24
Thanks, Gale. I added it to the AdSense filters. - V Gale Andrews wrote: Update of /cvsroot/audacity/htdocs In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9030 Modified Files: Competitive_Ad_Filter.txt Log Message: Add super-logiciel.com (appearing in Google Ads on audacity.sf.net as Audacity - Free Download) -- Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july ___ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src MixerBoard.cpp, 1.14, 1.15 MixerBoard.h, 1.6, 1.7
Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv10979
Modified Files:
MixerBoard.cpp MixerBoard.h
Log Message:
Fix bug reported by Dan Horgan:
- Undoing/redoing changes to gain or pan doesn't update the MixerBoard
sliders.
Make 3-digit meter numbers show last digit.
A litltle cleanup, too.
Index: MixerBoard.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/MixerBoard.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- MixerBoard.cpp 31 Jul 2009 08:42:37 - 1.14
+++ MixerBoard.cpp 2 Aug 2009 02:24:44 - 1.15
@@ -81,12 +81,6 @@
#define MUTE_SOLO_HEIGHT 16
#define PAN_HEIGHT 24
-// If we decide we want more than 1 frame, base it on sample rate.
-const int kFramesPerBuffer = 4; // for calls to mMeter-UpdateDisplay
-
-const int kGainSliderMin = -36;
-const int kGainSliderMax = 6; // headroom convention to match typical mixer
boards layout
-
enum {
ID_MUSICAL_INSTRUMENT_IMAGE = 13000,
ID_TOGGLEBUTTON_MUTE,
@@ -302,6 +296,15 @@
// These are used by TrackPanel for synchronizing control states, etc.
+
+// Update the controls that can be affected by state change.
+void MixerTrackCluster::UpdateForStateChange()
+{
+ this-UpdateName();
+ this-UpdatePan();
+ this-UpdateGain();
+}
+
void MixerTrackCluster::UpdateName()
{
mStaticText_TrackName-SetLabel(mLeftTrack-GetName());
@@ -346,6 +349,7 @@
return;
}
+ const int kFramesPerBuffer = 4;
float min; // A dummy, since it's not shown in meters.
float* maxLeft = new float[kFramesPerBuffer];
float* rmsLeft = new float[kFramesPerBuffer];
@@ -631,7 +635,7 @@
// class MixerBoard
#define MIXER_BOARD_MIN_HEIGHT 500
-#define MIXER_TRACK_CLUSTER_WIDTH 100 - kInset
+#define MIXER_TRACK_CLUSTER_WIDTH 120
#define MIXER_BOARD_MIN_WIDTH kDoubleInset + MIXER_TRACK_CLUSTER_WIDTH +
kDoubleInset
@@ -740,7 +744,7 @@
// on the undo stack, so update the pointers and display name.
mMixerTrackClusters[nClusterIndex]-mLeftTrack =
(WaveTrack*)pLeftTrack;
mMixerTrackClusters[nClusterIndex]-mRightTrack =
(WaveTrack*)pRightTrack;
-mMixerTrackClusters[nClusterIndex]-UpdateName();
+mMixerTrackClusters[nClusterIndex]-UpdateForStateChange();
}
else
{
@@ -962,6 +966,7 @@
mProject-RedrawProject(); // Update all the TrackLabel mute/solo buttons.
}
+
void MixerBoard::UpdateName(const WaveTrack* pLeftTrack)
{
MixerTrackCluster* pMixerTrackCluster;
Index: MixerBoard.h
===
RCS file: /cvsroot/audacity/audacity-src/src/MixerBoard.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- MixerBoard.h31 Jul 2009 08:42:37 - 1.6
+++ MixerBoard.h2 Aug 2009 02:24:44 - 1.7
@@ -79,6 +79,7 @@
void UpdateHeight(); // For wxSizeEvents, update gain slider and meter.
// These are used by TrackPanel for synchronizing control states, etc.
+ void UpdateForStateChange(); // Update the controls that can be affected by
state change.
void UpdateName();
void UpdateMute();
void UpdateSolo();
--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src MixerBoard.cpp, 1.13, 1.14 MixerBoard.h, 1.5, 1.6
Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv17072
Modified Files:
MixerBoard.cpp MixerBoard.h
Log Message:
Fix bug reported by Dan Horgan:
- Adjusting gain or pan by dragging the MixerBoard controls produces large
numbers of History entries. (Doing it via the TrackPanel produces just
one for each drag, which seems more useful)
Improve efficiency of MixerBoard track changes updating TrackPanel.
Index: MixerBoard.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/MixerBoard.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- MixerBoard.cpp 29 Jul 2009 00:26:32 - 1.13
+++ MixerBoard.cpp 31 Jul 2009 08:42:37 - 1.14
@@ -30,6 +30,45 @@
#include ../images/AudacityLogo48x48.xpm
#endif
+
+// class MixerTrackSlider
+
+BEGIN_EVENT_TABLE(MixerTrackSlider, ASlider)
+ EVT_MOUSE_EVENTS(MixerTrackSlider::OnMouseEvent)
+END_EVENT_TABLE()
+
+MixerTrackSlider::MixerTrackSlider(wxWindow * parent,
+wxWindowID id,
+wxString name,
+const wxPoint pos,
+const wxSize size,
+int style /*= FRAC_SLIDER*/,
+bool popup /*= true*/,
+bool canUseShift /*= true*/,
+float stepValue /*= STEP_CONTINUOUS*/,
+int orientation /*= wxHORIZONTAL*/)
+: ASlider(parent, id, name, pos, size,
+style, popup, canUseShift, stepValue, orientation)
+{
+}
+
+void MixerTrackSlider::OnMouseEvent(wxMouseEvent event)
+{
+ ASlider::OnMouseEvent(event);
+
+ if (event.ButtonUp())
+ {
+ MixerTrackCluster* pMixerTrackCluster =
(MixerTrackCluster*)(this-GetParent());
+ switch (mStyle)
+ {
+ case DB_SLIDER: pMixerTrackCluster-HandleSliderGain(true); break;
+ case PAN_SLIDER: pMixerTrackCluster-HandleSliderPan(true); break;
+ default: break; // no-op
+ }
+ }
+}
+
+
// class MixerTrackCluster
#define kInset 4
@@ -52,7 +91,7 @@
ID_MUSICAL_INSTRUMENT_IMAGE = 13000,
ID_TOGGLEBUTTON_MUTE,
ID_TOGGLEBUTTON_SOLO,
- ID_ASLIDER_PAN,
+ ID_SLIDER_PAN,
ID_SLIDER_GAIN,
};
@@ -62,7 +101,7 @@
EVT_COMMAND(ID_TOGGLEBUTTON_MUTE, wxEVT_COMMAND_BUTTON_CLICKED,
MixerTrackCluster::OnButton_Mute)
EVT_COMMAND(ID_TOGGLEBUTTON_SOLO, wxEVT_COMMAND_BUTTON_CLICKED,
MixerTrackCluster::OnButton_Solo)
EVT_PAINT(MixerTrackCluster::OnPaint)
- EVT_SLIDER(ID_ASLIDER_PAN, MixerTrackCluster::OnSlider_Pan)
+ EVT_SLIDER(ID_SLIDER_PAN, MixerTrackCluster::OnSlider_Pan)
EVT_SLIDER(ID_SLIDER_GAIN, MixerTrackCluster::OnSlider_Gain)
//v EVT_COMMAND_SCROLL(ID_SLIDER_GAIN,
MixerTrackCluster::OnSliderScroll_Gain)
END_EVENT_TABLE()
@@ -144,7 +183,8 @@
ctrlSize.x--;
/* i18n-hint: Title of the Pan slider, used to move the sound left or right
*/
- mSlider_Pan = new ASlider(this, ID_ASLIDER_PAN, _(Pan), ctrlPos,
ctrlSize, PAN_SLIDER, true);
+ mSlider_Pan =
+ new MixerTrackSlider(this, ID_SLIDER_PAN, _(Pan), ctrlPos, ctrlSize,
PAN_SLIDER, true);
this-UpdatePan();
@@ -160,7 +200,8 @@
/* i18n-hint: Title of the Gain slider, used to adjust the volume */
mSlider_Gain =
- new ASlider(this, ID_SLIDER_GAIN, _(Gain), ctrlPos, ctrlSize,
DB_SLIDER, true, true, 0.0, wxVERTICAL);
+ new MixerTrackSlider(this, ID_SLIDER_GAIN, _(Gain), ctrlPos, ctrlSize,
DB_SLIDER, true,
+ true, 0.0, wxVERTICAL);
// too much color:
mSlider_Gain-SetBackgroundColour(this-GetTrackColor());
// too dark:
mSlider_Gain-SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW));
@@ -196,6 +237,34 @@
#endif
}
+void MixerTrackCluster::HandleSliderGain(const bool bWantPushState /*= false*/)
+{
+ float fValue = mSlider_Gain-Get();
+ mLeftTrack-SetGain(fValue);
+ if (mRightTrack)
+ mRightTrack-SetGain(fValue);
+
+ // Update the TrackPanel correspondingly.
+ mProject-RefreshTPTrack(mLeftTrack);
+
+ if (bWantPushState)
+ mProject-TP_PushState(_(Moved gain slider), _(Gain), true /*
consolidate */);
+}
+
+void MixerTrackCluster::HandleSliderPan(const bool bWantPushState /*= false*/)
+{
+ float fValue = mSlider_Pan-Get();
+ mLeftTrack-SetPan(fValue);
+ if (mRightTrack)
+ mRightTrack-SetPan(fValue);
+
+ // Update the TrackPanel correspondingly.
+ mProject-RefreshTPTrack(mLeftTrack);
+
+ if (bWantPushState)
+ mProject-TP_PushState(_(Moved pan slider), _(Pan), true /*
consolidate */);
+}
+
void MixerTrackCluster::ResetMeter()
{
mMeter-Reset(mLeftTrack-GetRate(), true);
@@ -352,7 +421,9 @@
//#endif
}
+
// event handlers
+
void
[Audacity-cvs] audacity-src/src Lyrics.cpp,1.3,1.4
Update of /cvsroot/audacity/audacity-src/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv11765 Modified Files: Lyrics.cpp Log Message: Fix some refresh issues on resize events. Index: Lyrics.cpp === RCS file: /cvsroot/audacity/audacity-src/src/Lyrics.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Lyrics.cpp 9 Jul 2009 21:14:28 - 1.3 +++ Lyrics.cpp 1 Aug 2009 01:03:56 - 1.4 @@ -89,6 +89,8 @@ mLyricsStyle = kBouncingBallLyrics; // default mKaraokeFontSize = this-GetDefaultFontSize(); // Call only after mLyricsStyle is set. + this-SetBackgroundColour(*wxWHITE); + mHighlightTextCtrl = new HighlightTextCtrl(this, -1, // wxWindow* parent, wxWindowID id, wxT(), // const wxString value = wxT(), @@ -499,6 +501,8 @@ mHighlightTextCtrl-SetSize(mWidth, mKaraokeHeight); this-SetHighlightFont(); } + + this-Refresh(false); } //v Doesn't seem to be a way to capture a selection event in a read-only wxTextCtrl. -- Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july ___ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src LyricsWindow.cpp, 1.4, 1.5 Menus.cpp, 1.505, 1.506 Menus.h, 1.140, 1.141 MixerBoard.cpp, 1.12, 1.13
Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv17223
Modified Files:
LyricsWindow.cpp Menus.cpp Menus.h MixerBoard.cpp
Log Message:
+ Renamed Lyrics to Karaoke in menu and window title bar.
+ Gale Andrews wrote:
One reason not to use Mixer Board is of course the screen
estate it uses. Have you considered a preference to have it
as a separate window that you can task switch between?
I know you can minimise it and task switch to get it back but
that is an extra step. Where you had (say) eight tracks so you
cannot see the waveforms and Mixer Board simultaneously
anyway, a separate window might be preferred by some.
This was just a side-effect of having it be wxFRAME_FLOAT_ON_PARENT, so
I've removed that.
Downside is that if the MixerBoard is entirely in front of the main
window, then doing anything in the main window causes it to be obscured. Added
calls to Raise() and SetFocus() to the menu command handler, so you can bring
it back with the menu command (or alt-tab).
Did the same changes for Karaoke window.
+ Removed constraints on horizontal resize, and I think this fixes the issues
Steve described. It still automatically resizes when you add or remove tracks,
and is only as wide as necessary when maximized.
Index: Menus.h
===
RCS file: /cvsroot/audacity/audacity-src/src/Menus.h,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -d -r1.140 -r1.141
--- Menus.h 9 Jul 2009 23:52:18 - 1.140
+++ Menus.h 29 Jul 2009 00:26:32 - 1.141
@@ -248,7 +248,7 @@
void OnHistory();
#ifdef EXPERIMENTAL_LYRICS_WINDOW
- void OnLyrics();
+ void OnKaraoke();
#endif
#ifdef EXPERIMENTAL_MIXER_BOARD
void OnMixerBoard();
Index: Menus.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/Menus.cpp,v
retrieving revision 1.505
retrieving revision 1.506
diff -u -d -r1.505 -r1.506
--- Menus.cpp 26 Jul 2009 13:18:28 - 1.505
+++ Menus.cpp 29 Jul 2009 00:26:32 - 1.506
@@ -530,7 +530,7 @@
AudioIONotBusyFlag | UndoAvailableFlag);
#ifdef EXPERIMENTAL_LYRICS_WINDOW
- c-AddItem(wxT(Lyrics), _(Lyrics...), FN(OnLyrics),
LabelTracksExistFlag, LabelTracksExistFlag);
+ c-AddItem(wxT(Karaoke), _(Karaoke...), FN(OnKaraoke),
LabelTracksExistFlag, LabelTracksExistFlag);
#endif
#ifdef EXPERIMENTAL_MIXER_BOARD
c-AddItem(wxT(MixerBoard), _(Mixer Board...), FN(OnMixerBoard),
WaveTracksExistFlag, WaveTracksExistFlag);
@@ -4161,12 +4161,13 @@
}
#ifdef EXPERIMENTAL_LYRICS_WINDOW
- void AudacityProject::OnLyrics()
+ void AudacityProject::OnKaraoke()
{
if (!mLyricsWindow)
mLyricsWindow = new LyricsWindow(this);
wxASSERT(mLyricsWindow);
mLyricsWindow-Show();
+ mLyricsWindow-Raise();
}
#endif
#ifdef EXPERIMENTAL_MIXER_BOARD
@@ -4178,6 +4179,8 @@
mMixerBoard = mMixerBoardFrame-mMixerBoard;
}
mMixerBoardFrame-Show();
+ mMixerBoardFrame-Raise();
+ mMixerBoardFrame-SetFocus();
}
#endif
Index: LyricsWindow.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/LyricsWindow.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- LyricsWindow.cpp9 Jul 2009 21:14:28 - 1.4
+++ LyricsWindow.cpp29 Jul 2009 00:26:32 - 1.5
@@ -45,18 +45,14 @@
LyricsWindow::LyricsWindow(AudacityProject *parent):
wxFrame(parent, -1,
-wxString::Format(_(Audacity Lyrics%s),
+wxString::Format(_(Audacity Karaoke%s),
((parent-GetName() == wxEmptyString) ?
wxT() :
wxString::Format(
wxT( - %s),
parent-GetName().c_str()).c_str())),
wxPoint(100, 300), gSize,
-wxDEFAULT_FRAME_STYLE
-#ifndef __WXMAC__
- | ((parent == NULL) ? 0x0 : wxFRAME_FLOAT_ON_PARENT) //v
-#endif
- )
+wxDEFAULT_FRAME_STYLE)
{
#ifdef __WXMAC__
// WXMAC doesn't support wxFRAME_FLOAT_ON_PARENT, so we do
Index: MixerBoard.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/MixerBoard.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- MixerBoard.cpp 26 Jul 2009 02:44:50 - 1.12
+++ MixerBoard.cpp 29 Jul 2009 00:26:32 - 1.13
@@ -49,7 +49,8 @@
const int kGainSliderMax = 6; // headroom convention to match typical mixer
boards layout
enum {
- ID_TOGGLEBUTTON_MUTE = 13000,
+
[Audacity-cvs] audacity-src/src/widgets ASlider.cpp, 1.79, 1.80 Meter.cpp, 1.50, 1.51
Update of /cvsroot/audacity/audacity-src/src/widgets
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27891/widgets
Modified Files:
ASlider.cpp Meter.cpp
Log Message:
minor update to constants and comments
Index: ASlider.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/widgets/ASlider.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- ASlider.cpp 15 Jul 2009 00:33:30 - 1.79
+++ ASlider.cpp 26 Jul 2009 01:56:43 - 1.80
@@ -451,7 +451,7 @@
if (mOrientation == wxHORIZONTAL)
mThumbBitmap = theTheme.Bitmap( bmpSliderThumb );
else
- //v \todo Convert this to an image in AllThemeResources, as
bmpSliderThumb.
+ //vvv \todo Convert this to an image in AllThemeResources, as
bmpSliderThumb.
{
wxImage thumbImage(wxBitmap(SliderThumb_Vertical).ConvertToImage());
mThumbBitmap = new wxBitmap(thumbImage);
Index: Meter.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/widgets/Meter.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- Meter.cpp 25 Jul 2009 17:17:13 - 1.50
+++ Meter.cpp 26 Jul 2009 01:56:43 - 1.51
@@ -878,7 +878,7 @@
}
// MixerTrackCluster style has no popup, so disallows SetStyle, so never
needs icon.
- //v There's an ASSERT failure if this: if (mStyle != MixerTrackCluster)
+ if (mStyle != MixerTrackCluster)
CreateIcon(mIconPos.y % 4);
mLayoutValid = true;
--
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src Audacity.h,1.68,1.69
Update of /cvsroot/audacity/audacity-src/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27891 Modified Files: Audacity.h Log Message: minor update to constants and comments Index: Audacity.h === RCS file: /cvsroot/audacity/audacity-src/src/Audacity.h,v retrieving revision 1.68 retrieving revision 1.69 diff -u -d -r1.68 -r1.69 --- Audacity.h 15 Jul 2009 22:10:33 - 1.68 +++ Audacity.h 26 Jul 2009 01:56:43 - 1.69 @@ -23,9 +23,9 @@ // Increment as appropriate every time you release a new version #define AUDACITY_VERSION 1 #define AUDACITY_RELEASE 3 -#define AUDACITY_REVISION 8 +#define AUDACITY_REVISION 9 #define AUDACITY_MODLEVEL 0 -#define AUDACITY_SUFFIX//wxT(-rc1)// __TDATE__ // wxT() +#define AUDACITY_SUFFIXwxT(-alpha-) __TDATE__ // wxT() #define AUDACITY_MAKESTR( x ) #x #define AUDACITY_QUOTE( x ) AUDACITY_MAKESTR( x ) -- ___ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src Menus.cpp, 1.503, 1.504 MixerBoard.cpp, 1.11, 1.12 MixerBoard.h, 1.4, 1.5 Project.cpp, 1.444, 1.445 Project.h, 1.160, 1.161 Track.cpp, 1.69, 1.70 TrackPanel.cpp, 1.468,
Update of /cvsroot/audacity/audacity-src/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30909 Modified Files: Menus.cpp MixerBoard.cpp MixerBoard.h Project.cpp Project.h Track.cpp TrackPanel.cpp TrackPanel.h Log Message: Fixed track selection updates between TrackPanel and MixerBoard (shift-click and single click, both directions). I think the original idea of the TP_ class name prefix was to identify TrackPanelListener-descendant methods, which were intended only for TrackPanel callbacks to its parent project. So I renamed AudacityProject::TP_GetTracksUsableArea to GetTPTracksUsableArea when I added the simlar TrackPanel manipulator, RefreshTPTrack, for MixerBoard to tell TrackPanel to update selections. Consolidated some redundant code between AudacityProject::OnSelectNone() and AudacityProject::SelectNone() so I wouldn't add more redundancy for MixerBoard. Some additional efficiency and safety improvements (e.g., update MixerBoard only for WaveTrack changes). Index: Project.h === RCS file: /cvsroot/audacity/audacity-src/src/Project.h,v retrieving revision 1.160 retrieving revision 1.161 diff -u -d -r1.160 -r1.161 --- Project.h 15 Jul 2009 13:14:00 - 1.160 +++ Project.h 26 Jul 2009 02:44:50 - 1.161 @@ -271,12 +271,18 @@ void FinishAutoScroll(); void FixScrollbars(); - // TrackPanel callback methods + // TrackPanel access + virtual wxSize GetTPTracksUsableArea(); + virtual void RefreshTPTrack(Track* pTrk, bool refreshbacking = true); - virtual wxSize TP_GetTracksUsableArea(); - virtual void TP_DisplayStatusMessage(wxString msg); + // TrackPanel callback methods, overrides of TrackPanelListener virtual void TP_DisplaySelection(); + virtual void TP_DisplayStatusMessage(wxString msg); + virtual int TP_GetCurrentTool(); + virtual ToolsToolBar * TP_GetToolsToolBar(); + virtual ControlToolBar * TP_GetControlToolBar(); + virtual void TP_OnPlayKey(); virtual void TP_PushState(wxString longDesc, wxString shortDesc, bool consolidate); @@ -287,8 +293,6 @@ virtual void TP_ScrollWindow(double scrollto); virtual void TP_ScrollUpDown(int delta); virtual void TP_HandleResize(); - virtual ControlToolBar * TP_GetControlToolBar(); - virtual ToolsToolBar * TP_GetToolsToolBar(); // ToolBar Index: MixerBoard.h === RCS file: /cvsroot/audacity/audacity-src/src/MixerBoard.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- MixerBoard.h12 Jul 2009 22:12:02 - 1.4 +++ MixerBoard.h26 Jul 2009 02:44:50 - 1.5 @@ -55,7 +55,6 @@ void UpdateMeter(double t0, double t1); private: - int GetGainToSliderValue(); wxColour GetTrackColor(); // event handlers @@ -156,10 +155,11 @@ bool HasSolo(); void IncrementSoloCount(int nIncrement = 1); - void RefreshTrackClusters(); + void RefreshTrackCluster(const WaveTrack* pLeftTrack, bool bEraseBackground = true); + void RefreshTrackClusters(bool bEraseBackground = true); void ResetMeters(); - void UniquelyMuteOrSolo(const WaveTrack* pTargetLeftTrack, bool bSolo); + void UniquelyMuteOrSolo(const WaveTrack* pTargetLeftTrack, bool bSolo); //v void UpdateName(const WaveTrack* pLeftTrack); void UpdateMute(const WaveTrack* pLeftTrack = NULL); // NULL means update for all tracks. Index: TrackPanel.h === RCS file: /cvsroot/audacity/audacity-src/src/TrackPanel.h,v retrieving revision 1.138 retrieving revision 1.139 diff -u -d -r1.138 -r1.139 --- TrackPanel.h9 Jul 2009 23:52:18 - 1.138 +++ TrackPanel.h26 Jul 2009 02:44:50 - 1.139 @@ -63,9 +63,11 @@ virtual void TP_DisplaySelection() = 0; virtual void TP_DisplayStatusMessage(wxString msg) = 0; + virtual int TP_GetCurrentTool() = 0; virtual ToolsToolBar * TP_GetToolsToolBar() = 0; virtual ControlToolBar * TP_GetControlToolBar() = 0; + virtual void TP_OnPlayKey() = 0; virtual void TP_PushState(wxString shortDesc, wxString longDesc, bool consolidate = false) = 0; Index: TrackPanel.cpp === RCS file: /cvsroot/audacity/audacity-src/src/TrackPanel.cpp,v retrieving revision 1.468 retrieving revision 1.469 diff -u -d -r1.468 -r1.469 --- TrackPanel.cpp 23 Jul 2009 01:56:16 - 1.468 +++ TrackPanel.cpp 26 Jul 2009 02:44:50 - 1.469 @@ -832,7 +832,7 @@ } #endif #ifdef EXPERIMENTAL_MIXER_BOARD - MixerBoard* pMixerBoard = p-GetMixerBoard(); + MixerBoard* pMixerBoard = this-GetMixerBoard(); if (pMixerBoard (p-GetAudioIOToken() 0))
Re: [Audacity-cvs] audacity-src/win audacity.iss, 1.37, 1.38 audacity_unicode.iss, 1.24, 1.25
Thanks, Gale. I just noticed I committed those and was about to commit
the same fix. I think I must have hit undo just before I quit and didn't
notice it had put back that copied chunk, not see it when I merged the
changes into the other.
Gale Andrews wrote:
Update of /cvsroot/audacity/audacity-src/win
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12624
Modified Files:
audacity.iss audacity_unicode.iss
Log Message:
; DestDir: {app}; Flags: ignoreversion is 'invalid if used in
[InstallDelete] section - stops the installer compiling. It still seems to
get rid of the targeted files OK.
Index: audacity.iss
===
RCS file: /cvsroot/audacity/audacity-src/win/audacity.iss,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- audacity.iss 18 Jul 2009 00:51:15 - 1.37
+++ audacity.iss 18 Jul 2009 06:24:03 - 1.38
@@ -104,7 +104,7 @@
; Get rid of previous versions of MSVC runtimes.
Type: files; Name: {app}\Microsoft.VC80.CRT.manifest
Type: files; Name: {app}\msvcp80.dll
-Type: files; Name: {app}\msvcr80.dll; DestDir: {app}; Flags:
ignoreversion
+Type: files; Name: {app}\msvcr80.dll
; Don't want to do this because user may have stored their own.
; Type: filesandordirs; Name: {app}\vst
--
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize
details at: http://p.sf.net/sfu/Challenge
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/win audacity.iss, 1.36, 1.37 audacity_unicode.iss, 1.23, 1.24
Update of /cvsroot/audacity/audacity-src/win
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv14372
Modified Files:
audacity.iss audacity_unicode.iss
Log Message:
Get rid of previous versions of MSVC runtimes.
Index: audacity.iss
===
RCS file: /cvsroot/audacity/audacity-src/win/audacity.iss,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- audacity.iss17 Jul 2009 18:44:41 - 1.36
+++ audacity.iss18 Jul 2009 00:51:15 - 1.37
@@ -100,7 +100,13 @@
; Get rid of Audacity 1.0.0 stuff that's no longer used.
Type: files; Name: {app}\audacity-help.htb
Type: files; Name: {app}\audacity-1.2-help.htb
-; Don't think we want to do this because user may have stored their own.
+
+; Get rid of previous versions of MSVC runtimes.
+Type: files; Name: {app}\Microsoft.VC80.CRT.manifest
+Type: files; Name: {app}\msvcp80.dll
+Type: files; Name: {app}\msvcr80.dll; DestDir: {app}; Flags: ignoreversion
+
+; Don't want to do this because user may have stored their own.
; Type: filesandordirs; Name: {app}\vst
; We've switched from a folder in the start menu to just the Audacity.exe at
the top level.
@@ -120,6 +126,9 @@
Root: HKCR; Subkey: Audacity.Project\shell\open; Flags:
createvalueifdoesntexist uninsdeletekey;
Root: HKCR; Subkey: Audacity.Project\shell\open\command; ValueType: string;
ValueData: {app}\audacity.exe %1; Flags: createvalueifdoesntexist
uninsdeletekey;
+;The following would allow a following 'help' installer to know where to put
the 'help' files.
+;Root: HKCR; Subkey: Audacity.Project\Path; ValueType: string; ValueData:
{app}; Flags: createvalueifdoesntexist uninsdeletekey;
+
[Run]
Filename: {app}\audacity.exe; Description: Launch Audacity; Flags: nowait
postinstall skipifsilent
Index: audacity_unicode.iss
===
RCS file: /cvsroot/audacity/audacity-src/win/audacity_unicode.iss,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- audacity_unicode.iss17 Jul 2009 18:38:30 - 1.23
+++ audacity_unicode.iss18 Jul 2009 00:51:15 - 1.24
@@ -59,7 +59,7 @@
[Files]
-; Don't display in separate window, rather as InfoAfterFile. Source:
..\README.txt; DestDir: {app}; Flags: ignoreversion isreadme
+; Don't display in separate window, rather as InfoAfterFile. Source:
..\README.txt; DestDir: {app}; Flags: ignoreversion isreadme
Source: ..\README.txt; DestDir: {app}; Flags: ignoreversion
Source: ..\LICENSE.txt; DestDir: {app}; Flags: ignoreversion
@@ -100,7 +100,13 @@
; Get rid of Audacity 1.0.0 stuff that's no longer used.
Type: files; Name: {app}\audacity-help.htb
Type: files; Name: {app}\audacity-1.2-help.htb
-; Don't think we want to do this because user may have stored their own.
+
+; Get rid of previous versions of MSVC runtimes.
+Type: files; Name: {app}\Microsoft.VC80.CRT.manifest
+Type: files; Name: {app}\msvcp80.dll
+Type: files; Name: {app}\msvcr80.dll; DestDir: {app}; Flags: ignoreversion
+
+; Don't want to do this because user may have stored their own.
; Type: filesandordirs; Name: {app}\vst
; We've switched from a folder in the start menu to just the Audacity.exe at
the top level.
@@ -119,6 +125,7 @@
Root: HKCR; Subkey: Audacity.Project\shell; ValueType: string; ValueData:
; Flags: createvalueifdoesntexist uninsdeletekey;
Root: HKCR; Subkey: Audacity.Project\shell\open; Flags:
createvalueifdoesntexist uninsdeletekey;
Root: HKCR; Subkey: Audacity.Project\shell\open\command; ValueType: string;
ValueData: {app}\audacity.exe %1; Flags: createvalueifdoesntexist
uninsdeletekey;
+
;The following would allow a following 'help' installer to know where to put
the 'help' files.
;Root: HKCR; Subkey: Audacity.Project\Path; ValueType: string; ValueData:
{app}; Flags: createvalueifdoesntexist uninsdeletekey;
--
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize
details at: http://p.sf.net/sfu/Challenge
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src/widgets ProgressDialog.cpp, 1.18, 1.19 ProgressDialog.h, 1.11, 1.12
Update of /cvsroot/audacity/audacity-src/src/widgets
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15510
Modified Files:
ProgressDialog.cpp ProgressDialog.h
Log Message:
fix bug in TimerProgressDialog not updating prog bars (wxGauge)
Index: ProgressDialog.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/widgets/ProgressDialog.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- ProgressDialog.cpp 8 Jun 2009 08:01:25 - 1.18
+++ ProgressDialog.cpp 15 Jul 2009 23:29:29 - 1.19
@@ -1414,6 +1414,14 @@
Show(true);
}
+ int nGaugeValue = (1000 * elapsed) / mDuration; // range = [0,1000]
+ wxASSERT((nGaugeValue = 0) (nGaugeValue = 1000));
+ if (nGaugeValue != mLastValue)
+ {
+ mGauge-SetValue(nGaugeValue);
+ mLastValue = nGaugeValue;
+ }
+
// Only update if a full second has passed.
if (now - mLastUpdate 1000)
{
Index: ProgressDialog.h
===
RCS file: /cvsroot/audacity/audacity-src/src/widgets/ProgressDialog.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ProgressDialog.h8 Jun 2009 08:01:25 - 1.11
+++ ProgressDialog.h15 Jul 2009 23:29:29 - 1.12
@@ -72,21 +72,19 @@
protected:
wxStaticText *mElapsed;
wxStaticText *mRemaining;
+ wxGauge *mGauge;
wxLongLong_t mStartTime;
wxLongLong_t mLastUpdate;
+ int mLastValue; // gauge value, range = [0,1000]
bool mCancel;
bool mStop;
private:
wxWindow *mHadFocus;
- wxGauge *mGauge;
wxStaticText *mMessage;
wxWindowDisabler *mDisable;
-
- int mLastValue;
-
DECLARE_EVENT_TABLE();
};
--
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize
details at: http://p.sf.net/sfu/Challenge
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src/widgets ASlider.cpp,1.77,1.78
Update of /cvsroot/audacity/audacity-src/src/widgets In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv19701/audacity/src/widgets Modified Files: ASlider.cpp Log Message: Change back to having MixerBoard gain sliders max at +6dB. Index: ASlider.cpp === RCS file: /cvsroot/audacity/audacity-src/src/widgets/ASlider.cpp,v retrieving revision 1.77 retrieving revision 1.78 diff -u -d -r1.77 -r1.78 --- ASlider.cpp 13 Jul 2009 08:29:44 - 1.77 +++ ASlider.cpp 14 Jul 2009 22:33:00 - 1.78 @@ -382,10 +382,10 @@ break; case DB_SLIDER: minValue = -36.0f; - //if (orientation == wxHORIZONTAL) + if (orientation == wxHORIZONTAL) maxValue = 36.0f; - //else - // maxValue = 6.0f; // for MixerBoard + else + maxValue = 6.0f; // for MixerBoard stepValue = 1.0f; speed = 0.5; break; -- Enter the BlackBerry Developer Challenge This is your chance to win up to $100,000 in prizes! For a limited time, vendors submitting new applications to BlackBerry App World(TM) will have the opportunity to enter the BlackBerry Developer Challenge. See full prize details at: http://p.sf.net/sfu/Challenge ___ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src MixerBoard.cpp,1.9,1.10
Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv19701/audacity/src
Modified Files:
MixerBoard.cpp
Log Message:
Change back to having MixerBoard gain sliders max at +6dB.
Index: MixerBoard.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/MixerBoard.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- MixerBoard.cpp 13 Jul 2009 08:35:58 - 1.9
+++ MixerBoard.cpp 14 Jul 2009 22:33:00 - 1.10
@@ -46,7 +46,7 @@
const int kFramesPerBuffer = 4; // for calls to mMeter-UpdateDisplay
const int kGainSliderMin = -36;
-const int kGainSliderMax = 36; //vvv Don't want TrackPanel gain to be higher
than 6, but this one showing only 6. 6;
+const int kGainSliderMax = 6; // headroom convention to match typical mixer
boards layout
enum {
ID_TOGGLEBUTTON_MUTE = 13000,
--
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize
details at: http://p.sf.net/sfu/Challenge
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src MixerBoard.cpp,1.10,1.11
Update of /cvsroot/audacity/audacity-src/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31298 Modified Files: MixerBoard.cpp Log Message: Martyn's improved fix for rms catch-up issue Index: MixerBoard.cpp === RCS file: /cvsroot/audacity/audacity-src/src/MixerBoard.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- MixerBoard.cpp 14 Jul 2009 22:33:00 - 1.10 +++ MixerBoard.cpp 15 Jul 2009 00:59:25 - 1.11 @@ -179,11 +179,7 @@ new Meter(this, -1, // wxWindow* parent, wxWindowID id, false, // bool isInput ctrlPos, ctrlSize, // const wxPoint pos = wxDefaultPosition, const wxSize size = wxDefaultSize, -Meter::MixerTrackCluster, // Style style = HorizontalStereo, - -// 1024 is typical for framesPerBuffer in calls to audacityAudioCallback. -// But we're far fewer frames, so scale the decay rate accordingly. -60.0f * 1024.0f / (float)kFramesPerBuffer); // float fDecayRate = 60); +Meter::MixerTrackCluster); // Style style = HorizontalStereo, #if wxUSE_TOOLTIPS mStaticText_TrackName-SetToolTip(_T(Track Name)); @@ -285,7 +281,8 @@ float* rmsLeft = new float[kFramesPerBuffer]; float* maxRight = new float[kFramesPerBuffer]; float* rmsRight = new float[kFramesPerBuffer]; - + const sampleCount kSampleCount = mLeftTrack-TimeToLongSamples(t1 - t0); + bool bSuccess = true; const double kFrameInterval = (t1 - t0) / (double)kFramesPerBuffer; double dFrameT0 = t0; @@ -334,7 +331,8 @@ 2, // If mono, show left track values in both meters, as in MeterToolBar. kNumChannels, kFramesPerBuffer, maxLeft, rmsLeft, - maxRight, rmsRight); + maxRight, rmsRight, + kSampleCount); delete[] maxLeft; delete[] rmsLeft; -- Enter the BlackBerry Developer Challenge This is your chance to win up to $100,000 in prizes! For a limited time, vendors submitting new applications to BlackBerry App World(TM) will have the opportunity to enter the BlackBerry Developer Challenge. See full prize details at: http://p.sf.net/sfu/Challenge ___ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src/widgets Meter.cpp, 1.48, 1.49 Meter.h, 1.14, 1.15
Update of /cvsroot/audacity/audacity-src/src/widgets
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31298/widgets
Modified Files:
Meter.cpp Meter.h
Log Message:
Martyn's improved fix for rms catch-up issue
Index: Meter.h
===
RCS file: /cvsroot/audacity/audacity-src/src/widgets/Meter.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Meter.h 12 Jul 2009 22:12:02 - 1.14
+++ Meter.h 15 Jul 2009 00:59:25 - 1.15
@@ -144,7 +144,8 @@
void UpdateDisplay(int numChannels, int numFrames,
// Need to make these double-indexed max and min
arrays if we handle more than 2 channels.
float* maxLeft, float* rmsLeft,
-float* maxRight, float* rmsRight);
+float* maxRight, float* rmsRight,
+const sampleCount kSampleCount);
/** \brief Find out if the level meter is disabled or not.
*
Index: Meter.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/widgets/Meter.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- Meter.cpp 13 Jul 2009 23:48:58 - 1.48
+++ Meter.cpp 15 Jul 2009 00:59:25 - 1.49
@@ -557,13 +557,14 @@
void Meter::UpdateDisplay(int numChannels, int numFrames,
// Need to make these double-indexed arrays if we
handle more than 2 channels.
float* maxLeft, float* rmsLeft,
- float* maxRight, float* rmsRight)
+ float* maxRight, float* rmsRight,
+ const sampleCount kSampleCount)
{
int i, j;
int num = intmin(numChannels, mNumBars);
MeterUpdateMsg msg;
- msg.numFrames = numFrames;
+ msg.numFrames = kSampleCount;
for(j=0; jmNumBars; j++) {
msg.peak[j] = 0.0;
msg.rms[j] = 0.0;
@@ -644,12 +645,8 @@
mBar[j].peak = msg.peak[j];
// This smooths out the RMS signal
- if (mStyle != MixerTrackCluster)
-mBar[j].rms = mBar[j].rms * 0.9 + msg.rms[j] * 0.1;
- else
-// MixerTrackCluster needs far faster blend-in of new values,
-// because far fewer frames are being seen at this call.
-mBar[j].rms = (mBar[j].rms * 0.7) + (msg.rms[j] * 0.3);
+ float smooth = pow(0.9, (double)msg.numFrames/1024.0);
+ mBar[j].rms = mBar[j].rms * smooth + msg.rms[j] * (1.0 - smooth);
if (mT - mBar[j].peakHoldTime mPeakHoldDuration ||
mBar[j].peak mBar[j].peakHold) {
--
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize
details at: http://p.sf.net/sfu/Challenge
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src/widgets ASlider.cpp,1.78,1.79
Update of /cvsroot/audacity/audacity-src/src/widgets
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29165
Modified Files:
ASlider.cpp
Log Message:
some clarifications in looking into adding longer tick at 0.0
Index: ASlider.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/widgets/ASlider.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- ASlider.cpp 14 Jul 2009 22:33:00 - 1.78
+++ ASlider.cpp 15 Jul 2009 00:33:30 - 1.79
@@ -705,7 +705,7 @@
}
}
- // internal tick marks
+ // tick marks
int divs = 10;
double upp;
if (mOrientation == wxHORIZONTAL)
@@ -716,23 +716,24 @@
divs = (int)(mMaxValue - mMinValue);
upp = divs / (double)(mHeightY-1);
}
- double d = 0;
+ double d = 0.0;
int int_d = -1;
const int kMax = (mOrientation == wxHORIZONTAL) ? mWidthX : mHeightY;
for(int p = 0; p = kMax; p++) {
if (((int)d) int_d) {
int_d = (int)d;
- int ht = (int_d==0 || int_d==divs? 5: 3);
+ int tickLength = ((int_d == 0) || (int_d == divs)) ? 5: 3; // longer
ticks at extremes
AColor::Light(dc, false);
if (mOrientation == wxHORIZONTAL)
-AColor::Line(*dc, mLeftX+p, mCenterY-ht, mLeftX+p, mCenterY-1); //
ticks above
+AColor::Line(*dc, mLeftX+p, mCenterY-tickLength, mLeftX+p,
mCenterY-1); // ticks above
else
-AColor::Line(*dc, mCenterX-ht, mTopY+p, mCenterX-1, mTopY+p); //
ticks at left
+AColor::Line(*dc, mCenterX-tickLength, mTopY+p, mCenterX-1,
mTopY+p); // ticks at left
+
AColor::Dark(dc, false);
if (mOrientation == wxHORIZONTAL)
-AColor::Line(*dc, mLeftX+p+1, mCenterY-ht+1, mLeftX+p+1,
mCenterY-1); // ticks above
+AColor::Line(*dc, mLeftX+p+1, mCenterY-tickLength+1, mLeftX+p+1,
mCenterY-1); // ticks above
else
-AColor::Line(*dc, mCenterX-ht+1, mTopY+p+1, mCenterX-1,
mTopY+p+1); // ticks at left
+AColor::Line(*dc, mCenterX-tickLength+1, mTopY+p+1, mCenterX-1,
mTopY+p+1); // ticks at left
}
d += upp;
}
--
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize
details at: http://p.sf.net/sfu/Challenge
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src/widgets ASlider.cpp,1.76,1.77
Update of /cvsroot/audacity/audacity-src/src/widgets In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15667/widgets Modified Files: ASlider.cpp Log Message: Make MixerBoard gain slider have same range as Track. Index: ASlider.cpp === RCS file: /cvsroot/audacity/audacity-src/src/widgets/ASlider.cpp,v retrieving revision 1.76 retrieving revision 1.77 diff -u -d -r1.76 -r1.77 --- ASlider.cpp 12 Jul 2009 15:46:28 - 1.76 +++ ASlider.cpp 13 Jul 2009 08:29:44 - 1.77 @@ -382,10 +382,10 @@ break; case DB_SLIDER: minValue = -36.0f; - if (orientation == wxHORIZONTAL) + //if (orientation == wxHORIZONTAL) maxValue = 36.0f; - else - maxValue = 6.0f; // for MixerBoard + //else + // maxValue = 6.0f; // for MixerBoard stepValue = 1.0f; speed = 0.5; break; -- Enter the BlackBerry Developer Challenge This is your chance to win up to $100,000 in prizes! For a limited time, vendors submitting new applications to BlackBerry App World(TM) will have the opportunity to enter the BlackBerry Developer Challenge. See full prize details at: http://p.sf.net/sfu/Challenge ___ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src MixerBoard.cpp,1.8,1.9
Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv16535
Modified Files:
MixerBoard.cpp
Log Message:
more fixes for MixerBoard meter updates
Index: MixerBoard.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/MixerBoard.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- MixerBoard.cpp 12 Jul 2009 22:12:02 - 1.8
+++ MixerBoard.cpp 13 Jul 2009 08:35:58 - 1.9
@@ -43,10 +43,10 @@
#define PAN_HEIGHT 24
// If we decide we want more than 1 frame, base it on sample rate.
-const int kFramesPerBuffer = 1; // for calls to mMeter-UpdateDisplay
+const int kFramesPerBuffer = 4; // for calls to mMeter-UpdateDisplay
const int kGainSliderMin = -36;
-const int kGainSliderMax = 6;
+const int kGainSliderMax = 36; //vvv Don't want TrackPanel gain to be higher
than 6, but this one showing only 6. 6;
enum {
ID_TOGGLEBUTTON_MUTE = 13000,
@@ -96,6 +96,7 @@
//v Useful when different tracks are different colors, but not now.
//mStaticText_TrackName-SetBackgroundColour(this-GetTrackColor());
+
// musical instrument image
ctrlPos.x = (size.GetWidth() - MUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH) / 2; //
center
ctrlPos.y += TRACK_NAME_HEIGHT + kDoubleInset;
@@ -105,6 +106,7 @@
mStaticBitmap_MusicalInstrument =
new wxStaticBitmap(this, -1, *bitmap, ctrlPos, ctrlSize);
+
// mute/solo buttons
int nHalfWidth = (size.GetWidth() / 2);
ctrlPos.x = ((nHalfWidth - mMixerBoard-mMuteSoloWidth) / 2) + kInset;
@@ -119,6 +121,7 @@
mToggleButton_Mute-SetAlternateImages(
*(mMixerBoard-mImageMuteUp), *(mMixerBoard-mImageMuteOver),
*(mMixerBoard-mImageMuteDown), *(mMixerBoard-mImageMuteDisabled));
+ this-UpdateMute();
ctrlPos.x = nHalfWidth + kInset;
mToggleButton_Solo =
@@ -127,7 +130,9 @@
*(mMixerBoard-mImageSoloUp),
*(mMixerBoard-mImageSoloOver),
*(mMixerBoard-mImageSoloDown),
*(mMixerBoard-mImageSoloDisabled),
true); // toggle button
+ this-UpdateSolo();
+
// pan slider
ctrlPos.x = (size.GetWidth() / 10);
ctrlPos.y += MUTE_SOLO_HEIGHT + kQuadrupleInset;
@@ -138,7 +143,10 @@
ctrlSize.x--;
/* i18n-hint: Title of the Pan slider, used to move the sound left or right
*/
- mSlider_Pan = new ASlider(this, ID_ASLIDER_PAN, _(Pan), ctrlPos,
ctrlSize, PAN_SLIDER, true); //v popup feedback?
+ mSlider_Pan = new ASlider(this, ID_ASLIDER_PAN, _(Pan), ctrlPos,
ctrlSize, PAN_SLIDER, true);
+
+ this-UpdatePan();
+
// gain slider level meter
ctrlPos.x = kDoubleInset;
@@ -161,6 +169,9 @@
// mSlider_Gain-SetBackgroundColour(wxColour(192, 192, 192));
//#endif
+ this-UpdateGain();
+
+
ctrlPos.x = nHalfWidth - kExtraWidthForMeter;
ctrlSize.SetWidth(nHalfWidth - kInset + kExtraWidthForMeter);
@@ -301,7 +312,7 @@
i++;
}
- bool bWantPostFadeValues = true; //v Turn this into a pref, default
true.
+ bool bWantPostFadeValues = true; //vvv Turn this into a pref, default true.
if (bSuccess bWantPostFadeValues)
{
for (i = 0; i kFramesPerBuffer; i++)
@@ -486,16 +497,6 @@
void MixerTrackCluster::OnSlider_Gain(wxCommandEvent event)
{
- // Analog to LWSlider::Set() calc for DB_SLIDER.
- //v int sliderValue = mSlider_Gain-GetValue();
-
- //#ifdef __WXMSW__
- // // Negate because wxSlider on Windows has min at top, max at bottom.
- // // mSlider_Gain-GetValue() is in [-6,36]. wxSlider has min at top, so
this is [-36dB,6dB].
- // sliderValue = -sliderValue;
- //#endif
-
- //float fValue = pow(10.0f, (float)sliderValue / 20.0f);
float fValue = mSlider_Gain-Get();
mLeftTrack-SetGain(fValue);
if (mRightTrack != NULL)
@@ -562,7 +563,6 @@
BEGIN_EVENT_TABLE(MixerBoardScrolledWindow, wxScrolledWindow)
EVT_MOUSE_EVENTS(MixerBoardScrolledWindow::OnMouseEvent)
- EVT_PAINT(MixerBoardScrolledWindow::OnPaint)
END_EVENT_TABLE()
MixerBoardScrolledWindow::MixerBoardScrolledWindow(AudacityProject* project,
@@ -1005,11 +1005,10 @@
int width;
int height;
- this-GetClientSize(width, height);
- if (newWidth == width - 3) // -3 is fudge to accommodate GetClientSize.
- return;
+ pParent-GetSize(width, height);
+ if (newWidth == width)
+ return; // No need to update.
- pParent-SetSize(newWidth, -1);
pParent-SetSizeHints(
kMinWidth, // int minW=-1,
MIXER_BOARD_MIN_HEIGHT, // int minH=-1,
@@ -1023,11 +1022,16 @@
void MixerBoard::CreateMuteSoloImages()
{
+ // Much of this is taken TrackLabel::DrawMuteSolo
wxMemoryDC dc;
wxString str = _(Mute);
long textWidth, textHeight;
- //v See TrackPanel::OnSetFont because this is deprecated:
AColor::SetLabelFont(dc);
+ int fontSize = 10;
+ #ifdef __WXMSW__
+
[Audacity-cvs] audacity-src/src/widgets Meter.cpp,1.46,1.47
Update of /cvsroot/audacity/audacity-src/src/widgets
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv16535/widgets
Modified Files:
Meter.cpp
Log Message:
more fixes for MixerBoard meter updates
Index: Meter.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/widgets/Meter.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- Meter.cpp 12 Jul 2009 22:12:02 - 1.46
+++ Meter.cpp 13 Jul 2009 08:35:58 - 1.47
@@ -324,12 +324,14 @@
{
mDBRange = gPrefs-Read(wxT(/GUI/EnvdBRange), ENV_DB_RANGE);
mMeterRefreshRate = gPrefs-Read(wxT(/Meter/MeterRefreshRate), 30);
- if (mIsInput) {
+
+ // MixerTrackCluster style has no menu, so disallows disabling the meter.
+ if (mStyle == MixerTrackCluster)
+ mMeterDisabled = 0L;
+ else if (mIsInput)
mMeterDisabled = gPrefs-Read(wxT(/Meter/MeterInputDisabled), (long)0);
- }
- else {
+ else
mMeterDisabled = gPrefs-Read(wxT(/Meter/MeterOutputDisabled),
(long)0);
- }
}
void Meter::OnErase(wxEraseEvent evt)
--
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize
details at: http://p.sf.net/sfu/Challenge
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src Menus.cpp,1.499,1.500
Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv19603
Modified Files:
Menus.cpp
Log Message:
Fix crash bug reported by Stan.
Index: Menus.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/Menus.cpp,v
retrieving revision 1.499
retrieving revision 1.500
diff -u -d -r1.499 -r1.500
--- Menus.cpp 9 Jul 2009 23:52:18 - 1.499
+++ Menus.cpp 13 Jul 2009 09:13:11 - 1.500
@@ -3922,7 +3922,8 @@
mTrackPanel-Refresh(false);
#ifdef EXPERIMENTAL_MIXER_BOARD
- mMixerBoard-Refresh(false);
+ if (mMixerBoard)
+ mMixerBoard-Refresh(false);
#endif
}
@@ -5163,7 +5164,7 @@
while (t) {
if (t-GetSelected()) {
#ifdef EXPERIMENTAL_MIXER_BOARD
-if (t-GetKind() == Track::Wave)
+if (mMixerBoard (t-GetKind() == Track::Wave))
mMixerBoard-RemoveTrackCluster((WaveTrack*)t);
#endif
if (!f)
@@ -5196,7 +5197,8 @@
mTrackPanel-Refresh(false);
#ifdef EXPERIMENTAL_MIXER_BOARD
- mMixerBoard-Refresh(true);
+ if (mMixerBoard)
+ mMixerBoard-Refresh(true);
#endif
}
--
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize
details at: http://p.sf.net/sfu/Challenge
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src/widgets Meter.cpp,1.47,1.48
Update of /cvsroot/audacity/audacity-src/src/widgets
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv24661/audacity/src/widgets
Modified Files:
Meter.cpp
Log Message:
Adjust the rms blending ratio because MixerTrackCluster sends far fewer frames
per buffer.
Index: Meter.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/widgets/Meter.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- Meter.cpp 13 Jul 2009 08:35:58 - 1.47
+++ Meter.cpp 13 Jul 2009 23:48:58 - 1.48
@@ -644,7 +644,12 @@
mBar[j].peak = msg.peak[j];
// This smooths out the RMS signal
- mBar[j].rms = mBar[j].rms * 0.9 + msg.rms[j] * 0.1;
+ if (mStyle != MixerTrackCluster)
+mBar[j].rms = mBar[j].rms * 0.9 + msg.rms[j] * 0.1;
+ else
+// MixerTrackCluster needs far faster blend-in of new values,
+// because far fewer frames are being seen at this call.
+mBar[j].rms = (mBar[j].rms * 0.7) + (msg.rms[j] * 0.3);
if (mT - mBar[j].peakHoldTime mPeakHoldDuration ||
mBar[j].peak mBar[j].peakHold) {
--
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize
details at: http://p.sf.net/sfu/Challenge
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src/widgets Meter.cpp,1.44,1.45
Update of /cvsroot/audacity/audacity-src/src/widgets
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv24549
Modified Files:
Meter.cpp
Log Message:
more MixerBoard porting and questions on other stuff
Index: Meter.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/widgets/Meter.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- Meter.cpp 9 Jul 2009 23:52:18 - 1.44
+++ Meter.cpp 12 Jul 2009 07:16:59 - 1.45
@@ -578,7 +578,7 @@
// samples in a row, also send the number of peaked samples
// at the head and tail, in case there's a run
// of peaked samples that crosses block boundaries.
- if (fabs((j == 0) ? maxLeft[i] : maxRight[i]) = 1.0)
+ if (fabs((j == 0) ? maxLeft[i] : maxRight[i]) = MAX_AUDIO)
{
if (msg.headPeakCount[j]==i)
msg.headPeakCount[j]++;
@@ -616,7 +616,8 @@
double deltaT = msg.numFrames / mRate;
int j;
- // Why is this in the loop, rather than top of the method?
+ // Why is this in the loop, rather than top of the method?
+ //Or just a condition on the following, so we pop all the msgs while
disabled?
if (mMeterDisabled)
return;
//wxLogDebug(wxT(Pop: %s), msg.toString().c_str());
--
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize
details at: http://p.sf.net/sfu/Challenge
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src TrackPanel.cpp,1.466,1.467
Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv24853
Modified Files:
TrackPanel.cpp
Log Message:
Name a magic number for TrackPanel timer interval.
Index: TrackPanel.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/TrackPanel.cpp,v
retrieving revision 1.466
retrieving revision 1.467
diff -u -d -r1.466 -r1.467
--- TrackPanel.cpp 11 Jul 2009 04:05:16 - 1.466
+++ TrackPanel.cpp 12 Jul 2009 07:20:11 - 1.467
@@ -234,6 +234,7 @@
#define kLeftInset 4
#define kTopInset 4
+#define kTimerInterval 50 // milliseconds
// Is the distance between A and B less than D?
template class A, class B, class DIST bool within(A a, B b, DIST d)
@@ -499,7 +500,7 @@
mTimeCount = 0;
mTimer.parent = this;
- mTimer.Start(50, FALSE);
+ mTimer.Start(kTimerInterval, FALSE);
//Initialize a member variable pointing to the current
//drawing track.
@@ -4199,7 +4200,7 @@
// When this timer fires, we call TrackPanel::OnTimer and
// possibly update the screen for offscreen scrolling.
mTimer.Stop();
- mTimer.Start(50, FALSE);
+ mTimer.Start(kTimerInterval, FALSE);
}
if (event.ButtonDown()) {
--
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize
details at: http://p.sf.net/sfu/Challenge
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src MixerBoard.cpp,1.5,1.6
Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv26065
Modified Files:
MixerBoard.cpp
Log Message:
I think this fixes the MixerBoard meter update issues:
* Using GetMinMax and GetRMS correctly. (Misunderstood analogy to old
GetWaveDisplay.)
* Clipping no longer over-reported.
* Change from pre-fade to post-fade display.
* Mono tracks now show both channels, but from same mono source, affected by
gain and pan.
Index: MixerBoard.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/MixerBoard.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- MixerBoard.cpp 11 Jul 2009 04:05:16 - 1.5
+++ MixerBoard.cpp 12 Jul 2009 07:30:30 - 1.6
@@ -142,8 +142,8 @@
ctrlPos.y += PAN_HEIGHT + kQuadrupleInset;
// Instead of an even split of the cluster width, give extra pixels to the
meter
- const int kExtraMeter = 8;
- ctrlSize = wxSize((nHalfWidth - kTripleInset - kExtraMeter),
+ const int kExtraWidthForMeter = 8;
+ ctrlSize = wxSize((nHalfWidth - kTripleInset - kExtraWidthForMeter),
(size.GetHeight() - ctrlPos.y - kQuadrupleInset));
/* i18n-hint: Title of the Gain slider, used to adjust the volume */
@@ -158,8 +158,8 @@
// mSlider_Gain-SetBackgroundColour(wxColour(192, 192, 192));
//#endif
- ctrlPos.x = nHalfWidth - kExtraMeter;
- ctrlSize.SetWidth(nHalfWidth - kInset + kExtraMeter);
+ ctrlPos.x = nHalfWidth - kExtraWidthForMeter;
+ ctrlSize.SetWidth(nHalfWidth - kInset + kExtraWidthForMeter);
mMeter =
new Meter(this, -1, // wxWindow* parent, wxWindowID id,
@@ -262,35 +262,72 @@
return;
}
- int numChannels = (mRightTrack != NULL) ? 2 : 1; // Doesn't handle more
than 2 channels, as per kMaxMeterBars.
+ // 50ms is TrackPanel's timer interval.
+ // But be more recent here, just the last 10%.
+ const double kTimerInterval = 0.0005;
+
+ double t0 = t1 - kTimerInterval;
+ if (t0 0.0)
+ return; // Don't update until we have enough frames.
- // This value 256 is similar to typical values I saw for
- // framesPerBuffer in audacityAudioCallback,
- // but a smaller number gives better performance.
- const int framesPerBuffer = 256;
+ const int kFramesPerBuffer = 500;
+ float min; // A dummy, since it's not shown in meters.
- sampleCount pos1 = mLeftTrack-TimeToLongSamples(t1);
- sampleCount pos0 = pos1 - framesPerBuffer + 1;
- if (pos0 0)
- pos0 = 0;
- double t0 = mLeftTrack-LongSamplesToTime(pos0);
+ float* maxLeft = new float[kFramesPerBuffer];
+ float* rmsLeft = new float[kFramesPerBuffer];
+ float* maxRight = new float[kFramesPerBuffer];
+ float* rmsRight = new float[kFramesPerBuffer];
- // Arrays containing the shape of the waveform - each array has one value
per pixel.
- float* min = new float[framesPerBuffer]; // Don't need separate left
right ones, because it's ignored.
- float* maxLeft = new float[framesPerBuffer];
- float* rmsLeft = new float[framesPerBuffer];
- float* maxRight = (numChannels == 1) ? NULL : new float[framesPerBuffer];
- float* rmsRight = (numChannels == 1) ? NULL : new float[framesPerBuffer];
+ bool bSuccess = true;
+ const double kFrameInterval = kTimerInterval / (double)kFramesPerBuffer;
+ double dFrameT0 = t0;
+ double dFrameT1 = t0 + kFrameInterval;
+ unsigned int i = 0;
+ while (bSuccess (i kFramesPerBuffer))
+ {
+ bSuccess =
+ mLeftTrack-GetMinMax(min, (maxLeft[i]), dFrameT0, dFrameT1)
+ mLeftTrack-GetRMS((rmsLeft[i]), dFrameT0, dFrameT1);
+ if (bSuccess mRightTrack)
+ bSuccess =
+mRightTrack-GetMinMax(min, (maxRight[i]), dFrameT0, dFrameT1)
+mRightTrack-GetRMS((rmsRight[i]), dFrameT0, dFrameT1);
+ else
+ {
+ // Mono: Start with raw values same as left.
+ // To be modified by bWantPostFadeValues and channel pan/gain.
+ maxRight[i] = maxLeft[i];
+ rmsRight[i] = rmsLeft[i];
+ }
+ dFrameT0 += kFrameInterval;
+ dFrameT1 += kFrameInterval;
+ i++;
+ }
- if (mLeftTrack-GetMinMax(min, maxLeft, t0, t1)
- mLeftTrack-GetRMS(rmsLeft, t0, t1)
- (!mRightTrack ||
-(mRightTrack-GetMinMax(min, maxRight, t0, t1)
- mRightTrack-GetRMS(rmsRight, t0, t1
- mMeter-UpdateDisplay(numChannels, framesPerBuffer,
- maxLeft, rmsLeft, maxRight, rmsRight);
+ bool bWantPostFadeValues = true; //v Turn this into a pref, default
true.
+ if (bSuccess bWantPostFadeValues)
+ {
+ for (i = 0; i kFramesPerBuffer; i++)
+ {
+ float gain = mLeftTrack-GetChannelGain(0);
+ maxLeft[i] *= gain;
+ rmsLeft[i] *= gain;
+ if (mRightTrack)
+gain = mRightTrack-GetChannelGain(1);
+ else
+
[Audacity-cvs] audacity-src/src Experimental.h, 1.60, 1.61 MixerBoard.cpp, 1.6, 1.7
Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv21756
Modified Files:
Experimental.h MixerBoard.cpp
Log Message:
Adjust some values and comments.
Index: Experimental.h
===
RCS file: /cvsroot/audacity/audacity-src/src/Experimental.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- Experimental.h 9 Jul 2009 23:52:18 - 1.60
+++ Experimental.h 12 Jul 2009 20:31:00 - 1.61
@@ -129,8 +129,8 @@
#ifdef EXPERIMENTAL_AUDACITY_TESTER
#endif
-#define EXPERIMENTAL_LYRICS_WINDOW //v Vaughan, 2009-07-06
-#define EXPERIMENTAL_MIXER_BOARD //v Vaughan, 2009-07-07
+#define EXPERIMENTAL_LYRICS_WINDOW //vvv Vaughan, 2009-07-06
+#define EXPERIMENTAL_MIXER_BOARD //vvv Vaughan, 2009-07-07
#endif
Index: MixerBoard.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/MixerBoard.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- MixerBoard.cpp 12 Jul 2009 07:30:30 - 1.6
+++ MixerBoard.cpp 12 Jul 2009 20:31:00 - 1.7
@@ -135,7 +135,7 @@
ctrlSize.x--;
/* i18n-hint: Title of the Pan slider, used to move the sound left or right
*/
- mSlider_Pan = new ASlider(this, ID_ASLIDER_PAN, _(Pan), ctrlPos,
ctrlSize, PAN_SLIDER, true); //v popup?
+ mSlider_Pan = new ASlider(this, ID_ASLIDER_PAN, _(Pan), ctrlPos,
ctrlSize, PAN_SLIDER, true); //v popup feedback?
// gain slider level meter
ctrlPos.x = kDoubleInset;
@@ -263,14 +263,13 @@
}
// 50ms is TrackPanel's timer interval.
- // But be more recent here, just the last 10%.
- const double kTimerInterval = 0.0005;
+ const double kTimerInterval = 0.005;
double t0 = t1 - kTimerInterval;
if (t0 0.0)
return; // Don't update until we have enough frames.
- const int kFramesPerBuffer = 500;
+ const int kFramesPerBuffer = 5;
float min; // A dummy, since it's not shown in meters.
float* maxLeft = new float[kFramesPerBuffer];
@@ -626,7 +625,7 @@
mImageSoloDown = NULL;
mImageSoloDisabled = NULL;
- mMuteSoloWidth = 24; //v good estimate, but really set in
MixerBoard::CreateMuteSoloImages
+ mMuteSoloWidth = 44; //v good estimate, but really set in
MixerBoard::CreateMuteSoloImages
// private data members
this-LoadMusicalInstruments(); // Set up mMusicalInstruments.
@@ -1018,17 +1017,17 @@
pParent-SetSize(newWidth, -1);
}
+//
// private methods
+//
+
void MixerBoard::CreateMuteSoloImages()
{
- // Much of this is taken TrackLabel::DrawMuteSolo
wxMemoryDC dc;
- wxBitmap dummy(100, 100);
- dc.SelectObject(dummy);
-
wxString str = _(Mute);
long textWidth, textHeight;
- //v deprecated: AColor::SetLabelFont(dc);
+
+ //v See TrackPanel::OnSetFont because this is deprecated:
AColor::SetLabelFont(dc);
dc.GetTextExtent(str, textWidth, textHeight);
mMuteSoloWidth = textWidth + (3 * kInset);
--
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize
details at: http://p.sf.net/sfu/Challenge
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src MixerBoard.cpp, 1.7, 1.8 MixerBoard.h, 1.3, 1.4
Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30565
Modified Files:
MixerBoard.cpp MixerBoard.h
Log Message:
more fixes for MixerBoard meter updates
Index: MixerBoard.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/MixerBoard.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- MixerBoard.cpp 12 Jul 2009 20:31:00 - 1.7
+++ MixerBoard.cpp 12 Jul 2009 22:12:02 - 1.8
@@ -42,6 +42,9 @@
#define MUTE_SOLO_HEIGHT 16
#define PAN_HEIGHT 24
+// If we decide we want more than 1 frame, base it on sample rate.
+const int kFramesPerBuffer = 1; // for calls to mMeter-UpdateDisplay
+
const int kGainSliderMin = -36;
const int kGainSliderMax = 6;
@@ -165,7 +168,11 @@
new Meter(this, -1, // wxWindow* parent, wxWindowID id,
false, // bool isInput
ctrlPos, ctrlSize, // const wxPoint pos = wxDefaultPosition,
const wxSize size = wxDefaultSize,
-Meter::MixerTrackCluster); // Style style = HorizontalStereo
+Meter::MixerTrackCluster, // Style style = HorizontalStereo,
+
+// 1024 is typical for framesPerBuffer in calls to
audacityAudioCallback.
+// But we're far fewer frames, so scale the decay rate
accordingly.
+60.0f * 1024.0f / (float)kFramesPerBuffer); // float
fDecayRate = 60);
#if wxUSE_TOOLTIPS
mStaticText_TrackName-SetToolTip(_T(Track Name));
@@ -253,32 +260,23 @@
mSlider_Gain-Set(mLeftTrack-GetGain()); //v
mSlider_Gain-SetValue(this-GetGainToSliderValue());
}
-void MixerTrackCluster::UpdateMeter(double t1)
+void MixerTrackCluster::UpdateMeter(double t0, double t1)
{
- if ((t1 0.0) || // bad time value
+ if ((t0 0.0) || (t1 0.0) || (t0 t1) || // bad time value
((mMixerBoard-HasSolo() || mLeftTrack-GetMute())
!mLeftTrack-GetSolo()))
{
this-ResetMeter();
return;
}
- // 50ms is TrackPanel's timer interval.
- const double kTimerInterval = 0.005;
-
- double t0 = t1 - kTimerInterval;
- if (t0 0.0)
- return; // Don't update until we have enough frames.
-
- const int kFramesPerBuffer = 5;
float min; // A dummy, since it's not shown in meters.
-
float* maxLeft = new float[kFramesPerBuffer];
float* rmsLeft = new float[kFramesPerBuffer];
float* maxRight = new float[kFramesPerBuffer];
float* rmsRight = new float[kFramesPerBuffer];
bool bSuccess = true;
- const double kFrameInterval = kTimerInterval / (double)kFramesPerBuffer;
+ const double kFrameInterval = (t1 - t0) / (double)kFramesPerBuffer;
double dFrameT0 = t0;
double dFrameT1 = t0 + kFrameInterval;
unsigned int i = 0;
@@ -659,7 +657,7 @@
*/
mSoloCount = 0;
- mT = -1.0;
+ mPrevT1 = 0.0;
mTracks = mProject-GetTracks();
}
@@ -882,6 +880,8 @@
void MixerBoard::ResetMeters()
{
+ mPrevT1 = 0.0;
+
if (!this-IsShown())
return;
@@ -972,15 +972,15 @@
pMixerTrackCluster-UpdateGain();
}
-void MixerBoard::UpdateMeters(double t)
+void MixerBoard::UpdateMeters(double t1)
{
- if (!this-IsShown() || (t == mT))
+ if (!this-IsShown() || (t1 = mPrevT1))
return;
- mT = t;
-
for (unsigned int i = 0; i mMixerTrackClusters.GetCount(); i++)
- mMixerTrackClusters[i]-UpdateMeter(t);
+ mMixerTrackClusters[i]-UpdateMeter(mPrevT1, t1);
+
+ mPrevT1 = t1;
}
void MixerBoard::UpdateWidth()
Index: MixerBoard.h
===
RCS file: /cvsroot/audacity/audacity-src/src/MixerBoard.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- MixerBoard.h11 Jul 2009 04:05:16 - 1.3
+++ MixerBoard.h12 Jul 2009 22:12:02 - 1.4
@@ -52,7 +52,7 @@
void UpdateSolo();
void UpdatePan();
void UpdateGain();
- void UpdateMeter(double t1);
+ void UpdateMeter(double t0, double t1);
private:
int GetGainToSliderValue();
@@ -167,7 +167,7 @@
void UpdatePan(const WaveTrack* pLeftTrack);
void UpdateGain(const WaveTrack* pLeftTrack);
- void UpdateMeters(double t);
+ void UpdateMeters(double t1);
void UpdateWidth();
@@ -203,7 +203,7 @@
AudacityProject* mProject;
MixerBoardScrolledWindow* mScrolledWindow; // Holds the MixerTrackClusters
and handles scrolling.
unsigned int mSoloCount;
- double mT;
+ double mPrevT1;
TrackList* mTracks;
public:
--
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry
[Audacity-cvs] audacity-src/src/widgets Meter.cpp, 1.45, 1.46 Meter.h, 1.13, 1.14
Update of /cvsroot/audacity/audacity-src/src/widgets In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30565/widgets Modified Files: Meter.cpp Meter.h Log Message: more fixes for MixerBoard meter updates Index: Meter.h === RCS file: /cvsroot/audacity/audacity-src/src/widgets/Meter.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- Meter.h 9 Jul 2009 23:52:18 - 1.13 +++ Meter.h 12 Jul 2009 22:12:02 - 1.14 @@ -100,7 +100,8 @@ bool isInput, const wxPoint pos = wxDefaultPosition, const wxSize size = wxDefaultSize, - Style style = HorizontalStereo); + Style style = HorizontalStereo, + float fDecayRate = 60.0f); ~Meter(); Index: Meter.cpp === RCS file: /cvsroot/audacity/audacity-src/src/widgets/Meter.cpp,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- Meter.cpp 12 Jul 2009 07:16:59 - 1.45 +++ Meter.cpp 12 Jul 2009 22:12:02 - 1.46 @@ -207,7 +207,8 @@ bool isInput, const wxPoint pos /*= wxDefaultPosition*/, const wxSize size /*= wxDefaultSize*/, - Style style /*= HorizontalStereo*/) + Style style /*= HorizontalStereo*/, + float fDecayRate /*= 60.0f*/) : wxPanel(parent, id, pos, size), mQueue(1024), mWidth(size.x), mHeight(size.y), @@ -216,7 +217,7 @@ mDB(true), mDBRange(ENV_DB_RANGE), mDecay(true), - mDecayRate(60), + mDecayRate(fDecayRate), mClip(true), mNumPeakSamplesToClip(3), mPeakHoldDuration(3), -- Enter the BlackBerry Developer Challenge This is your chance to win up to $100,000 in prizes! For a limited time, vendors submitting new applications to BlackBerry App World(TM) will have the opportunity to enter the BlackBerry Developer Challenge. See full prize details at: http://p.sf.net/sfu/Challenge ___ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src MixerBoard.cpp,1.3,1.4
Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv32522
Modified Files:
MixerBoard.cpp
Log Message:
Fix min width problem when last wavetrack deleted.
Index: MixerBoard.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/MixerBoard.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- MixerBoard.cpp 10 Jul 2009 01:31:51 - 1.3
+++ MixerBoard.cpp 10 Jul 2009 23:51:40 - 1.4
@@ -963,18 +963,25 @@
void MixerBoard::UpdateWidth()
{
- int newWidth = this-GetTrackClustersWidth() + kDoubleInset; // a bit extra
padding on the right
+ // All these width calculations have extra padding on right, so there's
+ // always gray area to click to deselect all tracks.
+ // Min width is one cluster wide, plus margins.
+ const int kMinWidth = kInset + MIXER_TRACK_CLUSTER_WIDTH + kTripleInset;
+
+ int newWidth = this-GetTrackClustersWidth() + kDoubleInset;
+ if (newWidth kMinWidth)
+ newWidth = kMinWidth;
int width;
int height;
- this-GetSize(width, height);
- if (newWidth == width)
+ this-GetClientSize(width, height);
+ if (newWidth == width - 3) // -3 is fudge to accommodate GetClientSize.
return;
mScrolledWindow-SetVirtualSize(newWidth, -1);
wxWindow* pParent = this-GetParent(); // Might be mProject, or might be a
MixerBoardFrame.
pParent-SetSizeHints(
- kInset + MIXER_TRACK_CLUSTER_WIDTH, // int minW=-1, // Show at least one
cluster wide.
+ kMinWidth, // int minW=-1,
MIXER_BOARD_MIN_HEIGHT, // int minH=-1,
newWidth); // int maxW=-1,
wxPoint parentPos = pParent-GetPosition();
--
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize
details at: http://p.sf.net/sfu/Challenge
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src Lyrics.h, 1.2, 1.3 LyricsWindow.h, 1.3, 1.4 MixerBoard.cpp, 1.4, 1.5 MixerBoard.h, 1.2, 1.3 TrackPanel.cpp, 1.465, 1.466
Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30971
Modified Files:
Lyrics.h LyricsWindow.h MixerBoard.cpp MixerBoard.h
TrackPanel.cpp
Log Message:
Fix bug Martyn reported about mute/solo not affecting both stereo tracks.
Other tidying up.
Index: LyricsWindow.h
===
RCS file: /cvsroot/audacity/audacity-src/src/LyricsWindow.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- LyricsWindow.h 9 Jul 2009 21:14:28 - 1.3
+++ LyricsWindow.h 11 Jul 2009 04:05:16 - 1.4
@@ -24,7 +24,7 @@
public:
LyricsWindow(AudacityProject* parent);
- ~LyricsWindow();
+ virtual ~LyricsWindow();
Lyrics *GetLyricsPanel() { return mLyricsPanel; };
Index: Lyrics.h
===
RCS file: /cvsroot/audacity/audacity-src/src/Lyrics.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Lyrics.h7 Jul 2009 06:13:22 - 1.2
+++ Lyrics.h11 Jul 2009 04:05:16 - 1.3
@@ -46,6 +46,8 @@
const wxString value = wxT(),
const wxPoint pos = wxDefaultPosition,
const wxSize size = wxDefaultSize);
+ virtual ~HighlightTextCtrl() {};
+
void OnMouseEvent(wxMouseEvent evt);
private:
@@ -68,8 +70,7 @@
Lyrics(wxWindow* parent, wxWindowID id,
const wxPoint pos = wxDefaultPosition,
const wxSize size = wxDefaultSize);
-
- ~Lyrics();
+ virtual ~Lyrics();
void Clear();
void Add(double t, wxString syllable);
Index: MixerBoard.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/MixerBoard.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- MixerBoard.cpp 10 Jul 2009 23:51:40 - 1.4
+++ MixerBoard.cpp 11 Jul 2009 04:05:16 - 1.5
@@ -134,34 +134,21 @@
if (!(ctrlSize.x 1))
ctrlSize.x--;
- /* i18n-hint: Title of the Pan slider, used to move the sound left or right
stereoscopically */
+ /* i18n-hint: Title of the Pan slider, used to move the sound left or right
*/
mSlider_Pan = new ASlider(this, ID_ASLIDER_PAN, _(Pan), ctrlPos,
ctrlSize, PAN_SLIDER, true); //v popup?
- // Instead of an even split, give this many extra pixels to the meter
- const int kExtraMeter = 8;
-
// gain slider level meter
ctrlPos.x = kDoubleInset;
ctrlPos.y += PAN_HEIGHT + kQuadrupleInset;
- //vvv For the slider width, subtracting kTripleInset instead of
kQuadrupleInset makes it not show
- //ticks on Windows -- wxSlider bug. But it looks better this way with
the now wider meter.
+ // Instead of an even split of the cluster width, give extra pixels to the
meter
+ const int kExtraMeter = 8;
ctrlSize = wxSize((nHalfWidth - kTripleInset - kExtraMeter),
(size.GetHeight() - ctrlPos.y - kQuadrupleInset));
- // ASlider doesn't do vertical, so use wxSlider for now.
/* i18n-hint: Title of the Gain slider, used to adjust the volume */
mSlider_Gain =
new ASlider(this, ID_SLIDER_GAIN, _(Gain), ctrlPos, ctrlSize,
DB_SLIDER, true, true, 0.0, wxVERTICAL);
- //v new wxSlider(this, ID_SLIDER_GAIN, // wxWindow* parent, wxWindowID
id,
- // this-GetGainToSliderValue(), // int value,
- // #ifdef __WXMSW__
- //-kGainSliderMax, -kGainSliderMin, // Max is at bottom
for Windows! // int minValue, int maxValue,
- // #else
- //kGainSliderMin, kGainSliderMax, // int minValue, int
maxValue,
- // #endif
- //ctrlPos, ctrlSize, // const wxPoint point =
wxDefaultPosition, const wxSize size = wxDefaultSize,
- //wxSL_VERTICAL | wxSL_AUTOTICKS | wxSUNKEN_BORDER); // long
style = wxSL_HORIZONTAL, ...
// too much color:
mSlider_Gain-SetBackgroundColour(this-GetTrackColor());
// too dark:
mSlider_Gain-SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW));
@@ -184,12 +171,6 @@
mStaticText_TrackName-SetToolTip(_T(Track Name));
mToggleButton_Mute-SetToolTip(_T(Mute));
mToggleButton_Solo-SetToolTip(_T(Solo));
- // LWSlider already shows the value, so don't do this:
mSlider_Pan-SetToolTip(_T(Pan));
-
- //v LWSlider already shows the value, so don't do this:
- //wxScrollEvent dummy;
- //this-OnSliderScroll_Gain(dummy); // Set the tooltip to show the
current value.
-
mMeter-SetToolTip(_T(Signal Level Meter));
#endif // wxUSE_TOOLTIPS
@@ -421,7 +402,10 @@
return;
}
- mLeftTrack-SetMute(mToggleButton_Mute-IsDown());
+ bool bValue = mToggleButton_Mute-IsDown();
+ mLeftTrack-SetMute(bValue);
+ if (mRightTrack)
+
[Audacity-cvs] audacity-src/images SliderThumb_Vertical.xpm, NONE, 1.1
Update of /cvsroot/audacity/audacity-src/images
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv1789
Added Files:
SliderThumb_Vertical.xpm
Log Message:
vertical slider support, for MixerBoard
--- NEW FILE: SliderThumb_Vertical.xpm ---
/* XPM */
static char * SliderThumb_Vertical[] = {
14 11 7 1,
c None,
. c #DEDEDE,
+ c #00,
@ c #FF,
# c #C0C0D8,
$ c #F2F2F2,
% c #8D8DB2,
..+++.,
.+@@@+,
+...@###@+...,
+...@$+..,
+...@##@%...@%##$+.,
+...@##@%...@%###$+,
+...@##@%...@%##%+.,
+...@%+..,
+...@###%+...,
.+%%%+,
..+++.};
--
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize
details at: http://p.sf.net/sfu/Challenge
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src/widgets ASlider.cpp, 1.73, 1.74 ASlider.h, 1.32, 1.33
Update of /cvsroot/audacity/audacity-src/src/widgets
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv2519
Modified Files:
ASlider.cpp ASlider.h
Log Message:
vertical slider support, for MixerBoard
I didn't #ifdef these changes, but I'm confident they don't affect anything
else, because MixerBoard is the only thing using vertical sliders.
Index: ASlider.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/widgets/ASlider.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- ASlider.cpp 9 Jul 2009 15:02:51 - 1.73
+++ ASlider.cpp 9 Jul 2009 21:29:13 - 1.74
@@ -19,7 +19,7 @@
\class LWSlider
\brief Lightweight version of ASlider. In other words it does not
-have a window permanaently associated with it.
+have a window permanently associated with it.
*////**
@@ -89,6 +89,9 @@
//#include ../../images/SliderThumb.xpm
//#include ../../images/SliderThumbAlpha.xpm
+#include ../../images/SliderThumb_Vertical.xpm
+
+
#if defined __WXMSW__
const int sliderFontSize = 10;
#else
@@ -339,20 +342,20 @@
// Construct customizable slider
LWSlider::LWSlider(wxWindow * parent,
- wxString name,
- const wxPoint pos,
- const wxSize size,
- float minValue,
- float maxValue,
- float stepValue,
- bool canUseShift,
- int style,
- bool heavyweight /* = false */,
- bool popup /* = true */
- )
+ wxString name,
+ const wxPoint pos,
+ const wxSize size,
+ float minValue,
+ float maxValue,
+ float stepValue,
+ bool canUseShift,
+ int style,
+ bool heavyweight /* = false */,
+ bool popup /* = true */,
+ int orientation /* = wxHORIZONTAL */) // wxHORIZONTAL or
wxVERTICAL. wxVERTICAL is currently only for DB_SLIDER.
{
Init(parent, name, pos, size, minValue, maxValue,
-stepValue, canUseShift, style, heavyweight, popup, 1.0);
+stepValue, canUseShift, style, heavyweight, popup, 1.0, orientation);
}
// Construct predefined slider
@@ -362,7 +365,8 @@
const wxSize size,
int style,
bool heavyweight /* = false */,
- bool popup /* = true */)
+ bool popup /* = true */,
+ int orientation /* = wxHORIZONTAL */) // wxHORIZONTAL or
wxVERTICAL. wxVERTICAL is currently only for DB_SLIDER.
{
wxString leftLabel, rightLabel;
float minValue, maxValue, stepValue;
@@ -374,10 +378,14 @@
minValue = -1.0f;
maxValue = +1.0f;
stepValue = 0.1f;
+ orientation = wxHORIZONTAL; //v Vertical PAN_SLIDER currently not
handled, forced to horizontal.
break;
case DB_SLIDER:
minValue = -36.0f;
- maxValue = 36.0f;
+ if (orientation == wxHORIZONTAL)
+ maxValue = 36.0f;
+ else
+ maxValue = 6.0f; // for MixerBoard
stepValue = 1.0f;
speed = 0.5;
break;
@@ -400,7 +408,7 @@
}
Init(parent, name, pos, size, minValue, maxValue, stepValue,
-true, style, heavyweight, popup, speed);
+true, style, heavyweight, popup, speed, orientation);
}
void LWSlider::Init(wxWindow * parent,
@@ -414,11 +422,12 @@
int style,
bool heavyweight,
bool popup,
-float speed
- )
+float speed,
+int orientation /* = wxHORIZONTAL */) // wxHORIZONTAL or
wxVERTICAL. wxVERTICAL is currently only for DB_SLIDER.
{
mName = name;
mStyle = style;
+ mOrientation = orientation;
mIsDragging = false;
mWidth = size.x;
mHeight = size.y;
@@ -435,18 +444,21 @@
mDefaultValue = 0.0f;
mDefaultShortcut = false;
mBitmap = NULL;
- mScrollLine = 0.05;
+ mScrollLine = 0.05f;
mScrollPage = 0.5;
- // Get the Thumb bitmap. Generic version fo rnow...
-//#ifdef USE_AQUA
-// mThumbBitmap = theTheme.Bitmap( bmpMacSliderThumb );
-//#else
- mThumbBitmap = theTheme.Bitmap( bmpSliderThumb );
-//#endif
+ // Get the Thumb bitmap. Generic version for now...
+ if (mOrientation == wxHORIZONTAL)
+ mThumbBitmap = theTheme.Bitmap( bmpSliderThumb );
+ else
+ //v \todo Convert this to an image in AllThemeResources, as
bmpSliderThumb.
+ {
+ wxImage thumbImage(wxBitmap(SliderThumb_Vertical).ConvertToImage());
+ mThumbBitmap = new wxBitmap(thumbImage);
+ }
-// mThumbBitmap = new wxBitmap( SliderThumb );
-// mThumbBitmap-SetMask( new wxMask( wxBitmap( SliderThumbAlpha ), *wxBLACK
) );
+ // mThumbBitmap = new wxBitmap( SliderThumb );
+ //
[Audacity-cvs] audacity-src/src Track.h,1.61,1.62
Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv6696
Modified Files:
Track.h
Log Message:
Remove unnecessary declaration.
Index: Track.h
===
RCS file: /cvsroot/audacity/audacity-src/src/Track.h,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- Track.h 1 Jul 2009 14:10:40 - 1.61
+++ Track.h 9 Jul 2009 21:43:57 - 1.62
@@ -188,8 +188,6 @@
TrackListNode *prev;
};
-class TrackList;
-
class AUDACITY_DLL_API TrackListIterator
{
public:
--
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize
details at: http://p.sf.net/sfu/Challenge
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/images MusicalInstruments.h,1.1,1.2
Update of /cvsroot/audacity/audacity-src/images In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv2434 Added Files: MusicalInstruments.h Log Message: musical instrument images for MixerBoard --- NEW FILE: MusicalInstruments.h --- /** Audacity: A Digital Audio Editor MusicalInstruments.h Vaughan Johnson, January 2007 Includes musical instrument images for use in MixerTrackCluster. **/ #include MusicalInstruments/acoustic_guitar_gtr.xpm #include MusicalInstruments/acoustic_piano_pno.xpm #include MusicalInstruments/back_vocal_bg_vox.xpm #include MusicalInstruments/clap.xpm #include MusicalInstruments/drums_dr.xpm #include MusicalInstruments/electric_bass_guitar_bs_gtr.xpm #include MusicalInstruments/electric_guitar_gtr.xpm #include MusicalInstruments/electric_piano_pno_key.xpm #include MusicalInstruments/kick.xpm #include MusicalInstruments/loop.xpm #include MusicalInstruments/organ_org.xpm #include MusicalInstruments/perc.xpm #include MusicalInstruments/sax.xpm #include MusicalInstruments/snare.xpm #include MusicalInstruments/string_violin_cello.xpm #include MusicalInstruments/synth.xpm #include MusicalInstruments/tambo.xpm #include MusicalInstruments/trumpet_horn.xpm #include MusicalInstruments/turntable.xpm #include MusicalInstruments/vibraphone_vibes.xpm #include MusicalInstruments/vocal_vox.xpm // This one should always be last, so it wins when best score is 0. #include MusicalInstruments/_default_instrument.xpm -- Enter the BlackBerry Developer Challenge This is your chance to win up to $100,000 in prizes! For a limited time, vendors submitting new applications to BlackBerry App World(TM) will have the opportunity to enter the BlackBerry Developer Challenge. See full prize details at: http://p.sf.net/sfu/Challenge ___ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src/widgets Meter.cpp, 1.43, 1.44 Meter.h, 1.12, 1.13
Update of /cvsroot/audacity/audacity-src/src/widgets
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3511/widgets
Modified Files:
Meter.cpp Meter.h
Log Message:
basic MixerBoard port from UmixIt.
Lots of things to tweak yet. More commits later today.
Index: Meter.h
===
RCS file: /cvsroot/audacity/audacity-src/src/widgets/Meter.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Meter.h 10 Nov 2008 20:31:15 - 1.12
+++ Meter.h 9 Jul 2009 23:52:18 - 1.13
@@ -84,15 +84,6 @@
DECLARE_DYNAMIC_CLASS(Meter)
public:
- Meter(wxWindow* parent, wxWindowID id,
- bool isInput,
- const wxPoint pos = wxDefaultPosition,
- const wxSize size = wxDefaultSize);
-
- ~Meter();
-
- void UpdatePrefs();
-
// These should be kept in the same order as they appear
// in the menu
enum Style {
@@ -100,9 +91,21 @@
VerticalStereo,
VerticalMulti,
Equalizer,
- Waveform
+ Waveform,
+ MixerTrackCluster // Doesn't show menu, icon, or L/R labels, but
otherwise like VerticalStereo.
};
+
+ Meter(wxWindow* parent, wxWindowID id,
+ bool isInput,
+ const wxPoint pos = wxDefaultPosition,
+ const wxSize size = wxDefaultSize,
+ Style style = HorizontalStereo);
+
+ ~Meter();
+
+ void UpdatePrefs();
+
Style GetStyle() { return mStyle; }
void SetStyle(Style newStyle);
@@ -112,6 +115,7 @@
* different thread (like from an audio I/O callback).
*/
void Reset(double sampleRate, bool resetClipping);
+
/** \brief Update the meters with a block of audio data
*
* Process the supplied block of audio data, extracting the peak and RMS
@@ -119,6 +123,8 @@
* clipping that lies on block boundaries.
* This method is thread-safe! Feel free to call from a different thread
* (like from an audio I/O callback).
+*
+* First overload:
* \param numChannels The number of channels of audio being played back or
* recorded.
* \param numFrames The number of frames (samples) in this data block. It is
@@ -129,9 +135,16 @@
* then the second sample of channel 1, second sample of channel 2, and so
* to the second sample of channel (numChannels). The last sample in the
* array will be the (numFrames) sample for channel (numChannels).
+*
+* The second overload is for ease of use in MixerBoard.
*/
void UpdateDisplay(int numChannels,
int numFrames, float *sampleData);
+ void UpdateDisplay(int numChannels, int numFrames,
+// Need to make these double-indexed max and min
arrays if we handle more than 2 channels.
+float* maxLeft, float* rmsLeft,
+float* maxRight, float* rmsRight);
+
/** \brief Find out if the level meter is disabled or not.
*
* This method is thread-safe! Feel free to call from a
Index: Meter.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/widgets/Meter.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- Meter.cpp 6 Jul 2009 07:41:18 - 1.43
+++ Meter.cpp 9 Jul 2009 23:52:18 - 1.44
@@ -5,6 +5,7 @@
Meter.cpp
Dominic Mazzoni
+ Vaughan Johnson
2004.06.25 refresh rate limited to 30mS, by ChackoN
@@ -16,6 +17,10 @@
This is a bunch of common code that can display many different
forms of VU meters and other displays.
+ But note that a lot of later code here assumes these are
+ MeterToolBar meters, e.g., Meter::StartMonitoring,
+ so these are not as generic/common as originally intended.
+
*////**
\class MeterBar
@@ -40,10 +45,7 @@
#include wx/dcmemory.h
#include wx/image.h
#include wx/intl.h
-#define WANT_METER_MENU 1 //vvv
-#if WANT_METER_MENU
- #include wx/menu.h
-#endif
+#include wx/menu.h
#include wx/settings.h
#include wx/textdlg.h
#include wx/numdlg.h
@@ -185,20 +187,18 @@
EVT_ERASE_BACKGROUND(Meter::OnErase)
EVT_PAINT(Meter::OnPaint)
EVT_SIZE(Meter::OnSize)
- #if WANT_METER_MENU
- EVT_MENU(OnDisableMeterID, Meter::OnDisableMeter)
- EVT_MENU(OnHorizontalID, Meter::OnHorizontal)
- EVT_MENU(OnVerticalID, Meter::OnVertical)
- EVT_MENU(OnMultiID, Meter::OnMulti)
- EVT_MENU(OnEqualizerID, Meter::OnEqualizer)
- EVT_MENU(OnWaveformID, Meter::OnWaveform)
- EVT_MENU(OnLinearID, Meter::OnLinear)
- EVT_MENU(OnDBID, Meter::OnDB)
- EVT_MENU(OnClipID, Meter::OnClip)
- EVT_MENU(OnMonitorID, Meter::OnMonitor)
- EVT_MENU(OnFloatID, Meter::OnFloat)
- EVT_MENU(OnPreferencesID, Meter::OnPreferences)
- #endif
+ EVT_MENU(OnDisableMeterID, Meter::OnDisableMeter)
+ EVT_MENU(OnHorizontalID, Meter::OnHorizontal
[Audacity-cvs] audacity-src/src MixerBoard.cpp, 1.1, 1.2 MixerBoard.h, 1.1, 1.2 Experimental.h, 1.59, 1.60 Menus.cpp, 1.498, 1.499 Menus.h, 1.139, 1.140 Project.cpp, 1.436, 1.437 Project.h, 1.158, 1.1
Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3511
Modified Files:
Experimental.h Menus.cpp Menus.h Project.cpp Project.h
TrackPanel.cpp TrackPanel.h
Added Files:
MixerBoard.cpp MixerBoard.h
Log Message:
basic MixerBoard port from UmixIt.
Lots of things to tweak yet. More commits later today.
Index: Project.h
===
RCS file: /cvsroot/audacity/audacity-src/src/Project.h,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -d -r1.158 -r1.159
--- Project.h 7 Jul 2009 15:33:55 - 1.158
+++ Project.h 9 Jul 2009 23:52:18 - 1.159
@@ -65,6 +65,10 @@
#ifdef EXPERIMENTAL_LYRICS_WINDOW
class LyricsWindow;
#endif
+#ifdef EXPERIMENTAL_MIXER_BOARD
+ class MixerBoard;
+ class MixerBoardFrame;
+#endif
class Importer;
class AdornedRulerPanel;
@@ -299,6 +303,9 @@
#ifdef EXPERIMENTAL_LYRICS_WINDOW
LyricsWindow* GetLyricsWindow() { return mLyricsWindow; };
#endif
+ #ifdef EXPERIMENTAL_MIXER_BOARD
+ MixerBoard* GetMixerBoard() { return mMixerBoard; };
+ #endif
public:
@@ -351,6 +358,9 @@
#ifdef EXPERIMENTAL_LYRICS_WINDOW
void UpdateLyrics();
#endif
+ #ifdef EXPERIMENTAL_MIXER_BOARD
+ void UpdateMixerBoard();
+ #endif
void GetRegionsByLabel( Regions regions );
@@ -424,6 +434,10 @@
#ifdef EXPERIMENTAL_LYRICS_WINDOW
LyricsWindow* mLyricsWindow;
#endif
+ #ifdef EXPERIMENTAL_MIXER_BOARD
+ MixerBoard* mMixerBoard;
+ MixerBoardFrame* mMixerBoardFrame;
+ #endif
public:
--- NEW FILE: MixerBoard.h ---
/**
Audacity: A Digital Audio Editor
MixerBoard.h
Vaughan Johnson, January 2007
**/
#include Experimental.h
#ifdef EXPERIMENTAL_MIXER_BOARD
#ifndef __AUDACITY_MIXER_BOARD__
#define __AUDACITY_MIXER_BOARD__
#include wx/frame.h
#include wx/hashmap.h
#include wx/image.h
#include wx/panel.h
#include wx/scrolwin.h
#include wx/statbmp.h
#include wx/stattext.h
#include widgets/AButton.h
#include widgets/ASlider.h
#include widgets/Meter.h
class AudacityProject;
class MixerBoard;
class WaveTrack;
// containment hierarchy:
//MixerBoardFrame - MixerBoard - MixerBoardScrolledWindow -
MixerTrackCluster(s)
class MixerTrackCluster : public wxPanel {
public:
MixerTrackCluster(wxWindow* parent,
MixerBoard* grandParent, AudacityProject* project,
WaveTrack* pLeftTrack, WaveTrack* pRightTrack = NULL,
const wxPoint pos = wxDefaultPosition,
const wxSize size = wxDefaultSize);
~MixerTrackCluster() {};
void ResetMeter();
void UpdateHeight(); // For wxSizeEvents, update gain slider and meter.
// These are used by TrackPanel for synchronizing control states, etc.
void UpdateName();
void UpdateMute();
void UpdateSolo();
void UpdatePan();
void UpdateGain();
void UpdateMeter(double t1);
private:
int GetGainToSliderValue();
wxColour GetTrackColor();
// event handlers
void OnKeyEvent(wxKeyEvent event);
void OnMouseEvent(wxMouseEvent event);
void OnPaint(wxPaintEvent evt);
void OnButton_Mute(wxCommandEvent event);
void OnButton_Solo(wxCommandEvent event);
void OnSlider_Pan(wxCommandEvent event);
void OnSlider_Gain(wxCommandEvent event);
//v void OnSliderScroll_Gain(wxScrollEvent event);
public:
WaveTrack* mLeftTrack;
WaveTrack* mRightTrack; // NULL if mono
private:
MixerBoard* mMixerBoard;
AudacityProject* mProject;
// controls
wxStaticText* mStaticText_TrackName;
wxStaticBitmap* mStaticBitmap_MusicalInstrument;
AButton* mToggleButton_Mute;
AButton* mToggleButton_Solo;
ASlider* mSlider_Pan;
ASlider* mSlider_Gain;
Meter* mMeter;
public:
DECLARE_EVENT_TABLE()
};
WX_DEFINE_ARRAY(MixerTrackCluster*, MixerTrackClusterArray);
class MusicalInstrument {
public:
MusicalInstrument(wxBitmap* pBitmap, const wxString strXPMfilename);
~MusicalInstrument();
wxBitmap* mBitmap;
wxArrayString mKeywords;
};
WX_DECLARE_OBJARRAY(MusicalInstrument, MusicalInstrumentArray);
// wxScrolledWindow ignores mouse clicks in client area,
// but they don't get passed to Mixerboard.
// We need to catch them to deselect all track clusters.
class MixerBoardScrolledWindow : public wxScrolledWindow {
public:
MixerBoardScrolledWindow(AudacityProject* project,
MixerBoard* parent, wxWindowID id = -1,
const wxPoint pos = wxDefaultPosition,
const wxSize size = wxDefaultSize,
long style = wxHSCROLL | wxVSCROLL);
~MixerBoardScrolledWindow();
private:
void OnMouseEvent(wxMouseEvent event);
private
[Audacity-cvs] audacity-src/win/Projects/Audacity Audacity.vcproj, 1.45, 1.46
Update of /cvsroot/audacity/audacity-src/win/Projects/Audacity In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3721/Audacity Modified Files: Audacity.vcproj Log Message: basic MixerBoard port from UmixIt. Lots of things to tweak yet. More commits later today. Index: Audacity.vcproj === RCS file: /cvsroot/audacity/audacity-src/win/Projects/Audacity/Audacity.vcproj,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- Audacity.vcproj 7 Jul 2009 06:13:21 - 1.45 +++ Audacity.vcproj 9 Jul 2009 23:53:25 - 1.46 @@ -706,6 +706,14 @@ /File File + RelativePath=..\..\..\src\MixerBoard.cpp + + /File + File + RelativePath=..\..\..\src\MixerBoard.h + + /File + File RelativePath=..\..\..\lib-src\lib-widget-extra\NonGuiThread.cpp /File -- Enter the BlackBerry Developer Challenge This is your chance to win up to $100,000 in prizes! For a limited time, vendors submitting new applications to BlackBerry App World(TM) will have the opportunity to enter the BlackBerry Developer Challenge. See full prize details at: http://p.sf.net/sfu/Challenge ___ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src Lyrics.cpp, 1.1, 1.2 Lyrics.h, 1.1, 1.2 LyricsWindow.cpp, 1.1, 1.2 LyricsWindow.h, 1.1, 1.2 Experimental.h, 1.58, 1.59 Menus.cpp, 1.496, 1.497 Menus.h, 1.138, 1.139 Pro
Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv18029/audacity/src
Modified Files:
Experimental.h Menus.cpp Menus.h Project.cpp Project.h
TrackPanel.cpp
Added Files:
Lyrics.cpp Lyrics.h LyricsWindow.cpp LyricsWindow.h
Log Message:
Port forward Lyrics Window from UmixIt branch,
under EXPERIMENTAL_LYRICS_WINDOW compile flag.
Index: Project.h
===
RCS file: /cvsroot/audacity/audacity-src/src/Project.h,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -d -r1.156 -r1.157
--- Project.h 6 Jul 2009 13:39:44 - 1.156
+++ Project.h 7 Jul 2009 06:13:22 - 1.157
@@ -62,6 +62,9 @@
class TrackList;
class Tags;
class HistoryWindow;
+#ifdef EXPERIMENTAL_LYRICS_WINDOW
+ class LyricsWindow;
+#endif
class Importer;
class AdornedRulerPanel;
@@ -293,6 +296,10 @@
ToolsToolBar *GetToolsToolBar();
TranscriptionToolBar *GetTranscriptionToolBar();
+ #ifdef EXPERIMENTAL_LYRICS_WINDOW
+ LyricsWindow* GetLyricsWindow() { return mLyricsWindow; };
+ #endif
+
public:
// SelectionBar callback methods
@@ -336,13 +343,15 @@
bool consolidate = false);
private:
-
- // Private Methods
-
void ClearClipboard();
void InitialState();
void ModifyState();
void PopState(TrackList * l);
+
+ #ifdef EXPERIMENTAL_LYRICS_WINDOW
+ void UpdateLyrics();
+ #endif
+
void GetRegionsByLabel( Regions regions );
void AutoSaveIfNeeded();
@@ -353,9 +362,9 @@
static bool GetCacheBlockFiles();
// The project's name and file info
-
wxString mFileName;
DirManager *mDirManager; // MM: DirManager now created dynamically
+
double mRate;
sampleFormat mDefaultFormat;
@@ -363,28 +372,24 @@
wxMenu *mRecentFilesMenu;
// Tags (artist name, song properties, MP3 ID3 info, etc.)
-
Tags *mTags;
// List of tracks and display info
-
TrackList *mTracks;
-// ViewInfo mViewInfo;
bool mSnapTo;
TrackList *mLastSavedTracks;
// Clipboard (static because it is shared by all projects)
-
static TrackList *msClipboard;
static AudacityProject *msClipProject;
static double msClipLen;
//shared by all projects
static ODLock *msAllProjectDeleteMutex;
- // History/Undo manager
+ // History/Undo manager
UndoManager mUndoManager;
bool mDirty;
@@ -414,7 +419,12 @@
bool mAutoScrolling;
bool mActive;
bool mIconized;
+
HistoryWindow *mHistoryWindow;
+ #ifdef EXPERIMENTAL_LYRICS_WINDOW
+ LyricsWindow* mLyricsWindow;
+ #endif
+
public:
ToolManager *mToolManager;
--- NEW FILE: Lyrics.h ---
/**
Audacity: A Digital Audio Editor
Lyrics.h
Dominic Mazzoni
Vaughan Johnson
**/
#ifndef __AUDACITY_LYRICS__
#define __AUDACITY_LYRICS__
#include Audacity.h
#include wx/dynarray.h
#include wx/panel.h
#include wx/textctrl.h
#define LYRICS_DEFAULT_WIDTH 608
#define LYRICS_DEFAULT_HEIGHT 280
struct Syllable {
double t;
wxString text;
wxString textWithSpace;
int char0; // index of first char of syllable in Lyrics::mText, used only
for kHighlightLyrics
int char1; // index of last char of syllable in Lyrics::mText, used only
for kHighlightLyrics
int width;
int leftX;
int x; // centerX, used only for kBouncingBallLyrics
};
WX_DECLARE_OBJARRAY(Syllable, SyllableArray);
class Lyrics;
// Override wxTextCtrl to handle selection events, which the parent ignores if
the control is read-only.
class HighlightTextCtrl : public wxTextCtrl
{
public:
HighlightTextCtrl(Lyrics* parent,
wxWindowID id,
const wxString value = wxT(),
const wxPoint pos = wxDefaultPosition,
const wxSize size = wxDefaultSize);
void OnMouseEvent(wxMouseEvent evt);
private:
Lyrics* mLyrics;
DECLARE_EVENT_TABLE()
};
class Lyrics : public wxPanel
{
DECLARE_DYNAMIC_CLASS(Lyrics)
enum LyricsStyle {
kBouncingBallLyrics, // Lyrics move from right to left with bouncing ball.
// kGuitarTab, //v future Guitar Tablature moves from right to
left.
kHighlightLyrics,// Lyrics show in scrolling page and syllables
highlight successively.
};
public:
Lyrics(wxWindow* parent, wxWindowID id,
const wxPoint pos = wxDefaultPosition,
const wxSize size = wxDefaultSize);
~Lyrics();
void Clear();
void Add(double t, wxString syllable);
void Finish(double finalT);
int FindSyllable(long startChar); // Find the syllable whose char0 =
startChar = char1.
int GetCurrentSyllableIndex() { return mCurrentSyllable; };
Syllable* GetSyllable(int nSyl) { return (mSyllables[nSyl]); };
void SetCurrentSyllableIndex
[Audacity-cvs] audacity-src/win/Projects/Audacity Audacity.vcproj, 1.44, 1.45
Update of /cvsroot/audacity/audacity-src/win/Projects/Audacity In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv18029/audacity/win/Projects/Audacity Modified Files: Audacity.vcproj Log Message: Port forward Lyrics Window from UmixIt branch, under EXPERIMENTAL_LYRICS_WINDOW compile flag. Index: Audacity.vcproj === RCS file: /cvsroot/audacity/audacity-src/win/Projects/Audacity/Audacity.vcproj,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- Audacity.vcproj 3 Jul 2009 00:00:12 - 1.44 +++ Audacity.vcproj 7 Jul 2009 06:13:21 - 1.45 @@ -662,6 +662,22 @@ /File File + RelativePath=..\..\..\src\Lyrics.cpp + + /File + File + RelativePath=..\..\..\src\Lyrics.h + + /File + File + RelativePath=..\..\..\src\LyricsWindow.cpp + + /File + File + RelativePath=..\..\..\src\LyricsWindow.h + + /File + File RelativePath=..\..\..\src\MacroMagic.h /File -- Enter the BlackBerry Developer Challenge This is your chance to win up to $100,000 in prizes! For a limited time, vendors submitting new applications to BlackBerry App World(TM) will have the opportunity to enter the BlackBerry Developer Challenge. See full prize details at: http://p.sf.net/sfu/blackberry ___ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/win compile.txt,1.70,1.71
Update of /cvsroot/audacity/audacity-src/win In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv24115 Modified Files: compile.txt Log Message: Require wxWidgets 2.8.10. Clean out some cruft referring to previous versions -- if they need documentation for that, they can get the old versions of compile.txt. Index: compile.txt === RCS file: /cvsroot/audacity/audacity-src/win/compile.txt,v retrieving revision 1.70 retrieving revision 1.71 diff -u -d -r1.70 -r1.71 --- compile.txt 16 Jun 2009 07:53:41 - 1.70 +++ compile.txt 1 Jul 2009 18:27:35 - 1.71 @@ -20,16 +20,13 @@ http://audacityteam.org/wiki/index.php?title=Developing_On_Windows;. -Audacity releases are now built with Microsoft Visual C++ 8 -(a.k.a Visual C++ 2005), generically known as VC8. +Audacity releases are now built with Microsoft Visual C++ 9 +(a.k.a Visual C++ 2008) generically known as VC9. For instructions on compiling Audacity under the Cygwin UNIX Emulation Layer, see the Compiling Audacity under Cygwin section below. This is not maintained. -Previous Audacity releases have been built with Visual C++ 6.0, -with Service Pack 5. This is no longer actively supported. - Note that Audacity uses VC++'s multithreaded DLL runtime libraries. If you have MSVC installed, these are in your PATH, but users to whom you distribute your builds may not have them, so you may have @@ -48,7 +45,7 @@ wxWidgets is available at http://www.wxwidgets.org/;. -Audacity 1.3.8 requires wxWidgets 2.8.9. +Audacity 1.3.8 requires wxWidgets 2.8.10. To build on Windows only, download the wxMSW package (installer or zip). @@ -60,31 +57,23 @@ When you have downloaded and installed wxWidgets, you must build it. -Audacity previously required different build settings than -are shipped with the wxWidgets projects, to use the -multithreaded statically-linked runtime libraries instead -of the multithreaded DLL runtime libraries. -We NO LONGER build that way, so this process is -now much simpler. To build previous versions, refer -to the corresponding previous version of this file. - For wxWidgets' instructions on compilation (and details about static versus dll linkage), see -C:\wxWidgets-2.8.9\docs\msw\install.txt. +C:\wxWidgets-2.8.10\docs\msw\install.txt. Note therein that wx_dll.dsw adds the dependencies to force the correct build order for DLLs, which wx.dsw does not. Because of this, wx_dll.dsw doesn't work for static libraries. -1. Open C:\wxWidgets-2.8.9\build\msw\wx_dll.dsw with - Visual Studio 2005 (for VC8). +1. Open C:\wxWidgets-2.8.10\build\msw\wx_dll.dsw with + Visual Studio 2008 (for VC9). Make sure to use wx_dll.dsw, not wx.dsw, because wx.dsw does not have the correct dependencies for the DLL builds. When you open wx_dll.dsw, Visual Studio will prompt whether to convert. Click Yes To All. Next time you open a Visual Studio session, you can avoid this prompt by opening - C\wxWidgets-2.8.9\build\msw\wx_dll.sln instead of wx_dll.dsw. + C\wxWidgets-2.8.10\build\msw\wx_dll.sln instead of wx_dll.dsw. 2. If you want to use the accessibility features, we have modified a @@ -95,9 +84,9 @@ You may want to make backups of the wxWidgets originals of these, in case you also build without these accessibility features. - * Copy access.cpp to C:\wxWidgets-2.8.9\src\msw\ole\. + * Copy access.cpp to C:\wxWidgets-2.8.10\src\msw\ole\. - * Copy setup.h to C:\wxWidgets-2.8.9\include\wx\msw\. + * Copy setup.h to C:\wxWidgets-2.8.10\include\wx\msw\. Audacity releases are built with these accessibility features. @@ -134,7 +123,7 @@ wxbase28*_odbc*.* dbgrid. -4. Note the directory C\wxWidgets-2.8.9\lib\vc_dll. For each +4. Note the directory C\wxWidgets-2.8.10\lib\vc_dll. For each build of WxWidgets you made, you will need from here five DLLs appropriate to that build to go in the corresponding Audacity build directory. The DLLs required are noted at Provide access @@ -157,9 +146,9 @@ Before you can start the build process, you must update the project settings to tell Visual C++ where to find wxWidgets. There are three settings that need changing: -1. Include Directory (e.g., C:\wxWidgets-2.8.9\include) -2. Resource Directory (e.g., C:\wxWidgets-2.8.9\include) -3. Library Directory (e.g., C:\wxWidgets-2.8.9\lib) +1. Include Directory (e.g., C:\wxWidgets-2.8.10\include) +2. Resource Directory (e.g., C:\wxWidgets-2.8.10\include) +3. Library Directory (e.g., C:\wxWidgets-2.8.10\lib) Fortunately, this is parameterized, using a Windows system environment variable. There are various ways to set these, so @@ -168,7 +157,7 @@ where you installed wxWidgets. For example, in your autoexec.bat file, you might have a line: - set
[Audacity-cvs] lib-src/FileDialog/win FileDialogPrivate.cpp, 1.16, 1.17
Update of /cvsroot/audacity/lib-src/FileDialog/win
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31341/win
Modified Files:
FileDialogPrivate.cpp
Log Message:
Brian Cameron's patch for compatibility with latest Sun Studio compiler.
Index: FileDialogPrivate.cpp
===
RCS file: /cvsroot/audacity/lib-src/FileDialog/win/FileDialogPrivate.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- FileDialogPrivate.cpp 11 Apr 2009 05:53:09 - 1.16
+++ FileDialogPrivate.cpp 2 Jul 2009 22:11:19 - 1.17
@@ -489,8 +489,8 @@
paths.Empty();
wxString dir(m_dir);
- if ( m_dir.Last() != _T('\\') )
- dir += _T('\\');
+ if ( m_dir.Last() != wxT('\\') )
+ dir += wxT('\\');
size_t count = m_fileNames.GetCount();
for ( size_t n = 0; n count; n++ )
@@ -512,7 +512,7 @@
wxString ext;
wxSplitPath(path, m_dir, m_fileName, ext);
if ( !ext.empty() )
- m_fileName _T('.') ext;
+ m_fileName wxT('.') ext;
}
void FileDialog::DoGetPosition( int *x, int *y ) const
@@ -650,17 +650,17 @@
wxChar ch = m_dir[i];
switch ( ch )
{
- case _T('/'):
+ case wxT('/'):
// convert to backslash
-ch = _T('\\');
+ch = wxT('\\');
// fall through
- case _T('\\'):
+ case wxT('\\'):
while ( i len - 1 )
{
wxChar chNext = m_dir[i + 1];
- if ( chNext != _T('\\') chNext != _T('/') )
+ if ( chNext != wxT('\\') chNext != wxT('/') )
break;
// ignore the next one, unless it is at the start of a UNC path
@@ -686,7 +686,7 @@
size_t items = wxParseCommonDialogsFilter(m_wildCard, wildDescriptions,
m_FilterGroups);
- wxASSERT_MSG( items 0 , _T(empty wildcard list) );
+ wxASSERT_MSG( items 0 , wxT(empty wildcard list) );
wxString filterBuffer;
@@ -814,7 +814,7 @@
i += wxStrlen(fileNameBuffer[i]) + 1;
}
#else
- wxStringTokenizer toke(fileNameBuffer, _T( \t\r\n));
+ wxStringTokenizer toke(fileNameBuffer, wxT( \t\r\n));
m_dir = toke.GetNextToken();
m_fileName = toke.GetNextToken();
m_fileNames.Add(m_fileName);
@@ -824,8 +824,8 @@
#endif // OFN_EXPLORER
wxString dir(m_dir);
- if ( m_dir.Last() != _T('\\') )
-dir += _T('\\');
+ if ( m_dir.Last() != wxT('\\') )
+dir += wxT('\\');
m_path = dir + m_fileName;
m_filterIndex = (int)of.nFilterIndex - 1;
--
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src AutoRecovery.cpp, 1.14, 1.15 UploadDialog.cpp, 1.22, 1.23
Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31528
Modified Files:
AutoRecovery.cpp UploadDialog.cpp
Log Message:
Brian Cameron's patch for compatibility with latest Sun Studio compiler.
Index: UploadDialog.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/UploadDialog.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- UploadDialog.cpp2 Feb 2009 17:11:04 - 1.22
+++ UploadDialog.cpp2 Jul 2009 22:12:16 - 1.23
@@ -244,7 +244,7 @@
system = ftp-GetLastResult();
system = system.Lower();
-//wxMessageBox(system, _T(FTP Status), wxOK | wxICON_INFORMATION,
this);
+//wxMessageBox(system, wxT(FTP Status), wxOK | wxICON_INFORMATION,
this);
if (system.Find(wxT(unix))==-1 system.Find(wxT(windows))==-1)
{
@@ -901,7 +901,7 @@
int updateResult = mProgress-Update(count, iterations,
src);
if (updateResult != eProgressSuccess)
{
-//wxMessageBox(ABORT, _T(FTP Status), wxOK |
wxICON_INFORMATION, NULL);
+//wxMessageBox(ABORT, wxT(FTP Status), wxOK |
wxICON_INFORMATION, NULL);
abort = true;
break;
@@ -1309,7 +1309,7 @@
wxString debug;
// debug.Printf(%d, index);
-// wxMessageBox(debug, _T(FTP Status), wxOK | wxICON_INFORMATION, this);
+// wxMessageBox(debug, wxT(FTP Status), wxOK | wxICON_INFORMATION, this);
wxFileName fn( FileNames::DataDir(), wxT(connections.ini) );
@@ -1353,7 +1353,7 @@
//wxString debug;
//debug.Printf(ftpIndex %d, ftpIndex);
-//wxMessageBox(debug, _T(FTP Status), wxOK | wxICON_INFORMATION, NULL);
+//wxMessageBox(debug, wxT(FTP Status), wxOK | wxICON_INFORMATION, NULL);
}
@@ -1462,7 +1462,7 @@
while (count ftpList-GetCount())
{
-//wxMessageBox(ftpList-Item(count), _T(Error), wxOK, NULL);
+//wxMessageBox(ftpList-Item(count), wxT(Error), wxOK, NULL);
tmp = siteList-InsertItem(insert_count, ftpList-Item(count), 0);
siteList-SetItemData(tmp, insert_count);
Index: AutoRecovery.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/AutoRecovery.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- AutoRecovery.cpp31 Mar 2009 16:51:31 - 1.14
+++ AutoRecovery.cpp2 Jul 2009 22:12:16 - 1.15
@@ -158,7 +158,7 @@
{
wxArrayString files;
wxDir::GetAllFiles(FileNames::AutoSaveDir(), files,
- _T(*.autosave), wxDIR_FILES);
+ wxT(*.autosave), wxDIR_FILES);
for (unsigned int i = 0; i files.GetCount(); i++)
{
@@ -191,7 +191,7 @@
wxArrayString files;
wxDir::GetAllFiles(FileNames::AutoSaveDir(), files,
- _T(*.autosave), wxDIR_FILES);
+ wxT(*.autosave), wxDIR_FILES);
for (unsigned int i = 0; i files.GetCount(); i++)
{
--
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src/effects/VST LoadVST.cpp,1.4,1.5
Update of /cvsroot/audacity/audacity-src/src/effects/VST In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31528/effects/VST Modified Files: LoadVST.cpp Log Message: Brian Cameron's patch for compatibility with latest Sun Studio compiler. Index: LoadVST.cpp === RCS file: /cvsroot/audacity/audacity-src/src/effects/VST/LoadVST.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- LoadVST.cpp 2 Jun 2009 05:03:15 - 1.4 +++ LoadVST.cpp 2 Jul 2009 22:12:16 - 1.5 @@ -244,13 +244,13 @@ // Setup the default VST path. dpath[0] = '\0'; - ExpandEnvironmentStrings(_T(%ProgramFiles%\\Steinberg\\VSTPlugins), + ExpandEnvironmentStrings(wxT(%ProgramFiles%\\Steinberg\\VSTPlugins), dpath, WXSIZEOF(dpath)); // Check registry for the real path - if (SHRegGetUSValue(_T(Software\\VST), - _T(VSTPluginsPath), + if (SHRegGetUSValue(wxT(Software\\VST), + wxT(VSTPluginsPath), NULL, tpath, len, -- ___ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src/export ExportCL.cpp,1.32,1.33
Update of /cvsroot/audacity/audacity-src/src/export
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31528/export
Modified Files:
ExportCL.cpp
Log Message:
Brian Cameron's patch for compatibility with latest Sun Studio compiler.
Index: ExportCL.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/export/ExportCL.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- ExportCL.cpp2 Feb 2009 17:11:04 - 1.32
+++ ExportCL.cpp2 Jul 2009 22:12:16 - 1.33
@@ -120,7 +120,7 @@
char buffer[4096];
s-Read(buffer, WXSIZEOF(buffer) - 1);
- buffer[s-LastRead()] = _T('\0');
+ buffer[s-LastRead()] = wxT('\0');
*o += LAT1CTOWX(buffer);
}
}
--
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src Branding.cpp, 1.1.2.10, 1.1.2.11 TrackArtist.cpp, 1.57.2.8.2.5, 1.57.2.8.2.6 WaveTrack.cpp, 1.51.2.2.2.8, 1.51.2.2.2.9 Audacity.h, 1.20.2.17.2.9, 1.20.2.17.2.10
Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3237/src
Modified Files:
Tag: Audacity_UmixIt
Branding.cpp TrackArtist.cpp WaveTrack.cpp Audacity.h
Log Message:
mods per Audiotouch client
Index: Branding.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/Attic/Branding.cpp,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -d -r1.1.2.10 -r1.1.2.11
--- Branding.cpp11 Jun 2007 22:08:51 - 1.1.2.10
+++ Branding.cpp2 Jul 2009 22:40:36 - 1.1.2.11
@@ -218,10 +218,6 @@
buttonImageUp, buttonImageUp,
buttonImageUp, buttonImageUp, //v other images?
false); // momentary button
- #if (AUDACITY_BRANDING == BRAND_THINKLABS)
-if (mMinLeftSectionWidth buttonImageUp.GetWidth() + kDoubleInset)
- mMinLeftSectionWidth = buttonImageUp.GetWidth() + kDoubleInset;
- #endif
if (mMinHeight buttonImageUp.GetHeight() + kInset) // height plus
bevel
mMinHeight = buttonImageUp.GetHeight() + kInset;
mProjectLogo_origWidth = buttonImageUp.GetWidth();
Index: Audacity.h
===
RCS file: /cvsroot/audacity/audacity-src/src/Audacity.h,v
retrieving revision 1.20.2.17.2.9
retrieving revision 1.20.2.17.2.10
diff -u -d -r1.20.2.17.2.9 -r1.20.2.17.2.10
--- Audacity.h 15 Nov 2008 21:05:13 - 1.20.2.17.2.9
+++ Audacity.h 2 Jul 2009 22:40:38 - 1.20.2.17.2.10
@@ -20,7 +20,7 @@
// Increment this every time you release a new version
#if (AUDACITY_BRANDING == BRAND_AUDIOTOUCH)
- #define AUDACITY_VERSION_STRING 1.2.6a6
+ #define AUDACITY_VERSION_STRING 1.2.6a7
#elif (AUDACITY_BRANDING == BRAND_UMIXIT)
#define AUDACITY_VERSION_STRING 1.2.6.1
#else
Index: WaveTrack.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/WaveTrack.cpp,v
retrieving revision 1.51.2.2.2.8
retrieving revision 1.51.2.2.2.9
diff -u -d -r1.51.2.2.2.8 -r1.51.2.2.2.9
--- WaveTrack.cpp 5 Feb 2009 22:56:35 - 1.51.2.2.2.8
+++ WaveTrack.cpp 2 Jul 2009 22:40:38 - 1.51.2.2.2.9
@@ -144,11 +144,7 @@
WaveTrack::WaveTrack(WaveTrack orig):
Track(orig)
{
- #if (AUDACITY_BRANDING == BRAND_AUDIOTOUCH)
- this-SetDisplay(WaveformAndSpectrumDisplay); // Move to GUIWaveTrack
- #else
- this-SetDisplay(WaveformDisplay); // Move to GUIWaveTrack
- #endif
+ this-SetDisplay(WaveformDisplay); // Move to GUIWaveTrack
Init(orig);
@@ -663,6 +659,9 @@
// Thinklabs has lower default for Spectrum MaxFreq bigger FFTSize
than standard Audacity
defaultMaxFreq = 1000;
defaultFFTSize = 4096;
+ #elif (AUDACITY_BRANDING == BRAND_AUDIOTOUCH)
+ defaultMaxFreq = 3000;
+ defaultFFTSize = 4096;
#endif
int windowSize = gPrefs-Read(/Spectrum/FFTSize, defaultFFTSize);
float *buffer = new float[windowSize];
Index: TrackArtist.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/TrackArtist.cpp,v
retrieving revision 1.57.2.8.2.5
retrieving revision 1.57.2.8.2.6
diff -u -d -r1.57.2.8.2.5 -r1.57.2.8.2.6
--- TrackArtist.cpp 24 Apr 2007 22:43:55 - 1.57.2.8.2.5
+++ TrackArtist.cpp 2 Jul 2009 22:40:37 - 1.57.2.8.2.6
@@ -326,6 +326,9 @@
// Thinklabs has lower default for Spectrum MaxFreq bigger FFTSize
than standard Audacity
defaultMaxFreq = 1000;
defaultFFTSize = 4096;
+ #elif (AUDACITY_BRANDING == BRAND_AUDIOTOUCH)
+ defaultMaxFreq = 3000;
+ defaultFFTSize = 4096;
#endif
int maxFreq = gPrefs-Read(/Spectrum/MaxFreq, defaultMaxFreq);
int windowSize = gPrefs-Read(/Spectrum/FFTSize, defaultFFTSize);
--
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/win audacity_audiotouch.iss, 1.1.2.4, 1.1.2.5
Update of /cvsroot/audacity/audacity-src/win In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3237/win Modified Files: Tag: Audacity_UmixIt audacity_audiotouch.iss Log Message: mods per Audiotouch client Index: audacity_audiotouch.iss === RCS file: /cvsroot/audacity/audacity-src/win/Attic/audacity_audiotouch.iss,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -d -r1.1.2.4 -r1.1.2.5 --- audacity_audiotouch.iss 13 Mar 2009 00:32:34 - 1.1.2.4 +++ audacity_audiotouch.iss 2 Jul 2009 22:40:39 - 1.1.2.5 @@ -3,7 +3,7 @@ [Setup] ; compiler-related directives -OutputBaseFilename=audacity-audiotouch-win-1.2.6a6 +OutputBaseFilename=audacity-audiotouch-win-1.2.6a7 SetupIconFile=Audacity.ico WizardImageFile=audacity_InnoWizardImage.bmp -- ___ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src/prefs SpectrumPrefs.cpp, 1.5.10.3, 1.5.10.4
Update of /cvsroot/audacity/audacity-src/src/prefs In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3237/src/prefs Modified Files: Tag: Audacity_UmixIt SpectrumPrefs.cpp Log Message: mods per Audiotouch client Index: SpectrumPrefs.cpp === RCS file: /cvsroot/audacity/audacity-src/src/prefs/SpectrumPrefs.cpp,v retrieving revision 1.5.10.3 retrieving revision 1.5.10.4 diff -u -d -r1.5.10.3 -r1.5.10.4 --- SpectrumPrefs.cpp 5 Feb 2009 22:56:34 - 1.5.10.3 +++ SpectrumPrefs.cpp 2 Jul 2009 22:40:39 - 1.5.10.4 @@ -55,6 +55,9 @@ // Thinklabs has lower default for Spectrum MaxFreq bigger FFTSize than standard Audacity defaultFFTSize = 4096L; defaultMaxFreq = 1000L; + #elif (AUDACITY_BRANDING == BRAND_AUDIOTOUCH) + defaultMaxFreq = 3000L; + defaultFFTSize = 4096L; #endif int fftSize = gPrefs-Read(/Spectrum/FFTSize, defaultFFTSize); -- ___ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/win audacity.iss, 1.33, 1.34 audacity_unicode.iss, 1.19, 1.20
Update of /cvsroot/audacity/audacity-src/win
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv14383
Modified Files:
audacity.iss audacity_unicode.iss
Log Message:
Since people are posting alpha installers, changed beta to alpha to reduce
confusion. Previously we never posted builds until we were actually in beta.
Removed (Help Test). Because most of us are not building that, it shouldn't
have been committed.
Index: audacity.iss
===
RCS file: /cvsroot/audacity/audacity-src/win/audacity.iss,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- audacity.iss28 Apr 2009 21:22:47 - 1.33
+++ audacity.iss29 Jun 2009 17:40:44 - 1.34
@@ -3,7 +3,7 @@
[Setup]
; compiler-related directives
-OutputBaseFilename=audacity-1.3.8-win
+OutputBaseFilename=audacity-1.3.8a-win
SetupIconFile=audacity.ico
WizardImageFile=audacity_InnoWizardImage.bmp
@@ -12,14 +12,14 @@
SolidCompression=yes
; installer-related directives
-AppName=Audacity 1.3 Beta
+AppName=Audacity 1.3 Alpha
AppVerName=Audacity 1.3.8
AppPublisher=Audacity Team
AppPublisherURL=http://audacity.sourceforge.net
AppSupportURL=http://audacity.sourceforge.net
AppUpdatesURL=http://audacity.sourceforge.net
ChangesAssociations=yes
-DefaultDirName={pf}\Audacity 1.3 Beta
+DefaultDirName={pf}\Audacity 1.3 Alpha
; Always warn if dir exists, because we'll overwrite previous Audacity.
DirExistsWarning=yes
DisableProgramGroupPage=yes
@@ -91,8 +91,8 @@
[Icons]
-Name: {commonprograms}\Audacity 1.3 Beta; Filename: {app}\audacity.exe
-Name: {userdesktop}\Audacity 1.3 Beta; Filename: {app}\audacity.exe;
MinVersion: 4,4; Tasks: desktopicon
+Name: {commonprograms}\Audacity 1.3 Alpha; Filename: {app}\audacity.exe
+Name: {userdesktop}\Audacity 1.3 Alpha; Filename: {app}\audacity.exe;
MinVersion: 4,4; Tasks: desktopicon
[InstallDelete]
; Get rid of Audacity 1.0.0 stuff that's no longer used.
Index: audacity_unicode.iss
===
RCS file: /cvsroot/audacity/audacity-src/win/audacity_unicode.iss,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- audacity_unicode.iss27 May 2009 00:21:38 - 1.19
+++ audacity_unicode.iss29 Jun 2009 17:40:44 - 1.20
@@ -3,7 +3,7 @@
[Setup]
; compiler-related directives
-OutputBaseFilename=audacity-1.3.8-win-unicode
+OutputBaseFilename=audacity-1.3.8a-win-unicode
SetupIconFile=audacity.ico
WizardImageFile=audacity_InnoWizardImage.bmp
@@ -12,14 +12,14 @@
SolidCompression=yes
; installer-related directives
-AppName=Audacity 1.3 Beta (Unicode) (Help Test)
-AppVerName=Audacity 1.3.8 (Unicode) (Help Test)
+AppName=Audacity 1.3 Alpha (Unicode)
+AppVerName=Audacity 1.3.8 (Unicode)
AppPublisher=Audacity Team
AppPublisherURL=http://audacity.sourceforge.net
AppSupportURL=http://audacity.sourceforge.net
AppUpdatesURL=http://audacity.sourceforge.net
ChangesAssociations=yes
-DefaultDirName={pf}\Audacity 1.3 Beta (Unicode) (Help Test)
+DefaultDirName={pf}\Audacity 1.3 Alpha (Unicode)
; Always warn if dir exists, because we'll overwrite previous Audacity.
DirExistsWarning=yes
DisableProgramGroupPage=yes
@@ -88,12 +88,12 @@
Source: ..\win\unicode release\modules\*; DestDir: {app}\Modules\; Flags:
ignoreversion recursesubdirs skipifsourcedoesntexist
Source: ..\win\unicode release\nyquist\*; DestDir: {app}\Nyquist\; Flags:
ignoreversion
Source: ..\win\unicode release\plug-ins\*; DestDir: {app}\Plug-Ins\;
Excludes: analyze.ny, fadein.ny, fadeout.ny, undcbias.ny; Flags: ignoreversion
-Source: ..\help\manual\*; DestDir: {app}\Help\; Flags: ignoreversion
recursesubdirs
+; not yet in cvs: Source: ..\help\manual\*; DestDir: {app}\Help\; Flags:
ignoreversion recursesubdirs
[Icons]
-Name: {commonprograms}\Audacity 1.3 Beta (Unicode); Filename:
{app}\audacity.exe
-Name: {userdesktop}\Audacity 1.3 Beta (Unicode); Filename:
{app}\audacity.exe; MinVersion: 4,4; Tasks: desktopicon
+Name: {commonprograms}\Audacity 1.3 Alpha (Unicode); Filename:
{app}\audacity.exe
+Name: {userdesktop}\Audacity 1.3 Alpha (Unicode); Filename:
{app}\audacity.exe; MinVersion: 4,4; Tasks: desktopicon
[InstallDelete]
; Get rid of Audacity 1.0.0 stuff that's no longer used.
--
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] htdocs index.php,1.49,1.50
Update of /cvsroot/audacity/htdocs In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30557 Modified Files: index.php Log Message: SF CCA-09 update for Audacity-specific voting links and badge image from Ross Turk Index: index.php === RCS file: /cvsroot/audacity/htdocs/index.php,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- index.php 23 Jun 2009 01:58:08 - 1.49 +++ index.php 25 Jun 2009 20:45:31 - 1.50 @@ -82,17 +82,23 @@ table border=0 width=100%trtdnbsp;/td/tr table border=0 width=100% -trtda href=https://sourceforge.net/community/cca09/vote/; -img src=https://sourceforge.net/community/communityhub/uploads/2009/03/cca_logo.png; border=0 alt=SourceForge.net Community Choice Awards 2009 width=92 height=145/a/td -tdnbsp;/tdtd valign=top - pVoting is under way for the final round of -the 2009 a href=http://sourceforge.net/community/cca09/;SourceForge.net Community Choice Awards/a. -Please a href=https://sourceforge.net/community/cca09/vote/;vote for Audacity now/a -to win the bBest Project/b and bBest Project for Multimedia/b categories. -Spread the word to others, too! Voting ends on July 20, 2009 at 4:00 pm PDT. /p - pWinners will be announced on July 23rd at the a href=http://en.oreilly.com/oscon2009; -OSCON 2009/a Open Source Convention./p -/td/tr/table +tr + tda href=http://sf.net/community/cca09/vote/?f=461; +img border=0 + src=http://sf.net/awards/cca/badge_img.php?f=461; + alt=SourceForge.net Community Choice Awards 2009/a/td + tdnbsp;/td + td valign=top +pVoting is under way for the final round of + the 2009 a href=http://sourceforge.net/community/cca09/;SourceForge.net Community Choice Awards/a. + Please a href=https://sourceforge.net/community/cca09/vote/?f=461;vote for Audacity now/a + to win the bBest Project/b and bBest Project for Multimedia/b categories. + Spread the word to others, too! Voting ends on July 20, 2009 at 4:00 pm PDT. /p +pWinners will be announced on July 23rd at the + a href=http://en.oreilly.com/oscon2009;OSCON 2009/a + Open Source Convention./p/td +/tr +/table div style=clear: both; /div -- ___ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src/widgets Ruler.cpp,1.62,1.63
Update of /cvsroot/audacity/audacity-src/src/widgets In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22145 Modified Files: Ruler.cpp Log Message: Fix compiler error. MSVC requires both args be cast. Index: Ruler.cpp === RCS file: /cvsroot/audacity/audacity-src/src/widgets/Ruler.cpp,v retrieving revision 1.62 retrieving revision 1.63 diff -u -d -r1.62 -r1.63 --- Ruler.cpp 20 Jun 2009 17:12:27 - 1.62 +++ Ruler.cpp 21 Jun 2009 01:00:10 - 1.63 @@ -666,7 +666,7 @@ format.Printf(wxT(%%%d.%dlf), mDigits+3, mDigits); // The casting to float is working around an issue where 59 seconds // would show up as 60 when using g++ (Ubuntu 4.3.3-5ubuntu4) 4.3.3. -t2.Printf(format.c_str(), fmod((float)d, 60.0)); +t2.Printf(format.c_str(), fmod((float)d, (float)60.0)); s += t1 + t2; } -- Are you an open source citizen? Join us for the Open Source Bridge conference! Portland, OR, June 17-19. Two days of sessions, one day of unconference: $250. Need another reason to go? 24-hour hacker lounge. Register today! http://ad.doubleclick.net/clk;215844324;13503038;v?http://opensourcebridge.org ___ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src/effects ChangePitch.h, 1.15, 1.16 ChangeSpeed.h, 1.16, 1.17 ChangeTempo.h, 1.15, 1.16
Update of /cvsroot/audacity/audacity-src/src/effects
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv24001
Modified Files:
ChangePitch.h ChangeSpeed.h ChangeTempo.h
Log Message:
Add CheckWhetherSkipEffect method.
Index: ChangeTempo.h
===
RCS file: /cvsroot/audacity/audacity-src/src/effects/ChangeTempo.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ChangeTempo.h 12 Jun 2008 12:41:29 - 1.15
+++ ChangeTempo.h 18 Jun 2009 22:34:36 - 1.16
@@ -26,7 +26,7 @@
class wxTextCtrl;
-class EffectChangeTempo:public EffectSoundTouch {
+class EffectChangeTempo : public EffectSoundTouch {
public:
EffectChangeTempo();
@@ -56,6 +56,8 @@
virtual bool PromptUser();
virtual bool TransferParameters( Shuttle shuttle );
+
+ virtual bool CheckWhetherSkipEffect() { return (m_PercentChange == 0.0); }
virtual bool Process();
private:
Index: ChangeSpeed.h
===
RCS file: /cvsroot/audacity/audacity-src/src/effects/ChangeSpeed.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- ChangeSpeed.h 12 Jul 2008 15:25:45 - 1.16
+++ ChangeSpeed.h 18 Jun 2009 22:34:36 - 1.17
@@ -52,6 +52,8 @@
protected:
virtual bool PromptUser();
virtual bool TransferParameters( Shuttle shuttle );
+
+ virtual bool CheckWhetherSkipEffect() { return (m_PercentChange == 0.0); }
virtual bool Process();
private:
Index: ChangePitch.h
===
RCS file: /cvsroot/audacity/audacity-src/src/effects/ChangePitch.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ChangePitch.h 12 Jun 2008 12:41:29 - 1.15
+++ ChangePitch.h 18 Jun 2009 22:34:36 - 1.16
@@ -22,7 +22,7 @@
#include wx/intl.h
#include wx/slider.h
-class EffectChangePitch:public EffectSoundTouch {
+class EffectChangePitch : public EffectSoundTouch {
public:
EffectChangePitch();
@@ -58,6 +58,8 @@
virtual bool PromptUser();
virtual bool TransferParameters( Shuttle shuttle );
+
+ virtual bool CheckWhetherSkipEffect() { return (m_PercentChange == 0.0); }
virtual bool Process();
private:
--
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables unlimited
royalty-free distribution of the report engine for externally facing
server and web deployment.
http://p.sf.net/sfu/businessobjects
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src/widgets ProgressDialog.cpp, 1.17, 1.18 ProgressDialog.h, 1.10, 1.11
Update of /cvsroot/audacity/audacity-src/src/widgets
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv17596/widgets
Modified Files:
ProgressDialog.cpp ProgressDialog.h
Log Message:
TimerProgressDialog, new subclass of ProgressDialog, for progress that's just a
countdown timer. Fixes problem of progress estimates sometimes causing
remaining time calculation to go backward in TimerRecordDialog.
Index: ProgressDialog.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/widgets/ProgressDialog.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- ProgressDialog.cpp 8 Mar 2009 05:17:06 - 1.17
+++ ProgressDialog.cpp 8 Jun 2009 08:01:25 - 1.18
@@ -3,8 +3,15 @@
Audacity: A Digital Audio Editor
ProgressDialog.cpp
+
+ Copyright
+ Leland Lucius
+ Vaughan Johnson
- Leland Lucius
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
***//**
@@ -1375,6 +1382,56 @@
}
}
+TimerProgressDialog::TimerProgressDialog(const wxLongLong_t duration,
+ const wxString title,
+ const wxString message /*=
wxEmptyString*/,
+ ProgressDialogFlags flags /*=
pdlgEmptyFlags*/)
+: ProgressDialog(title, message, flags)
+{
+ mDuration = duration;
+}
+
+int TimerProgressDialog::Update(const wxString message /*= wxEmptyString*/)
+{
+ if (mCancel)
+ {
+ // for compatibility with old Update, that returned false on cancel
+ return eProgressCancelled;
+ }
+ else if (mStop)
+ {
+ return eProgressStopped;
+ }
+
+ SetMessage(message);
+
+ wxLongLong_t now = wxGetLocalTimeMillis().GetValue();
+ wxLongLong_t elapsed = now - mStartTime;
+ wxLongLong_t remains = mStartTime + mDuration - now;
+
+ if (!IsShown() elapsed 500)
+ {
+ Show(true);
+ }
+
+ // Only update if a full second has passed.
+ if (now - mLastUpdate 1000)
+ {
+ wxTimeSpan tsElapsed(0, 0, 0, elapsed);
+ wxTimeSpan tsRemains(0, 0, 0, remains);
+
+ mElapsed-SetLabel(tsElapsed.Format(wxT(%H:%M:%S)));
+ mRemaining-SetLabel(tsRemains.Format(wxT(%H:%M:%S)));
+
+ mLastUpdate = now;
+ }
+
+ wxYieldIfNeeded();
+
+ return eProgressSuccess;
+}
+
+
// Indentation settings for Vim and Emacs and unique identifier for Arch, a
// version control system. Please do not modify past this point.
//
Index: ProgressDialog.h
===
RCS file: /cvsroot/audacity/audacity-src/src/widgets/ProgressDialog.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ProgressDialog.h6 Feb 2009 18:45:28 - 1.10
+++ ProgressDialog.h8 Jun 2009 08:01:25 - 1.11
@@ -3,8 +3,15 @@
Audacity: A Digital Audio Editor
ProgressDialog.h
+
+ Copyright
+ Leland Lucius
+ Vaughan Johnson
- Leland Lucius
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
*/
@@ -62,25 +69,41 @@
void OnStop(wxCommandEvent e);
void Beep();
- private:
- wxWindow *mHadFocus;
- wxGauge *mGauge;
- wxStaticText *mMessage;
+ protected:
wxStaticText *mElapsed;
wxStaticText *mRemaining;
- wxWindowDisabler *mDisable;
wxLongLong_t mStartTime;
- wxLongLong_t mLastTime;
wxLongLong_t mLastUpdate;
- int mLastValue;
bool mCancel;
bool mStop;
+
+ private:
+ wxWindow *mHadFocus;
+ wxGauge *mGauge;
+ wxStaticText *mMessage;
+ wxWindowDisabler *mDisable;
+
+ int mLastValue;
+
DECLARE_EVENT_TABLE();
};
+class AUDACITY_DLL_API TimerProgressDialog : public ProgressDialog
+{
+ public:
+ TimerProgressDialog(const wxLongLong_t duration,
+const wxString title,
+const wxString message = wxEmptyString,
+ProgressDialogFlags flags = pdlgEmptyFlags);
+ int Update(const wxString message = wxEmptyString);
+
+ protected:
+ wxLongLong_t mDuration;
+};
+
#endif
// Indentation settings for Vim and Emacs and unique identifier for Arch, a
--
OpenSolaris 2009.06 is a cutting edge operating system for enterprises
looking to deploy the next generation of Solaris that includes the latest
innovations from Sun
