From 0a0ede0768d622cc998c394bef005cb3532f6818 Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Tue, 20 May 2008 10:13:42 +0000
Subject: [PATCH] Package number bumped to 1.90 everywhere.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2293 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 ChangeLog                     |  4 ++++
 common/JackConstants.h        |  2 +-
 common/Jackdmp.cpp            | 12 ++++--------
 linux/alsa/JackAlsaDriver.cpp |  6 ++----
 macosx/Jack-Info.plist        |  4 ++--
 windows/resource.rc           |  8 ++++----
 6 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2e7e3a61..07893d9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,10 @@ Fernando Lopez-Lezcano
   Jackdmp changes log
 ---------------------------
 
+2008-05-20 Stephane Letz  <letz@grame.fr>
+
+	* Package number bumped to 1.90 everywhere.
+
 2008-05-19 Stephane Letz  <letz@grame.fr>
 
 	* Use of placement new for dynamic port allocation is possibly not safe... so avoid that until a definitive answer is found.
diff --git a/common/JackConstants.h b/common/JackConstants.h
index bfe833bf..930088b0 100644
--- a/common/JackConstants.h
+++ b/common/JackConstants.h
@@ -25,7 +25,7 @@
 namespace Jack
 {
 
-#define VERSION "0.72"
+#define VERSION "1.90"
 
 #define BUFFER_SIZE_MAX 8192
 
diff --git a/common/Jackdmp.cpp b/common/Jackdmp.cpp
index 575a149f..ece91fa3 100644
--- a/common/Jackdmp.cpp
+++ b/common/Jackdmp.cpp
@@ -246,16 +246,12 @@ int main(int argc, char* argv[])
         }
     }
 
-    /*
-    if (show_version) {
-    	printf ( "jackd version " VERSION 
-    			" tmpdir " DEFAULT_TMP_DIR 
-    			" protocol " PROTOCOL_VERSION
-    			"\n");
+   if (show_version) {
+    	printf("jackdmp version " VERSION 
+               "\n");
     	return -1;
     }
-    */
-
+ 
     if (!seen_driver) {
         usage(stderr);
         exit(1);
diff --git a/linux/alsa/JackAlsaDriver.cpp b/linux/alsa/JackAlsaDriver.cpp
index 7f66e5d6..5adfe0a2 100644
--- a/linux/alsa/JackAlsaDriver.cpp
+++ b/linux/alsa/JackAlsaDriver.cpp
@@ -1184,7 +1184,7 @@ JackAlsaDriver::alsa_driver_xrun_recovery (alsa_driver_t *driver, float *delayed
     snd_pcm_status_t *status;
     int res;
 
-    jack_error("alsa_driver_xrun_recovery ");
+    jack_error("alsa_driver_xrun_recovery");
 
     snd_pcm_status_alloca(&status);
 
@@ -2287,10 +2287,8 @@ int JackAlsaDriver::Read()
          * clients about the delay. 
          */
         //engine->delay (engine, delayed_usecs);
-        jack_log("ALSA XRun ");
-        //NotifyXRun(jack_get_microseconds());
+        jack_log("ALSA XRun");
         NotifyXRun(fLastWaitUst);
-        //return 0;
         return -1;
     }
 
diff --git a/macosx/Jack-Info.plist b/macosx/Jack-Info.plist
index 3485e165..6be392ba 100644
--- a/macosx/Jack-Info.plist
+++ b/macosx/Jack-Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>Jackservermp</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Jackdmp 0.72, @03-08 Paul Davis, Grame</string>
+	<string>Jackdmp 1.90, @03-08 Paul Davis, Grame</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.grame.Jackmp</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.72</string>
+	<string>1.90</string>
 </dict>
 </plist>
diff --git a/windows/resource.rc b/windows/resource.rc
index 0ba26fe2..edd13fd9 100644
--- a/windows/resource.rc
+++ b/windows/resource.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,7,2,0
- PRODUCTVERSION 0,7,2,0
+ FILEVERSION 1,9,0,0
+ PRODUCTVERSION 1,9,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Grame\0"
             VALUE "FileDescription", "Jackmp library for Windows\0"
-            VALUE "FileVersion", "0, 7, 2, 0\0"
+            VALUE "FileVersion", "1, 9, 0, 0\0"
             VALUE "InternalName", "libjackmp\0"
             VALUE "LegalCopyright", "Copyright Grame © 2006-2008\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "libjackmp.dll\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "libjackmp\0"
-            VALUE "ProductVersion", "0, 7, 2, 0\0"
+            VALUE "ProductVersion", "1, 9, 0, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END