Merge branch 'XCUR' into v1

# Conflicts:
#	.gitignore

.gitignore

@@ -7,10 +7,16 @@
 /disabledplugins
 /build
 /dist
+/dep
 /patches
 .DS_Store
 /autosave.vcv
 /settings.json
 /screenshots
 .vs/
+<<<<<<< HEAD
 Fundamental.zip
+=======
+_ReSharper.Caches/
+*.zip
+>>>>>>> XCUR

Makefile

@@ -150,8 +150,8 @@ ifdef ARCH_WIN
 	cd dist && zip -q -9 -r $(DIST_NAME).zip Rack
 	# Make NSIS installer
 	# pacman -S mingw-w64-x86_64-nsis
-	makensis -DVERSION=$(VERSION) installer.nsi
-	mv installer.exe dist/$(DIST_NAME).exe
+	#makensis -DVERSION=$(VERSION) installer.nsi
+	#mv installer.exe dist/$(DIST_NAME).exe
 endif
 
 	# Rack SDK

build.txt

@@ -0,0 +1,36 @@
+Clone this repository with git clone https://github.com/VCVRack/Rack.git and cd Rack. Make sure there are no spaces in your absolute path, since this breaks the Makefile-based build system.
+
+Clone submodules.
+
+git submodule update --init --recursive
+Build dependencies locally. You may add -j4 (or your number of logical cores) to your make commands to parallelize builds. This may take 15-60 minutes.
+
+make dep
+Build Rack. This may take 1-5 minutes.
+
+make
+Run Rack.
+
+make run
+Building Rack plugins
+Complete the Setting up your development environment section.
+
+Plugins can be built in two ways:
+
+Build Rack from source and build plugins in the plugins/ folder. (Recommended for advanced developers.)
+Download an official Rack build and Rack-SDK-1.1.2.zip, and build plugins anywhere you like. (Easiest/fastest.)
+Download or clone the plugin source code, e.g.
+
+git clone https://github.com/VCVRack/Fundamental.git
+Clone the git repo’s submodules.
+
+cd Fundamental
+git submodule update --init --recursive
+If using the Rack SDK, set the RACK_DIR environment variable by prefixing each of the following commands with RACK_DIR=<Rack SDK dir>.
+
+Build plugin dependencies. (Most plugins don’t require this step.)
+
+make dep
+Build the plugin.
+
+make

dep/glfw

@@ -1 +1 @@
-Subproject commit 0fb001cf43da351bf6f7eea1cf8db5ae86cefc78
+Subproject commit d9ab59efc781c392128a449361a381fcc93cf6f3

dep/osdialog

@@ -1 +1 @@
-Subproject commit e5db5de6444f4b2c4e1390c67b3efd718080c3da
+Subproject commit 7be4896180c9f78363d71e1d4510748b0ab01670

include/midi.hpp

@@ -17,6 +17,13 @@ namespace midi {
 struct Message {
 	uint8_t size = 3;
 	uint8_t bytes[3] = {};
+	uint8_t *longMessage = NULL;
+
+	void setSysex(uint8_t *msg, uint8_t len)
+	{
+		size=len;
+		longMessage = msg;
+	}
 
 	void setSize(uint8_t size) {
 		assert(size <= 3);

src/app/PortWidget.cpp

@@ -4,6 +4,7 @@
 #include <app.hpp>
 #include <history.hpp>
 #include <componentlibrary.hpp>
+#include <settings.hpp> 
 
 
 namespace rack {
@@ -65,13 +66,20 @@ void PortWidget::onButton(const event::Button& e) {
 	if (e.action == GLFW_PRESS && e.button == GLFW_MOUSE_BUTTON_RIGHT) {
 		CableWidget* cw = APP->scene->rack->getTopCable(this);
 		if (cw) {
-			// history::CableRemove
-			history::CableRemove* h = new history::CableRemove;
-			h->setCable(cw);
-			APP->history->push(h);
-
-			APP->scene->rack->removeCable(cw);
-			delete cw;
+			if ((APP->window->getMods() & RACK_MOD_MASK) == RACK_MOD_CTRL) {
+				int id = APP->scene->rack->nextCableColorId++;
+				APP->scene->rack->nextCableColorId %= settings::cableColors.size();
+				cw->color = settings::cableColors[id];
+			} else 
+			{
+				// history::CableRemove
+				history::CableRemove *h = new history::CableRemove;
+				h->setCable(cw);
+				APP->history->push(h);
+
+				APP->scene->rack->removeCable(cw);
+				delete cw;
+			}
 		}
 
 		e.consume(this);

src/rtmidi.cpp

@@ -68,7 +68,10 @@ struct RtMidiOutputDevice : midi::OutputDevice {
 	}
 
 	void sendMessage(midi::Message message) override {
-		rtMidiOut->sendMessage(message.bytes, message.size);
+		if(message.size > 3)
+			rtMidiOut->sendMessage(message.longMessage, message.size);
+		else
+			rtMidiOut->sendMessage(message.bytes, message.size);
 	}
 };
 

src/settings.cpp

@@ -142,7 +142,7 @@ void fromJson(json_t* rootJ) {
 	if (realTimeJ)
 		realTime = json_boolean_value(realTimeJ);
 
-	json_t* sampleRateJ = json_object_get(rootJ, "sampleRate");
+	json_t *sampleRateJ = json_object_get(rootJ, "sampleRate");
 	if (sampleRateJ)
 		sampleRate = json_number_value(sampleRateJ);