Update of /cvsroot/audacity/audacity-src/src/commands
In directory
sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25907/src/commands
Modified Files:
GetProjectInfoCommand.cpp GetProjectInfoCommand.h
GetTrackInfoCommand.cpp SetProjectInfoCommand.h Validators.h
Log Message:
Fix additional Linux errors and Makefile.in.
Index: GetProjectInfoCommand.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/commands/GetProjectInfoCommand.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- GetProjectInfoCommand.h 11 Dec 2009 19:09:34 -0000 1.1
+++ GetProjectInfoCommand.h 11 Dec 2009 21:53:30 -0000 1.2
@@ -18,7 +18,7 @@
#include "Command.h"
#include "CommandType.h"
-
+#include "../Track.h"
class GetProjectInfoCommandType : public CommandType
{
Index: GetTrackInfoCommand.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/commands/GetTrackInfoCommand.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- GetTrackInfoCommand.cpp 11 Dec 2009 21:15:59 -0000 1.3
+++ GetTrackInfoCommand.cpp 11 Dec 2009 21:53:31 -0000 1.4
@@ -57,9 +57,9 @@
void GetTrackInfoCommand::SendBooleanStatus(bool boolValue)
{
if(boolValue)
- Status(_("1")); // in C# we can say boolValue.ToString();
+ Status(wxT("1"));
else
- Status(_("0"));
+ Status(wxT("0"));
}
Index: SetProjectInfoCommand.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/commands/SetProjectInfoCommand.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SetProjectInfoCommand.h 11 Dec 2009 19:09:35 -0000 1.1
+++ SetProjectInfoCommand.h 11 Dec 2009 21:53:31 -0000 1.2
@@ -19,6 +19,9 @@
#include "Command.h"
#include "CommandType.h"
+// Forward decls
+class Track;
+class TrackList;
class SetProjectInfoCommandType : public CommandType
{
Index: GetProjectInfoCommand.cpp
===================================================================
RCS file:
/cvsroot/audacity/audacity-src/src/commands/GetProjectInfoCommand.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- GetProjectInfoCommand.cpp 11 Dec 2009 21:15:59 -0000 1.2
+++ GetProjectInfoCommand.cpp 11 Dec 2009 21:53:30 -0000 1.3
@@ -141,9 +141,9 @@
while (trk)
{
if( (this->*functPtrToGetter)(trk)) // Function Pointer to the
desired parameter to Test
- boolValueStr.Append(_("1"),1);
+ boolValueStr.Append(wxT("1"),1);
else
- boolValueStr.Append(_("0"),1);
+ boolValueStr.Append(wxT("0"),1);
trk = iter.Next();
}
Status(boolValueStr);
Index: Validators.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/commands/Validators.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Validators.h 11 Dec 2009 18:58:05 -0000 1.3
+++ Validators.h 11 Dec 2009 21:53:31 -0000 1.4
@@ -149,7 +149,7 @@
if (!v.Convert(&val))
return false;
SetConverted(val);
- for(int i=0; i != val.Len(); i++)
+ for(unsigned int i=0; i != val.Len(); i++)
if( val[i] != '0' && val[i] != '1' && val[i] != 'x' && val[i] != 'X')
return false;
return true;
------------------------------------------------------------------------------
Return on Information:
Google Enterprise Search pays you back
Get the facts.
http://p.sf.net/sfu/google-dev2dev
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
