funnel filter, update dist

Author: dctucker

Makefile

@@ -5,9 +5,13 @@ all:
 	@echo "Pick a target... install to copy from dist/ to system, dist to copy from system to dist/"
 
 dist:
-	cp /usr/local/bin/midi_connect.sh ./dist/usr/local/bin/
-	cp /etc/udev/rules.d/95-midi.rules ./dist/etc/udev/rules.d/
+	touch ./dist/var/log/midi-server.log
+	cp /usr/local/bin/midi_connect.sh          ./dist/usr/local/bin/
+	cp /usr/local/bin/midi_disconnect.sh       ./dist/usr/local/bin/
+	cp /etc/udev/rules.d/95-midi.rules         ./dist/etc/udev/rules.d/
+	cp /etc/systemd/system/midibus.service     ./dist/etc/systemd/system/
+	cp /etc/systemd/system/midi-server.service ./dist/etc/systemd/system/
 
 install:
-	cp -R dist/{usr,etc} /
+	cp -R dist/{etc,usr,var} /
 

dist/etc/systemd/system/midi-server.service

@@ -6,7 +6,7 @@ After=sound.target
 
 [Service]
 Restart=no
-ExecStart=/home/pi/Development/midibus/server/midi-server
+ExecStart=/bin/sh -c '/home/pi/Development/midibus/server/midi-server >> /var/log/midi-server.log'
 ExecStop=/bin/sh -c '/bin/kill -s SIGINT $MAINPID 2>/dev/null'
 #OOMScoreAdjust=-100
 TimeoutStopSec=10s

dist/usr/local/bin/midi_connect.sh

@@ -4,47 +4,5 @@ card_number=$(cat /sys/$1/device/number)
 name=$(head -n1 /proc/asound/card${card_number}/midi0)
 aconnect=/usr/bin/aconnect 
 
