From 2be559064a13f5e8428118eea284a3e473c96b8a Mon Sep 17 00:00:00 2001
From: micuat <micuat@gmail.com>
Date: Sun, 18 Jun 2017 22:37:43 +0000
Subject: [PATCH] python-osc for python3

---
 plugins/streamer_osc.py | 24 +++++++++++-------------
 requirements.txt        |  2 +-
 2 files changed, 12 insertions(+), 14 deletions(-)
 mode change 100644 => 100755 plugins/streamer_osc.py
 mode change 100644 => 100755 requirements.txt

diff --git a/plugins/streamer_osc.py b/plugins/streamer_osc.py
old mode 100644
new mode 100755
index c14ea0b..05caea4
--- a/plugins/streamer_osc.py
+++ b/plugins/streamer_osc.py
@@ -1,6 +1,7 @@
 
-# requires pyosc
-from OSC import OSCClient, OSCMessage
+# requires python-osc
+from pythonosc import osc_message_builder
+from pythonosc import udp_client
 import plugin_interface as plugintypes
 
 # Use OSC protocol to broadcast data (UDP layer), using "/openbci" stream. (NB. does not check numbers of channel as TCP server)
@@ -31,26 +32,23 @@ class StreamerOSC(plugintypes.IPluginExtended):
 		if len(self.args) > 2:
 			self.address = self.args[2]
 		# init network
-		print "Selecting OSC streaming. IP: ", self.ip, ", port: ", self.port, ", address: ", self.address
-		self.client = OSCClient()
-		self.client.connect( (self.ip, self.port) )
+		print("Selecting OSC streaming. IP: " + self.ip + ", port: " + str(self.port) + ", address: " + self.address)
+		self.client = udp_client.SimpleUDPClient(self.ip, self.port)
 
 	# From IPlugin: close connections, send message to client
 	def deactivate(self):
-		self.client.send(OSCMessage("/quit") )
+		self.client.send_message("/quit")
 	    
 	# send channels values
 	def __call__(self, sample):
-		mes = OSCMessage(self.address)
-		mes.append(sample.channel_data)
 		# silently pass if connection drops
 		try:
-			self.client.send(mes)
+			self.client.send_message(self.address, sample.channel_data)
 		except:
 			return
 
 	def show_help(self):
-	  	print """Optional arguments: [ip [port [address]]]
-	  	\t ip: target IP address (default: 'localhost')
-	  	\t port: target port (default: 12345)
-	  	\t address: select target address (default: '/openbci')"""
+		print("""Optional arguments: [ip [port [address]]]
+			\t ip: target IP address (default: 'localhost')
+			\t port: target port (default: 12345)
+			\t address: select target address (default: '/openbci')""")
diff --git a/requirements.txt b/requirements.txt
old mode 100644
new mode 100755
index 1357428..b8dcee3
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 numpy==1.9.2
 pylsl==1.10.4
-pyOSC==0.3.5b-5294
+python-osc==1.6.3
 pyserial==2.7
 requests==2.7.0
 six==1.9.0