[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] audacity-src/src/commands ScreenshotCommand.cpp, NONE, 1.1 ScreenshotCommand.h, NONE, 1.1 CommandTargets.h, NONE, 1.1 BatchEvalCommand.h, 1.2, 1.3 Command.h, 1.2, 1.3 CommandBuilder.cpp
Update of /cvsroot/audacity/audacity-src/src/commands
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30115/src/commands
Modified Files:
BatchEvalCommand.h Command.h CommandBuilder.cpp
CommandBuilder.h CommandHandler.h DebugPrintCommand.h
Added Files:
ScreenshotCommand.cpp ScreenshotCommand.h CommandTargets.h
Log Message:
This update provides improved structure for the commands system and adds a
command for taking screenshots. The screenshot tools dialog is modified to use
the command, and the command is made available to scripts.
The commands system now has a system of parameters which allows type-checking
and validation of data passed in by a script. This is necessary for more useful
error messages to be returned than can be provided by the batch chain system.
Each command class has a 'signature' consisting of a map from parameter name to
a 'validator' and a default value. The validator is an object which is capable
of checking that a provided value is acceptable.
Commands also now can use abstract 'output targets' which mean progress
information and status messages can be dealt with in different ways without the
commands having to be directly concerned with e.g. displaying a progress
dialog.
The screenshot command takes three parameters: CaptureMode, Background, and
FilePath. See the test script for usage examples. The behaviour of the command
should be close to how the dialog worked - and the dialog *should* work
approximately the same as it did before. Those familiar with the previous
behaviour of the dialog might want to test it and report any regressions to me.
One thing I did change was to comment out the contents of the OnUIUpdate method
- it caused everything to slow to a halt on my machine whenever the screenshot
tools dialog was open. There's probably a good reason for its being there, so
let me know if it should go back in.
--- NEW FILE: CommandTargets.h ---
/**
Audacity - A Digital Audio Editor
Copyright 1999-2009 Audacity Team
License: GPL v2 - see LICENSE.txt
Dan Horgan
**//**
\file CommandTargets
\brief Contains classes for 'command output targets' - objects which can
receive output from a command. For instance, a progress target might pass the
information to a GUI ProgressDialog. Using abstract targets means the command
objects needn't be concerned with what happens to the information.
*//***/
#ifndef __COMMANDTARGETS__
#define __COMMANDTARGETS__
#include wx/string.h
#include wx/msgdlg.h
#include wx/statusbr.h
#include widgets/ProgressDialog.h
/// Interface for objects that can receive command progress information
class CommandProgressTarget
{
public:
virtual ~CommandProgressTarget() {}
virtual void Update(double completed) = 0;
};
/// Used to ignore a command's progress updates
class NullProgressTarget : public CommandProgressTarget
{
public:
virtual ~NullProgressTarget() {}
virtual void Update(double completed) {}
};
/// Sends command progress information to a ProgressDialog
class GUIProgressTarget : public CommandProgressTarget
{
private:
ProgressDialog mProgress;
public:
GUIProgressTarget(ProgressDialog pd)
: mProgress(pd)
{}
virtual void Update(double completed)
{
mProgress.Update(completed);
}
};
/// Interface for objects that can receive (string) messages from a command
class CommandMessageTarget
{
public:
virtual ~CommandMessageTarget() {}
virtual void Update(wxString message) = 0;
};
/// Used to ignore a command's message updates
class NullMessageTarget : public CommandMessageTarget
{
public:
virtual ~NullMessageTarget() {}
virtual void Update(wxString message) {}
};
/// Displays messages from a command in a wxMessageBox
class MessageBoxTarget : public CommandMessageTarget
{
public:
virtual ~MessageBoxTarget() {}
virtual void Update(wxString message)
{
wxMessageBox(message);
}
};
/// Displays messages from a command in a wxStatusBar
class StatusBarTarget : public CommandMessageTarget
{
private:
wxStatusBar mStatus;
public:
StatusBarTarget(wxStatusBar sb)
: mStatus(sb)
{}
virtual void Update(wxString message)
{
mStatus.SetStatusText(message);
}
};
// By default, we ignore progress updates but display all other messages
directly
class TargetFactory
{
public:
static CommandProgressTarget *ProgressDefault()
{
return CreateProgressTargetNullProgressTarget();
}
static CommandMessageTarget *MessageDefault()
{
return CreateMessageTargetMessageBoxTarget();
}
templatetypename T
static CommandProgressTarget *CreateProgressTarget()
{
return (new T);
}
templatetypename T
static CommandMessageTarget *CreateMessageTarget()
{
return (new T);
}
};
/// Used to
[Audacity-cvs] audacity-src/scripts pipe-test.pl,1.4,1.5
Update of /cvsroot/audacity/audacity-src/scripts In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30115/scripts Modified Files: pipe-test.pl Log Message: This update provides improved structure for the commands system and adds a command for taking screenshots. The screenshot tools dialog is modified to use the command, and the command is made available to scripts. The commands system now has a system of parameters which allows type-checking and validation of data passed in by a script. This is necessary for more useful error messages to be returned than can be provided by the batch chain system. Each command class has a 'signature' consisting of a map from parameter name to a 'validator' and a default value. The validator is an object which is capable of checking that a provided value is acceptable. Commands also now can use abstract 'output targets' which mean progress information and status messages can be dealt with in different ways without the commands having to be directly concerned with e.g. displaying a progress dialog. The screenshot command takes three parameters: CaptureMode, Background, and FilePath. See the test script for usage examples. The behaviour of the command should be close to how the dialog worked - and the dialog *should* work approximately the same as it did before. Those familiar with the previous behaviour of the dialog might want to test it and report any regressions to me. One thing I did change was to comment out the contents of the OnUIUpdate method - it caused everything to slow to a halt on my machine whenever the screenshot tools dialog was open. There's probably a good reason for its being there, so let me know if it should go back in. Index: pipe-test.pl === RCS file: /cvsroot/audacity/audacity-src/scripts/pipe-test.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- pipe-test.pl28 Jun 2009 12:28:18 - 1.4 +++ pipe-test.pl2 Jul 2009 22:03:24 - 1.5 @@ -55,20 +55,40 @@ return $ttt; } -# Send some test commands - commands currently allowed are precisely those -# supported by the Batch system, and with the same syntax. +# Send some test commands # (Delay between sends so it's clearer what's going on) +$delay = 1.0; + +# Fill in the path where you want the screenshots to appear +$filePath = /home/dan/Temp; + startUp(); -sleep(1.0); -doCommand( 'Amplify: Ratio=0.1' ); -sleep(1.0); -doCommand( 'Echo: Delay=1.0 Decay=0.5' ); -sleep(1.0); -doCommand( 'Amplify: Ratio=2.0' ); -sleep(1.0); -doCommand( 'Echo: Delay=1.0 Decay=0.5' ); -sleep(1.0); -doCommand( 'ExportMp3' ); -sleep(1.0); -doCommand( 'Not a valid command'); +sleep($delay); +doCommand( screenshot: FilePath=$filePath CaptureMode=window Background=None ); +sleep($delay); +doCommand( screenshot: FilePath=$filePath CaptureMode=fullwindow Background=Blue ); +sleep($delay); +doCommand( screenshot: FilePath=$filePath CaptureMode=windowplus Background=White ); +sleep($delay); +doCommand( screenshot: FilePath=$filePath CaptureMode=fullscreen Background=None ); +sleep($delay); +doCommand( screenshot: FilePath=$filePath CaptureMode=mixer Background=None ); +sleep($delay); +doCommand( screenshot: FilePath=$filePath CaptureMode=device Background=None ); +sleep($delay); +doCommand( screenshot: FilePath=$filePath CaptureMode=ruler Background=None ); +sleep($delay); +doCommand( screenshot: FilePath=$filePath CaptureMode=firsttrack Background=None ); +#sleep($delay); +#doCommand( Amplify: Ratio=0.1 ); +#sleep($delay); +#doCommand( Echo: Delay=1.0 Decay=0.5 ); +#sleep($delay); +#doCommand( Amplify: Ratio=2.0 ); +#sleep($delay); +#doCommand( Echo: Delay=1.0 Decay=0.5 ); +#sleep($delay); +#doCommand( ExportMp3 ); +#sleep($delay); +#doCommand( Not a valid command); finish(); -- ___ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src Makefile.in, 1.159, 1.160 Project.h, 1.154, 1.155 Screenshot.cpp, 1.23, 1.24 TrackPanel.h, 1.136, 1.137
Update of /cvsroot/audacity/audacity-src/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30115/src Modified Files: Makefile.in Project.h Screenshot.cpp TrackPanel.h Log Message: This update provides improved structure for the commands system and adds a command for taking screenshots. The screenshot tools dialog is modified to use the command, and the command is made available to scripts. The commands system now has a system of parameters which allows type-checking and validation of data passed in by a script. This is necessary for more useful error messages to be returned than can be provided by the batch chain system. Each command class has a 'signature' consisting of a map from parameter name to a 'validator' and a default value. The validator is an object which is capable of checking that a provided value is acceptable. Commands also now can use abstract 'output targets' which mean progress information and status messages can be dealt with in different ways without the commands having to be directly concerned with e.g. displaying a progress dialog. The screenshot command takes three parameters: CaptureMode, Background, and FilePath. See the test script for usage examples. The behaviour of the command should be close to how the dialog worked - and the dialog *should* work approximately the same as it did before. Those familiar with the previous behaviour of the dialog might want to test it and report any regressions to me. One thing I did change was to comment out the contents of the OnUIUpdate method - it caused everything to slow to a halt on my machine whenever the screenshot tools dialog was open. There's probably a good reason for its being there, so let me know if it should go back in. Index: Project.h === RCS file: /cvsroot/audacity/audacity-src/src/Project.h,v retrieving revision 1.154 retrieving revision 1.155 diff -u -d -r1.154 -r1.155 --- Project.h 1 Jun 2009 04:08:28 - 1.154 +++ Project.h 2 Jul 2009 22:03:24 - 1.155 @@ -473,7 +473,7 @@ private: // The screenshot class needs to access internals - friend class ScreenFrame; + friend class ScreenshotCommand; public: DECLARE_EVENT_TABLE() Index: Makefile.in === RCS file: /cvsroot/audacity/audacity-src/src/Makefile.in,v retrieving revision 1.159 retrieving revision 1.160 diff -u -d -r1.159 -r1.160 --- Makefile.in 24 Jun 2009 00:09:00 - 1.159 +++ Makefile.in 2 Jul 2009 22:03:23 - 1.160 @@ -114,6 +114,7 @@ commands/CommandManager.o \ commands/Keyboard.o \ commands/ResponseQueue.o \ + commands/ScreenshotCommand.o \ commands/ScriptCommandRelay.o \ effects/Effect.o \ effects/Generator.o \ Index: Screenshot.cpp === RCS file: /cvsroot/audacity/audacity-src/src/Screenshot.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- Screenshot.cpp 7 Apr 2009 06:40:18 - 1.23 +++ Screenshot.cpp 2 Jul 2009 22:03:24 - 1.24 @@ -9,20 +9,18 @@ ***/ #include Screenshot.h - +#include commands/ScreenshotCommand.h #include wx/defs.h -#include wx/bitmap.h +#include wx/event.h +#include wx/frame.h + +#include ShuttleGui.h #include wx/button.h #include wx/checkbox.h -#include wx/dcmemory.h -#include wx/dcscreen.h #include wx/dirdlg.h -#include wx/frame.h -#include wx/event.h #include wx/image.h #include wx/intl.h #include wx/panel.h -#include wx/settings.h #include wx/statusbr.h #include wx/textctrl.h #include wx/timer.h @@ -32,19 +30,7 @@ #include AudacityApp.h #include Project.h #include Prefs.h -#include ShuttleGui.h -#include TrackPanel.h #include toolbars/ToolManager.h -#include toolbars/ToolBar.h -#include toolbars/ControlToolBar.h -#include toolbars/DeviceToolBar.h -#include toolbars/EditToolBar.h -#include toolbars/MeterToolBar.h -#include toolbars/MixerToolBar.h -#include toolbars/SelectionBar.h -#include toolbars/ToolsToolBar.h -#include toolbars/TranscriptionToolBar.h -#include widgets/Ruler.h @@ -61,30 +47,21 @@ void Populate(); void PopulateOrExchange(ShuttleGui S); - wxTopLevelWindow *GetFrontWindow(); - - wxRect GetBackgroundRect(); - - void Capture(wxString basename, -wxWindow *window, -int x, int y, int width, int height, -bool bg = false); - void CaptureToolbar(int type, wxString name); - void OnCloseWindow(wxCloseEvent e); void OnUIUpdate(wxUpdateUIEvent e); - void OnDirChoose(wxCommandEvent e); + void SizeMainWindow(int w, int h); void OnMainWindowSmall(wxCommandEvent e); void
[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/src/commands CommandMisc.h,NONE,1.1
Update of /cvsroot/audacity/audacity-src/src/commands In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9155/src/commands Added Files: CommandMisc.h Log Message: Adding the one that got away! --- NEW FILE: CommandMisc.h --- #ifndef __COMMANDMISC__ #define __COMMANDMISC__ #include map #include utility class wxString; class wxVariant; class Validator; // Map from parameter name to the value of the parameter, with a suitable Validator typedef std::mapwxString, std::pairwxVariant, Validator ParamMap; #endif /* End of include guard: __COMMANDMISC__ */ -- ___ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/win/Projects/Audacity Audacity.vcproj, 1.43, 1.44
Update of /cvsroot/audacity/audacity-src/win/Projects/Audacity In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv10910/win/Projects/Audacity Modified Files: Audacity.vcproj Log Message: Restore buildability on VS9 Index: Audacity.vcproj === RCS file: /cvsroot/audacity/audacity-src/win/Projects/Audacity/Audacity.vcproj,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- Audacity.vcproj 1 Jul 2009 15:49:01 - 1.43 +++ Audacity.vcproj 3 Jul 2009 00:00:12 - 1.44 @@ -1934,6 +1934,10 @@ /File File + RelativePath=..\..\..\src\commands\CommandMisc.h + + /File + File RelativePath=..\..\..\src\commands\DebugPrintCommand.h /File @@ -1954,6 +1958,14 @@ /File File + RelativePath=..\..\..\src\commands\ScreenshotCommand.cpp + + /File + File + RelativePath=..\..\..\src\commands\ScreenshotCommand.h + + /File + File RelativePath=..\..\..\src\commands\ScriptCommandRelay.cpp /File -- ___ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src/commands CommandBuilder.cpp, 1.3, 1.4 CommandTargets.h, 1.1, 1.2 ScreenshotCommand.cpp, 1.1, 1.2
Update of /cvsroot/audacity/audacity-src/src/commands
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv10910/src/commands
Modified Files:
CommandBuilder.cpp CommandTargets.h ScreenshotCommand.cpp
Log Message:
Restore buildability on VS9
Index: CommandTargets.h
===
RCS file: /cvsroot/audacity/audacity-src/src/commands/CommandTargets.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CommandTargets.h2 Jul 2009 22:03:24 - 1.1
+++ CommandTargets.h3 Jul 2009 00:00:12 - 1.2
@@ -22,7 +22,7 @@
#include wx/string.h
#include wx/msgdlg.h
#include wx/statusbr.h
-#include widgets/ProgressDialog.h
+#include ../widgets/ProgressDialog.h
/// Interface for objects that can receive command progress information
class CommandProgressTarget
Index: CommandBuilder.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/commands/CommandBuilder.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CommandBuilder.cpp 2 Jul 2009 22:03:24 - 1.3
+++ CommandBuilder.cpp 3 Jul 2009 00:00:12 - 1.4
@@ -29,7 +29,7 @@
#include DebugPrintCommand.h
#include BatchEvalCommand.h
#include ScreenshotCommand.h
-#include Shuttle.h
+#include ../Shuttle.h
CommandBuilder::CommandBuilder(const wxString cmdString)
: mValid(false), mCommand(NULL)
Index: ScreenshotCommand.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/commands/ScreenshotCommand.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ScreenshotCommand.cpp 2 Jul 2009 22:03:24 - 1.1
+++ ScreenshotCommand.cpp 3 Jul 2009 00:00:12 - 1.2
@@ -16,7 +16,7 @@
*//***/
#include ScreenshotCommand.h
-#include AudacityApp.h
+#include ../AudacityApp.h
#include ../Project.h
#include wx/toplevel.h
#include wx/dcscreen.h
@@ -24,18 +24,18 @@
#include wx/settings.h
#include wx/bitmap.h
-#include TrackPanel.h
-#include toolbars/ToolManager.h
-#include toolbars/ToolBar.h
-#include toolbars/ControlToolBar.h
-#include toolbars/DeviceToolBar.h
-#include toolbars/EditToolBar.h
-#include toolbars/MeterToolBar.h
-#include toolbars/MixerToolBar.h
-#include toolbars/SelectionBar.h
-#include toolbars/ToolsToolBar.h
-#include toolbars/TranscriptionToolBar.h
-#include widgets/Ruler.h
+#include ../TrackPanel.h
+#include ../toolbars/ToolManager.h
+#include ../toolbars/ToolBar.h
+#include ../toolbars/ControlToolBar.h
+#include ../toolbars/DeviceToolBar.h
+#include ../toolbars/EditToolBar.h
+#include ../toolbars/MeterToolBar.h
+#include ../toolbars/MixerToolBar.h
+#include ../toolbars/SelectionBar.h
+#include ../toolbars/ToolsToolBar.h
+#include ../toolbars/TranscriptionToolBar.h
+#include ../widgets/Ruler.h
wxTopLevelWindow *ScreenshotCommand::GetFrontWindow(AudacityProject *project)
{
--
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/src WaveClip.cpp,1.49,1.50
Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv14387
Modified Files:
WaveClip.cpp
Log Message:
If GetSpectrogram needs to zero-pad BOTH the start and the end of the buffer,
there will be a buffer overrun.
This change makes sure the zero padding only goes out to the end of the defined
buffer.
Index: WaveClip.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/WaveClip.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- WaveClip.cpp20 Apr 2009 17:27:22 - 1.49
+++ WaveClip.cpp3 Jul 2009 05:25:00 - 1.50
@@ -769,14 +769,15 @@
}
#ifdef EXPERIMENTAL_FFT_SKIP_POINTS
if (start + len*fftSkipPoints1 mSequence-GetNumSamples()) {
- len = (mSequence-GetNumSamples() - start)/fftSkipPoints1;
- for (i = len*fftSkipPoints1; i (sampleCount)windowSize; i++)
+ int newlen = (mSequence-GetNumSamples() -
start)/fftSkipPoints1;
+ for (i = newlen*fftSkipPoints1; i
(sampleCount)len*fftSkipPoints1; i++)
#else //!EXPERIMENTAL_FFT_SKIP_POINTS
if (start + len mSequence-GetNumSamples()) {
- len = mSequence-GetNumSamples() - start;
- for (i = len; i (sampleCount)windowSize; i++)
+ int newlen = mSequence-GetNumSamples() - start;
+ for (i = newlen; i (sampleCount)len; i++)
#endif //EXPERIMENTAL_FFT_SKIP_POINTS
adj[i] = 0;
+ len = newlen;
}
if (len 0)
--
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
