The current luabind/lua/boost mix causes exceptions to

crash Ctrlr instrad of handling them, need to fix that
xor-musix · Dec 13, 2016 · e7ccc06 · e7ccc06
1 parent 06c6f93
commit e7ccc06
Show file tree

Hide file tree

Showing 149 changed files with 14,393 additions and 759 deletions.
diff --git a/Builds/Generated/Windows/Standalone_2015/Ctrlr_Standalone.vcxproj b/Builds/Generated/Windows/Standalone_2015/Ctrlr_Standalone.vcxproj
diff --git a/Builds/Generated/Windows/Standalone_2015/Ctrlr_Standalone.vcxproj.filters b/Builds/Generated/Windows/Standalone_2015/Ctrlr_Standalone.vcxproj.filters
diff --git a/Panels b/Panels
diff --git a/Scripts/post-commit b/Scripts/post-commit
@@ -49,7 +49,7 @@ function detect_os {
 		PACKAGE=$CTRLR_ROOT/Packaging/Windows/Ctrlr-$VERSION.exe
 		BUILD_LOG_WIN32=$CTRLR_ROOT/Builds/Ctrlr-$VERSION.win32.build.log
 		BUILD_LOG_WIN64=$CTRLR_ROOT/Builds/Ctrlr-$VERSION.win64.build.log
-		CTRLR_KEY=""
+		CTRLR_KEY="$CTRLR_ROOT/Packaging/ctrlr.key"
 		return
 	fi
 

diff --git a/Source/Core/CtrlrLuaHeaders.h b/Source/Core/CtrlrLuaHeaders.h
diff --git a/Source/Core/CtrlrRevision.h b/Source/Core/CtrlrRevision.h
@@ -1,7 +1,7 @@
 #ifndef __CTRLR_REVISION__
 #define __CTRLR_REVISION__
 
-static const char *ctrlrRevision              	= "0.0.0";
-static const char *ctrlrRevisionDate        	= "Satans Birthday 666";
+static const char *ctrlrRevision              	= "5.4.24";
+static const char *ctrlrRevisionDate        	= "Mon Dec 12 19:19:32 CEST 2016";
 
 #endif
diff --git a/Source/Core/stdafx.h b/Source/Core/stdafx.h
@@ -18,13 +18,6 @@
 #include <algorithm>
 #include <cmath>
 
-extern "C"
-{
-#include <lua.h>
-#include <lualib.h>
-#include <lauxlib.h>
-}
-
 #include <luabind/config.hpp>
 #include <luabind/class.hpp>
 #include <luabind/function.hpp>
@@ -59,7 +52,6 @@ extern "C"
 #include <luabind/discard_result_policy.hpp>
 #include <luabind/version.hpp>
 #include <luabind/shared_ptr_converter.hpp>
-#include <lua.hpp>
 
 #include "JuceHeader.h"
 #include "CtrlrMacros.h"

diff --git a/Source/Lua/CtrlrLuaManager.cpp b/Source/Lua/CtrlrLuaManager.cpp
@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "CtrlrLuaManager.h"
-
 #include "CtrlrPanel/CtrlrPanel.h"
 #include "CtrlrPanel/CtrlrPanelEditor.h"
 #include "CtrlrLuaMultiTimer.h"

diff --git a/Source/Misc/compat.c b/Source/Misc/compat.c
diff --git a/Source/Misc/include/compat.h b/Source/Misc/include/compat.h
@@ -1,21 +1,8 @@
-#include "lua.h"
-#include "lauxlib.h"
-
-/****************************************************************************/
-
-#if LUA_VERSION_NUM>=502
-
-int typeerror(lua_State* L, int narg, const char* tname);
-#define setfuncs luaL_setfuncs
-#define setuservalue lua_setuservalue
-#define getuservalue lua_getuservalue
-
-#elif LUA_VERSION_NUM==501
-
-#define typeerror luaL_typerror
-void setfuncs(lua_State* L, const luaL_Reg* l, int nup);
-#define setuservalue lua_setfenv
-#define getuservalue lua_getfenv
-
-#endif
-
+#include "lua.h"
+#include "lauxlib.h"
+
+
+int typeerror(lua_State* L, int narg, const char* tname);
+#define setfuncs luaL_setfuncs
+#define setuservalue lua_setuservalue
+#define getuservalue lua_getuservalue
diff --git a/Source/Misc/include/lo/Makefile → Source/Misc/liblo/include/lo/Makefile b/Source/Misc/include/lo/Makefile → Source/Misc/liblo/include/lo/Makefile
diff --git a/Source/Misc/include/lo/Makefile.am → Source/Misc/liblo/include/lo/Makefile.am b/Source/Misc/include/lo/Makefile.am → Source/Misc/liblo/include/lo/Makefile.am
diff --git a/Source/Misc/include/lo/Makefile.in → Source/Misc/liblo/include/lo/Makefile.in b/Source/Misc/include/lo/Makefile.in → Source/Misc/liblo/include/lo/Makefile.in
diff --git a/Source/Misc/include/lo/lo.h → Source/Misc/liblo/include/lo/lo.h b/Source/Misc/include/lo/lo.h → Source/Misc/liblo/include/lo/lo.h
diff --git a/Source/Misc/include/lo/lo_config_linux.h → ...e/Misc/liblo/include/lo/lo_config_linux.h b/Source/Misc/include/lo/lo_config_linux.h → ...e/Misc/liblo/include/lo/lo_config_linux.h
diff --git a/Source/Misc/include/lo/lo_config_osx.h → Source/Misc/liblo/include/lo/lo_config_osx.h b/Source/Misc/include/lo/lo_config_osx.h → Source/Misc/liblo/include/lo/lo_config_osx.h
diff --git a/Source/Misc/include/lo/lo_config_win32.h → ...e/Misc/liblo/include/lo/lo_config_win32.h b/Source/Misc/include/lo/lo_config_win32.h → ...e/Misc/liblo/include/lo/lo_config_win32.h
diff --git a/Source/Misc/include/lo/lo_cpp.h → Source/Misc/liblo/include/lo/lo_cpp.h b/Source/Misc/include/lo/lo_cpp.h → Source/Misc/liblo/include/lo/lo_cpp.h
diff --git a/Source/Misc/include/lo/lo_endian.h → Source/Misc/liblo/include/lo/lo_endian.h b/Source/Misc/include/lo/lo_endian.h → Source/Misc/liblo/include/lo/lo_endian.h
diff --git a/Source/Misc/include/lo/lo_endian.h.in → Source/Misc/liblo/include/lo/lo_endian.h.in b/Source/Misc/include/lo/lo_endian.h.in → Source/Misc/liblo/include/lo/lo_endian.h.in
diff --git a/Source/Misc/include/lo/lo_errors.h → Source/Misc/liblo/include/lo/lo_errors.h b/Source/Misc/include/lo/lo_errors.h → Source/Misc/liblo/include/lo/lo_errors.h
diff --git a/Source/Misc/include/lo/lo_internal.h → Source/Misc/liblo/include/lo/lo_internal.h b/Source/Misc/include/lo/lo_internal.h → Source/Misc/liblo/include/lo/lo_internal.h
diff --git a/Source/Misc/include/lo/lo_lowlevel.h → Source/Misc/liblo/include/lo/lo_lowlevel.h b/Source/Misc/include/lo/lo_lowlevel.h → Source/Misc/liblo/include/lo/lo_lowlevel.h
diff --git a/Source/Misc/include/lo/lo_macros.h → Source/Misc/liblo/include/lo/lo_macros.h b/Source/Misc/include/lo/lo_macros.h → Source/Misc/liblo/include/lo/lo_macros.h
diff --git a/Source/Misc/include/lo/lo_osc_types.h → Source/Misc/liblo/include/lo/lo_osc_types.h b/Source/Misc/include/lo/lo_osc_types.h → Source/Misc/liblo/include/lo/lo_osc_types.h
diff --git a/Source/Misc/include/lo/lo_serverthread.h → ...e/Misc/liblo/include/lo/lo_serverthread.h b/Source/Misc/include/lo/lo_serverthread.h → ...e/Misc/liblo/include/lo/lo_serverthread.h
diff --git a/Source/Misc/include/lo/lo_throw.h → Source/Misc/liblo/include/lo/lo_throw.h b/Source/Misc/include/lo/lo_throw.h → Source/Misc/liblo/include/lo/lo_throw.h
diff --git a/Source/Misc/include/lo/lo_types.h → Source/Misc/liblo/include/lo/lo_types.h b/Source/Misc/include/lo/lo_types.h → Source/Misc/liblo/include/lo/lo_types.h
diff --git a/Source/Misc/include/lo/lo_types_internal.h → ...Misc/liblo/include/lo/lo_types_internal.h b/Source/Misc/include/lo/lo_types_internal.h → ...Misc/liblo/include/lo/lo_types_internal.h
diff --git a/Source/Misc/address.c → Source/Misc/liblo/src/address.c b/Source/Misc/address.c → Source/Misc/liblo/src/address.c
@@ -15,15 +15,15 @@
  */
 
 #ifdef LINUX
-#include "lo_config_linux.h"
+#include "lo/lo_config_linux.h"
 #endif
 
 #ifdef _WIN32
-#include "lo_config_win32.h"
+#include "lo/lo_config_win32.h"
 #endif
 
 #ifdef __APPLE__
-#include "lo_config_osx.h"
+#include "lo/lo_config_osx.h"
 #endif
 
 #include <assert.h>
@@ -49,8 +49,8 @@
 #endif
 #endif
 
-#include "lo_types_internal.h"
-#include "lo_internal.h"
+#include "lo/lo_types_internal.h"
+#include "lo/lo_internal.h"
 #include "lo/lo.h"
 #include "lo/lo_throw.h"
 

diff --git a/Source/Misc/blob.c → Source/Misc/liblo/src/blob.c b/Source/Misc/blob.c → Source/Misc/liblo/src/blob.c
@@ -17,7 +17,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "lo_types_internal.h"
+#include "lo/lo_types_internal.h"
 #include "lo/lo.h"
 
 lo_blob lo_blob_new(int32_t size, const void *data)

diff --git a/Source/Misc/bundle.c → Source/Misc/liblo/src/bundle.c b/Source/Misc/bundle.c → Source/Misc/liblo/src/bundle.c
@@ -18,7 +18,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "lo_types_internal.h"
+#include "lo/lo_types_internal.h"
 #include "lo/lo.h"
 
 lo_bundle lo_bundle_new(lo_timetag tt)

diff --git a/Source/Misc/message.c → Source/Misc/liblo/src/message.c b/Source/Misc/message.c → Source/Misc/liblo/src/message.c
@@ -27,8 +27,8 @@
 #include <netinet/in.h>
 #endif
 
-#include "lo_types_internal.h"
-#include "lo_internal.h"
+#include "lo/lo_types_internal.h"
+#include "lo/lo_internal.h"
 #include "lo/lo.h"
 
 #define LO_DEF_TYPE_SIZE 8

diff --git a/Source/Misc/method.c → Source/Misc/liblo/src/method.c b/Source/Misc/method.c → Source/Misc/liblo/src/method.c
@@ -16,7 +16,7 @@
 
 #include <stdio.h>
 
-#include "lo_types_internal.h"
+#include "lo/lo_types_internal.h"
 #include "lo/lo.h"
 
 void lo_method_pp(lo_method m)

diff --git a/Source/Misc/pattern_match.c → Source/Misc/liblo/src/pattern_match.c b/Source/Misc/pattern_match.c → Source/Misc/liblo/src/pattern_match.c
diff --git a/Source/Misc/send.c → Source/Misc/liblo/src/send.c b/Source/Misc/send.c → Source/Misc/liblo/src/send.c
@@ -15,11 +15,11 @@
  */
 
 #ifdef LINUX
-#include "lo_config_linux.h"
+#include "lo/lo_config_linux.h"
 #endif
 
 #ifdef _WIN32
-#include "lo_config_win32.h"
+#include "lo/lo_config_win32.h"
 #endif
 
 #include <stdarg.h>
@@ -44,8 +44,8 @@
 #include <netinet/tcp.h>
 #endif
 
-#include "lo_types_internal.h"
-#include "lo_internal.h"
+#include "lo/lo_types_internal.h"
+#include "lo/lo_internal.h"
 #include "lo/lo.h"
 
 #ifndef MSG_NOSIGNAL

diff --git a/Source/Misc/server.c → Source/Misc/liblo/src/server.c b/Source/Misc/server.c → Source/Misc/liblo/src/server.c
@@ -15,11 +15,11 @@
  */
 
 #ifdef LINUX
-#include "lo_config_linux.h"
+#include "lo/lo_config_linux.h"
 #endif
 
 #ifdef _WIN32
-#include "lo_config_win32.h"
+#include "lo/lo_config_win32.h"
 #endif
 
 #include <assert.h>
@@ -68,8 +68,8 @@
 #define SOCKET_ERROR -1
 #endif
 
-#include "lo_types_internal.h"
-#include "lo_internal.h"
+#include "lo/lo_types_internal.h"
+#include "lo/lo_internal.h"
 #include "lo/lo.h"
 #include "lo/lo_throw.h"
 

diff --git a/Source/Misc/timetag.c → Source/Misc/liblo/src/timetag.c b/Source/Misc/timetag.c → Source/Misc/liblo/src/timetag.c
diff --git a/Source/Misc/version.c → Source/Misc/liblo/src/version.c b/Source/Misc/version.c → Source/Misc/liblo/src/version.c
@@ -15,15 +15,15 @@
  */
 
 #ifdef LINUX
-#include "lo_config_linux.h"
+#include "lo/lo_config_linux.h"
 #endif
 
 #ifdef _WIN32
-#include "lo_config_win32.h"
+#include "lo/lo_config_win32.h"
 #endif
 
 #ifdef __APPLE__
-#include "lo_config_osx.h"
+#include "lo/lo_config_osx.h"
 #endif
 
 #include <stdio.h>

diff --git a/Source/Misc/include/darwin_usb.h → Source/Misc/libusb/include/darwin_usb.h b/Source/Misc/include/darwin_usb.h → Source/Misc/libusb/include/darwin_usb.h
diff --git a/Source/Misc/include/enums.h → Source/Misc/libusb/include/enums.h b/Source/Misc/include/enums.h → Source/Misc/libusb/include/enums.h
diff --git a/Source/Misc/include/hotplug.h → Source/Misc/libusb/include/hotplug.h b/Source/Misc/include/hotplug.h → Source/Misc/libusb/include/hotplug.h
diff --git a/Source/Misc/include/libusb.h → Source/Misc/libusb/include/libusb.h b/Source/Misc/include/libusb.h → Source/Misc/libusb/include/libusb.h
diff --git a/Source/Misc/include/libusb_linux.h → Source/Misc/libusb/include/libusb_linux.h b/Source/Misc/include/libusb_linux.h → Source/Misc/libusb/include/libusb_linux.h
diff --git a/Source/Misc/include/libusb_osx.h → Source/Misc/libusb/include/libusb_osx.h b/Source/Misc/include/libusb_osx.h → Source/Misc/libusb/include/libusb_osx.h
diff --git a/Source/Misc/include/libusb_windows.h → Source/Misc/libusb/include/libusb_windows.h b/Source/Misc/include/libusb_windows.h → Source/Misc/libusb/include/libusb_windows.h
diff --git a/Source/Misc/include/libusbi.h → Source/Misc/libusb/include/libusbi.h b/Source/Misc/include/libusbi.h → Source/Misc/libusb/include/libusbi.h
diff --git a/Source/Misc/include/linux_usbfs.h → Source/Misc/libusb/include/linux_usbfs.h b/Source/Misc/include/linux_usbfs.h → Source/Misc/libusb/include/linux_usbfs.h
diff --git a/Source/Misc/include/poll_posix.h → Source/Misc/libusb/include/poll_posix.h b/Source/Misc/include/poll_posix.h → Source/Misc/libusb/include/poll_posix.h
diff --git a/Source/Misc/include/poll_windows.h → Source/Misc/libusb/include/poll_windows.h b/Source/Misc/include/poll_windows.h → Source/Misc/libusb/include/poll_windows.h
diff --git a/Source/Misc/include/structs.h → Source/Misc/libusb/include/structs.h b/Source/Misc/include/structs.h → Source/Misc/libusb/include/structs.h
diff --git a/Source/Misc/include/threads_posix.h → Source/Misc/libusb/include/threads_posix.h b/Source/Misc/include/threads_posix.h → Source/Misc/libusb/include/threads_posix.h
diff --git a/Source/Misc/include/threads_windows.h → Source/Misc/libusb/include/threads_windows.h b/Source/Misc/include/threads_windows.h → Source/Misc/libusb/include/threads_windows.h
diff --git a/Source/Misc/include/version.h → Source/Misc/libusb/include/version.h b/Source/Misc/include/version.h → Source/Misc/libusb/include/version.h
diff --git a/Source/Misc/include/version_nano.h → Source/Misc/libusb/include/version_nano.h b/Source/Misc/include/version_nano.h → Source/Misc/libusb/include/version_nano.h
diff --git a/Source/Misc/include/windows_common.h → Source/Misc/libusb/include/windows_common.h b/Source/Misc/include/windows_common.h → Source/Misc/libusb/include/windows_common.h
diff --git a/Source/Misc/include/windows_usb.h → Source/Misc/libusb/include/windows_usb.h b/Source/Misc/include/windows_usb.h → Source/Misc/libusb/include/windows_usb.h
diff --git a/Source/Misc/libusb/src/compat.c b/Source/Misc/libusb/src/compat.c
@@ -0,0 +1,8 @@
+#include "lua.h"
+#include "compat.h"
+
+int typeerror(lua_State* L, int narg, const char* tname)
+{
+	const char* msg = lua_pushfstring(L, "%s expected, got %s", tname, luaL_typename(L, narg));
+	return luaL_argerror(L, narg, msg);
+}
diff --git a/Source/Misc/core.c → Source/Misc/libusb/src/core.c b/Source/Misc/core.c → Source/Misc/libusb/src/core.c
diff --git a/Source/Misc/darwin_usb.c → Source/Misc/libusb/src/darwin_usb.c b/Source/Misc/darwin_usb.c → Source/Misc/libusb/src/darwin_usb.c
diff --git a/Source/Misc/descriptor.c → Source/Misc/libusb/src/descriptor.c b/Source/Misc/descriptor.c → Source/Misc/libusb/src/descriptor.c
diff --git a/Source/Misc/enums.c → Source/Misc/libusb/src/enums.c b/Source/Misc/enums.c → Source/Misc/libusb/src/enums.c
diff --git a/Source/Misc/hotplug.c → Source/Misc/libusb/src/hotplug.c b/Source/Misc/hotplug.c → Source/Misc/libusb/src/hotplug.c
diff --git a/Source/Misc/io.c → Source/Misc/libusb/src/io.c b/Source/Misc/io.c → Source/Misc/libusb/src/io.c
diff --git a/Source/Misc/linux_udev.c → Source/Misc/libusb/src/linux_udev.c b/Source/Misc/linux_udev.c → Source/Misc/libusb/src/linux_udev.c
diff --git a/Source/Misc/linux_usbfs.c → Source/Misc/libusb/src/linux_usbfs.c b/Source/Misc/linux_usbfs.c → Source/Misc/libusb/src/linux_usbfs.c
diff --git a/Source/Misc/poll_posix.c → Source/Misc/libusb/src/poll_posix.c b/Source/Misc/poll_posix.c → Source/Misc/libusb/src/poll_posix.c
diff --git a/Source/Misc/poll_windows.c → Source/Misc/libusb/src/poll_windows.c b/Source/Misc/poll_windows.c → Source/Misc/libusb/src/poll_windows.c
diff --git a/Source/Misc/strerror.c → Source/Misc/libusb/src/strerror.c b/Source/Misc/strerror.c → Source/Misc/libusb/src/strerror.c
diff --git a/Source/Misc/structs.c → Source/Misc/libusb/src/structs.c b/Source/Misc/structs.c → Source/Misc/libusb/src/structs.c
diff --git a/Source/Misc/sync.c → Source/Misc/libusb/src/sync.c b/Source/Misc/sync.c → Source/Misc/libusb/src/sync.c
diff --git a/Source/Misc/threads_posix.c → Source/Misc/libusb/src/threads_posix.c b/Source/Misc/threads_posix.c → Source/Misc/libusb/src/threads_posix.c
diff --git a/Source/Misc/threads_windows.c → Source/Misc/libusb/src/threads_windows.c b/Source/Misc/threads_windows.c → Source/Misc/libusb/src/threads_windows.c
diff --git a/Source/Misc/usb.c → Source/Misc/libusb/src/usb.c b/Source/Misc/usb.c → Source/Misc/libusb/src/usb.c
diff --git a/Source/Misc/windows_usb.c → Source/Misc/libusb/src/windows_usb.c b/Source/Misc/windows_usb.c → Source/Misc/libusb/src/windows_usb.c