Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv25643/src
Modified Files:
AboutDialog.cpp Audacity.h AudacityApp.cpp Legacy.cpp
Prefs.cpp Project.cpp
Log Message:
Fixup the Audacity version string
Index: Audacity.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Audacity.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- Audacity.h 25 Oct 2006 18:01:36 -0000 1.35
+++ Audacity.h 10 Nov 2006 06:11:40 -0000 1.36
@@ -28,12 +28,10 @@
#define AUDACITY_QUOTE( x ) AUDACITY_MAKESTR( x )
// Version string for visual display
-#define AUDACITY_VERSION_STRING "1.3.2-beta"
-// Need to figure out how to concatenate for unicode builds
-//#define AUDACITY_VERSION_STRING AUDACITY_QUOTE( AUDACITY_VERSION ) "." \
-// AUDACITY_QUOTE( AUDACITY_RELEASE ) "." \
-// AUDACITY_QUOTE( AUDACITY_REVISION ) \
-// AUDACITY_SUFFIX
+#define AUDACITY_VERSION_STRING wxT( AUDACITY_QUOTE( AUDACITY_VERSION ) )
wxT(".") \
+ wxT( AUDACITY_QUOTE( AUDACITY_RELEASE ) )
wxT(".") \
+ wxT( AUDACITY_QUOTE( AUDACITY_REVISION ) ) \
+ AUDACITY_SUFFIX
// Version string for file info (under Windows)
#define AUDACITY_FILE_VERSION AUDACITY_QUOTE( AUDACITY_VERSION ) "," \
Index: AboutDialog.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/AboutDialog.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- AboutDialog.cpp 23 Oct 2006 07:35:36 -0000 1.45
+++ AboutDialog.cpp 10 Nov 2006 06:11:40 -0000 1.46
@@ -124,7 +124,7 @@
: wxDialog(parent, -1, _("About Audacity..."),
wxDefaultPosition, wxDefaultSize)
{
- wxString versionStr = wxT(AUDACITY_VERSION_STRING);
+ wxString versionStr = AUDACITY_VERSION_STRING;
wxString informationStr;
creditItems.DeleteContents(true); // switchon automatic deletion of list
items
Index: AudacityApp.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/AudacityApp.cpp,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -d -r1.158 -r1.159
--- AudacityApp.cpp 9 Oct 2006 05:47:07 -0000 1.158
+++ AudacityApp.cpp 10 Nov 2006 06:11:40 -0000 1.159
@@ -630,7 +630,7 @@
if (!handled && !wxString(wxT("-version")).CmpNoCase(argv[option])) {
wxPrintf(wxT("Audacity v%s (%s)\n"),
- wxT(AUDACITY_VERSION_STRING),
+ AUDACITY_VERSION_STRING,
(wxUSE_UNICODE ? wxT("Unicode") : wxT("ANSI")));
exit(0);
}
Index: Project.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Project.cpp,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -d -r1.288 -r1.289
--- Project.cpp 6 Nov 2006 10:20:49 -0000 1.288
+++ Project.cpp 10 Nov 2006 06:11:40 -0000 1.289
@@ -688,7 +688,7 @@
mImportingRaw = false;
wxString msg = wxString::Format(_("Welcome to Audacity version %s"),
- wxT(AUDACITY_VERSION_STRING));
+ AUDACITY_VERSION_STRING);
mStatusBar->SetStatusText(msg);
mLastStatusUpdateTime = ::wxGetUTCTime();
@@ -1880,7 +1880,7 @@
wxString msg;
msg.Printf(_("This file was saved using Audacity %s.\nYou are using
Audacity %s - you need to upgrade to\na newer version to open this file."),
audacityVersion.c_str(),
- wxT(AUDACITY_VERSION_STRING));
+ AUDACITY_VERSION_STRING);
wxMessageBox(msg,
_("Can't open project file"),
wxOK | wxICON_EXCLAMATION | wxCENTRE, this);
@@ -1999,7 +1999,7 @@
xmlFile.WriteAttr(wxT("projname"), projName);
xmlFile.WriteAttr(wxT("version"), wxT(AUDACITY_FILE_FORMAT_VERSION));
- xmlFile.WriteAttr(wxT("audacityversion"), wxT(AUDACITY_VERSION_STRING));
+ xmlFile.WriteAttr(wxT("audacityversion"), AUDACITY_VERSION_STRING);
xmlFile.WriteAttr(wxT("sel0"), mViewInfo.sel0, 10);
xmlFile.WriteAttr(wxT("sel1"), mViewInfo.sel1, 10);
xmlFile.WriteAttr(wxT("vpos"), mViewInfo.vpos);
Index: Legacy.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Legacy.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Legacy.cpp 23 Sep 2006 02:28:04 -0000 1.13
+++ Legacy.cpp 10 Nov 2006 06:11:40 -0000 1.14
@@ -333,7 +333,7 @@
xmlFile.StartTag(wxT("audacityproject"));
xmlFile.WriteAttr(wxT("projname"), f.GetNextLine());
xmlFile.WriteAttr(wxT("version"), wxT("1.1.0"));
- xmlFile.WriteAttr(wxT("audacityversion"), wxT(AUDACITY_VERSION_STRING));
+ xmlFile.WriteAttr(wxT("audacityversion"), AUDACITY_VERSION_STRING);
label = f.GetNextLine();
while (label != wxT("BeginTracks")) {
Index: Prefs.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Prefs.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Prefs.cpp 19 Jul 2006 07:27:20 -0000 1.23
+++ Prefs.cpp 10 Nov 2006 06:11:40 -0000 1.24
@@ -179,7 +179,7 @@
gPrefs->Write(wxT("/NewPrefsInitialized"), true);
}
- gPrefs->Write(wxT("/Version"), wxString(wxT(AUDACITY_VERSION_STRING)));
+ gPrefs->Write(wxT("/Version"), wxString(AUDACITY_VERSION_STRING));
// BG: Make sure the users prefs are up to date
// BG: Otherwise reset some of them to their defaults
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
