From 520a243c297175386ab31c78c84693a664934a69 Mon Sep 17 00:00:00 2001
From: Thomas Grill <xovo@users.sourceforge.net>
Date: Mon, 26 Sep 2005 14:00:27 +0000
Subject: small fixes update for new flext callback naming - made xcode project
 - fixed loop record bug - some small cleanups

svn path=/trunk/; revision=3638
---
 externals/grill/xsample/source/groove.cpp         | 6 +++---
 externals/grill/xsample/source/main.h             | 5 ++++-
 externals/grill/xsample/source/record.cpp         | 4 ++++
 externals/grill/xsample/source/xsample-Info.plist | 2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'externals/grill/xsample/source')

diff --git a/externals/grill/xsample/source/groove.cpp b/externals/grill/xsample/source/groove.cpp
index c4051714..a5e3aaf0 100644
--- a/externals/grill/xsample/source/groove.cpp
+++ b/externals/grill/xsample/source/groove.cpp
@@ -657,7 +657,7 @@ bool xgroove::do_xzone()
 		if(xzone > maxfd) xzone = maxfd;
 
 		// \todo what about round-off?
-        const long hzone = CASTINT<long>(xzone/2.f);
+        const long hzone = CASTINT<long>(xzone/2.f+0.5f);
 		znsmin = curmin-hzone;
 		znsmax = curmax+hzone;
 
@@ -684,7 +684,7 @@ bool xgroove::do_xzone()
 		if(xzone > maxfd) xzone = maxfd;
 
 		// \todo what about round-off?
-        const long hzone = CASTINT<long>(xzone/2.f);
+        const long hzone = CASTINT<long>(xzone/2.f+0.5f);
 		znsmin = curmin-hzone;
 		znsmax = curmax+hzone;
 
@@ -707,7 +707,7 @@ bool xgroove::do_xzone()
 		if(xzone > plen) xzone = plen;
 
 		// \todo what about round-off?
-        const long hzone = CASTINT<long>(xzone/2.f);
+        const long hzone = CASTINT<long>(xzone/2.f+0.5f);
 		znsmin = curmin-hzone;
 		znsmax = curmax+hzone;
 
diff --git a/externals/grill/xsample/source/main.h b/externals/grill/xsample/source/main.h
index ad41ffbf..e7ac6280 100644
--- a/externals/grill/xsample/source/main.h
+++ b/externals/grill/xsample/source/main.h
@@ -15,8 +15,9 @@ WARRANTIES, see the file, "license.txt," in this distribution.
 #error You need at least flext version 0.5.0
 #endif
 
-#define XSAMPLE_VERSION "0.3.1pre7"
+#define XSAMPLE_VERSION "0.3.1pre8"
 
+extern "C++" {
 
 // most compilers are somehow broken - in other words - can't handle all C++ features
 
@@ -439,4 +440,6 @@ private:
 #include "inter.h"
 #endif
 
+}
+
 #endif
diff --git a/externals/grill/xsample/source/record.cpp b/externals/grill/xsample/source/record.cpp
index 3d9f0605..92738a2e 100644
--- a/externals/grill/xsample/source/record.cpp
+++ b/externals/grill/xsample/source/record.cpp
@@ -13,6 +13,7 @@ WARRANTIES, see the file, "license.txt," in this distribution.
 #pragma warning (disable:4244)
 #endif
 
+extern "C++" {
 
 class xrecord:
 	public xsample
@@ -86,6 +87,8 @@ private:
 	FLEXT_CALLBACK_V(m_draw)
 };
 
+}
+
 
 FLEXT_LIB_DSP_V("xrecord~",xrecord)
 
@@ -491,3 +494,4 @@ void xrecord::m_print()
 	post("sigmode = %s, append = %s, loop = %s, mixmode = %i",sigmode?"yes":"no",appmode?"yes":"no",doloop?"yes":"no",mixmode); 
 	post("");
 }
+
diff --git a/externals/grill/xsample/source/xsample-Info.plist b/externals/grill/xsample/source/xsample-Info.plist
index e9dd72e1..3d1bc4c8 100644
--- a/externals/grill/xsample/source/xsample-Info.plist
+++ b/externals/grill/xsample/source/xsample-Info.plist
@@ -11,7 +11,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
-	<string>APPL</string>
+	<string>iLaX</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-- 
cgit v1.2.1