small fixes

update for new flext callback naming
- made xcode project
- fixed loop record bug
- some small cleanups

svn path=/trunk/; revision=3638

6 files changed, 27 insertions, 18 deletions

diff --git a/externals/grill/xsample/maxmsp/xsample.help b/externals/grill/xsample/maxmsp/xsample.help
index 82d19cd0..629d9501 100755
--- a/externals/grill/xsample/maxmsp/xsample.help
+++ b/externals/grill/xsample/maxmsp/xsample.help
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>
diff --git a/externals/grill/xsample/xsample.xcode/project.pbxproj b/externals/grill/xsample/xsample.xcode/project.pbxproj
index 5027e5a0..bffba804 100644
--- a/externals/grill/xsample/xsample.xcode/project.pbxproj
+++ b/externals/grill/xsample/xsample.xcode/project.pbxproj
@@ -180,12 +180,13 @@
 				DYLIB_CURRENT_VERSION = 1;
 				EXECUTABLE_EXTENSION = pd_darwin;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+				GCC_INPUT_FILETYPE = sourcecode.cpp.cpp;
 				GCC_PREPROCESSOR_DEFINITIONS = "FLEXT_SYS=2";
-				HEADER_SEARCH_PATHS = "$(PD)/src $(Flext)/source";
+				HEADER_SEARCH_PATHS = "$(PDApp)/src $(flext)/source";
 				INSTALL_PATH = "$(PD)/extra";
-				LIBRARY_SEARCH_PATHS = "$(Flext)/build";
+				LIBRARY_SEARCH_PATHS = "$(flext)/build";
 				LIBRARY_STYLE = BUNDLE;
-				OTHER_LDFLAGS = "-bundle_loader $(PD)/bin/pd";
+				OTHER_LDFLAGS = "-bundle_loader $(PDApp)/bin/pd";
 				PRODUCT_NAME = xsample;
 			};
 			dependencies = (
@@ -222,12 +223,6 @@
 			refType = 0;
 			sourceTree = "<absolute>";
 		};
-		E94AC9620789EE8700AE1770 = {
-			fileRef = E94AC9610789EE8700AE1770;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		E94AC9630789EEA300AE1770 = {
 			isa = PBXFileReference;
 			lastKnownFileType = archive.ar;
@@ -425,9 +420,9 @@
 		E9974E51077083C700206F68 = {
 			buildActionMask = 2147483647;
 			files = (
+				E9B5873A08E6F228002DA49F,
 				E9974E5C0770851700206F68,
 				E9974E5B0770851500206F68,
-				E94AC9620789EE8700AE1770,
 				E98C3078078D948800EC0264,
 			);
 			isa = PBXFrameworksBuildPhase;
@@ -444,10 +439,11 @@
 			);
 			buildSettings = {
 				GCC_PREPROCESSOR_DEFINITIONS = "FLEXT_SYS=1";
-				HEADER_SEARCH_PATHS = "$(Max SDK)/max-includes $(Max SDK)/msp-includes $(Flext)/source";
+				GENERATE_PKGINFO_FILE = YES;
+				HEADER_SEARCH_PATHS = "$(MaxSDK)/max-includes $(MaxSDK)/msp-includes $(flext)/source";
 				INFOPLIST_FILE = "source/xsample-Info.plist";
-				INSTALL_PATH = "/Library/Application Support/Cycling 74/externals";
-				LIBRARY_SEARCH_PATHS = "$(Flext)/build";
+				INSTALL_PATH = "/Library/Application Support/Cycling 74/externals/flext";
+				LIBRARY_SEARCH_PATHS = "$(flext)/build";
 				LIBRARY_STYLE = DYNAMIC;
 				OTHER_CFLAGS = "";
 				OTHER_REZFLAGS = "";
@@ -618,6 +614,12 @@
 			settings = {
 			};
 		};
+		E9B5873A08E6F228002DA49F = {
+			fileRef = E94AC9610789EE8700AE1770;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 	};
 	rootObject = 0867D690FE84028FC02AAC07;
 }