-keys="JUNO-DS"
-clock="Deluge"
-bcr="BCR2000"
-
-msed="s/.*: '\(.*\)' .*/\1/g"
-others=$($aconnect -o | /bin/grep '^client' | /bin/grep 'card=' | /bin/sed "$msed" | grep -v "$name")
-SAVEIFS=$IFS
-IFS=$'\n'
-others=($others)
-IFS=$SAVEIFS
-
-if [ "$name" == "$keys" ]; then
-	for (( i=0; i<${#others[@]}; i++ )); do
-		other="${others[$i]}"
-		$aconnect "$keys:0" "$other:0"
-	done
-else
-	$aconnect "$keys:0" "$name:0"
-fi
-
-if [ "$name" == "$clock" ]; then
-	for (( i=0; i<${#others[@]}; i++ )); do
-		other="${others[$i]}"
-		$aconnect "$clock:0" "$other:0"
-		$aconnect "$other:0" "$clock:0"
-	done
-else
-	$aconnect "$clock:0" "$name:0"
-	$aconnect "$name:0" "$clock:0"
-fi
-
-if [ "$name" == "$bcr" ]; then
-	for (( i=0; i<${#others[@]}; i++ )); do
-		other="${others[$i]}"
-		$aconnect "$bcr:0" "$other:0"
-		$aconnect "$other:0" "$bcr:0"
-	done
-else
-	$aconnect "$bcr:0" "$name:0"
-	$aconnect "$name:0" "$bcr:0"
-fi
-
-pid=$(pgrep -f "python.*matrix.py")
+pid=$(pgrep -x "midi-server")
 [ -n "$pid" ] && kill -s SIGHUP $pid

dist/usr/local/bin/midi_disconnect.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-pid=$(pgrep -f "python.*matrix.py")
+pid=$(pgrep -x "midi-server")
 [ -n "$pid" ] && kill -s SIGHUP $pid

dist/var/log/midi-server.log

@@ -37,9 +37,12 @@ def listen(s):
 			print('Socket error')
 			return
 		s.callback_name = response[0][0]
-		print "calling " +  s.callback_name
-		s.callbacks[ s.callback_name ](response[1:])
-		return True
+		if s.callback_name in s.callbacks:
+			print "calling " +  s.callback_name
+			s.callbacks[ s.callback_name ](response[1:])
+			return True
+		else:
+			print "cannot call '" + s.callback_name + "'"
 	def ask(s, what):
 		s.server_socket.send(what + "\n")
 	def get_config(s):

pygame/client.py

@@ -1,7 +1,7 @@
 hw:JUNODS	hw:Circuit	channel	1,2,10
 hw:JUNODS	hw:II	channel	3
 hw:JUNODS	hw:Deluge	channel	8
-hw:Circuit	hw:Deluge	channel	1,2,10
+hw:Circuit	hw:Deluge	funnel	9
 hw:II	hw:Deluge	channel	3
 hw:Deluge	hw:Circuit	channel	rt,1,2,10
 hw:Deluge	hw:II	channel	rt,3
@@ -16,6 +16,6 @@ hw:mio	hw:BCR2000	thru	thru
 hw:Circuit	hw:mio	channel	1,2,10,sysex
 hw:JUNODS	hw:mio	channel	all,sysex
 hw:II	hw:mio	channel	3,sysex
-hw:Deluge	hw:mio	channel	rt,8
+hw:Deluge	hw:mio	channel	rt,1,2,4,8
 hw:sampler	hw:mio	channel	15,16
 hw:BCR2000	hw:mio	thru	thru

server/midi-server.conf

@@ -19,6 +19,44 @@ ssize_t write_buffer(snd_rawmidi_t *port, unsigned char *buf, size_t n_bytes)
 	return n_bytes;
 }
 
+int write_funnel_filter(struct write_data *data, unsigned char *buf, int n_bytes, void *args)
+{
+	snd_rawmidi_t *port = data->output_device->midi;
+	unsigned char out_buf[BUFSIZE];
+	unsigned char target = (unsigned char) (int) args;
+	unsigned int mask = MASK_ALL; // any channel message is fine
+	unsigned int current_mask = 0;
+	if( data->output_device->midi_in_exclusive == data->midi_in )
+		current_mask = MASK_SYSEX;
+
+	int a = 0;
+	for( int b = 0; b < n_bytes; ++b )
+	{
+		if( buf[b] >= 0xf8 )
+			current_mask = MASK_RT;
+		else if( buf[b] >= 0xf0 )
+		{
+			if( buf[b] == 0xf0 )
+				data->output_device->midi_in_exclusive = data->midi_in;
+			else if( buf[b] == 0xf7 )
+				data->output_device->midi_in_exclusive = NULL;
+			current_mask = MASK_SYSEX;
+		}
+		else if( buf[b] >= 0x80 )
+		{
+			current_mask = 2 << (buf[b] & 0x0f);
+			out_buf[a++] = buf[b] & 0xf0 | target;
+			continue;
+		}
+
+		if( mask & current_mask )
+		{
+			out_buf[a++] = buf[b];
+		}
+	}
+	return write_buffer( port, out_buf, a );
+}
+
 int write_channel_filter(struct write_data *data, unsigned char *buf, int n_bytes, void *args)
 {
 	snd_rawmidi_t *port = data->output_device->midi;
@@ -90,6 +128,12 @@ void setup_write_func( struct write_data *data )
 		data->args = (void *) data->args_name;
 		printf("W %s realtime %s\n", data->port_name, data->args_name);
 	}
+	else if( strcmp(data->func_name, "funnel") == 0 )
+	{
+		data->func = write_funnel_filter;
+		data->args = (void *) ( atoi( data->args_name ) - 1 & 0x0f );
+		printf("W %s funnel %s\n", data->port_name, data->args_name);
+	}
 	else if( strcmp(data->func_name, "channel") == 0 )
 	{
 		data->func = write_channel_filter;