continued refactoring

1 files changed, 21 insertions, 19 deletions

diff --git a/buttons.py b/buttons.py
index 89ae479..5f1ffbe 100644
--- a/buttons.py
+++ b/buttons.py
@@ -22,7 +22,7 @@
 
 import re
 import pyautogui
-from osc import osc
+import osc
 
 
 keymap = {'CTRL': 'ctrl',
@@ -90,7 +90,7 @@ class StripSelButton(Button):
     def __init__(self, console, name, strip):
         super().__init__(console, name)
         self.strip = strip
-        self.strip.select = self
+        self.strip.select_button = self
 
     def press(self):
 
@@ -98,9 +98,9 @@ class StripSelButton(Button):
         print('handle_strip_sel', strip)
         if self.get('REC ENABLE', 0):
             if strip.recenable:
-                osc.send_message('/strip/recenable', (strip.num, 0))
+                osc.client.sent_message('/strip/recenable', (strip.num, 0))
             else:
-                osc.send_message('/strip/recenable', (strip.num, 1))
+                osc.client.sent_message('/strip/recenable', (strip.num, 1))
         super().press()
 
 
@@ -108,17 +108,17 @@ class StripMuteButton(Button):
     def __init__(self, console, name, strip):
         super().__init__(console, name)
         self.strip = strip
-        self.strip.mute = self
+        self.strip.mute_button = self
 
     def press(self):
 
         strip = self.strip
         if strip.mute:
             strip.mute = False
-            osc.send_message('/strip/mute', (strip.num, 0))
+            osc.client.sent_message('/strip/mute', (strip.num, 0))
         else:
             strip.mute = True
-            osc.send_message('/strip/mute', (strip.num, 1))
+            osc.client.sent_message('/strip/mute', (strip.num, 1))
         super().press()
 
 
@@ -126,17 +126,17 @@ class StripSoloButton(Button):
     def __init__(self, console, name, strip):
         super().__init__(console, name)
         self.strip = strip
-        self.strip.solo = self
+        self.strip.solo_button = self
 
     def press(self):
 
         strip = self.strip
         if strip.solo:
             strip.solo = False
-            osc.send_message('/strip/solo', (strip.num, 0))
+            osc.client.sent_message('/strip/solo', (strip.num, 0))
         else:
             strip.solo = True
-            osc.send_message('/strip/solo', (strip.num, 1))
+            osc.client.sent_message('/strip/solo', (strip.num, 1))
         super().press()
 
 
@@ -175,7 +175,7 @@ class ComputerButton(Button):
         super().__init__(console, name)
 
     def press(self):
-        osc.send_message('/set_surface', (8, 7, 19, 1, 8, 11))
+        osc.client.sent_message('/set_surface', (8, 7, 19, 1, 8, 11))
         super().press()
 
 
@@ -184,7 +184,7 @@ class ClrSoloButton(Button):
         super().__init__(console, name)
 
     def press(self):
-        osc.send_message('/cancel_all_solos', 1)
+        osc.client.sent_message('/cancel_all_solos', 1)
         super().press()
 
 
@@ -195,10 +195,10 @@ class LoopButton(Button):
     def press(self, *args):
         if self.console.state.get('loop', 0):
             print('******* loop off')
-            osc.send_message('/loop_toggle', 0)
+            osc.client.sent_message('/loop_toggle', 0)
         else:
             print('******* loop on')
-            osc.send_message('/loop_toggle', 1)
+            osc.client.sent_message('/loop_toggle', 1)
         super().press()
 
 
@@ -209,7 +209,7 @@ class TransportButton(Button):
     def press(self):
         addr = osc_addrs.get(self.name, None)
         if addr:
-            osc.send_message(addr, 1)
+            osc.client.sent_message(addr, 1)
         super().press()
 
 
@@ -224,10 +224,10 @@ class BankSwitchButton(Button):
         print(direction, more_banks_up, more_banks_down)
         if direction > 0 and more_banks_up:
             print('calling /bank_up 1')
-            osc.send_message('/bank_up', 1)
+            osc.client.sent_message('/bank_up', 1)
         elif direction < 0 and more_banks_down:
             print('calling /bank_down 1')
-            osc.send_message('/bank_down', 1)
+            osc.client.sent_message('/bank_down', 1)
         super().press()
 
 
@@ -240,7 +240,9 @@ class NudgeButton(Button):
         direction = self.direction
         print(direction)
         if direction > 0:
-            osc.send_message('/access_action', 'Common/nudge-next-forward')
+            osc.client.sent_message('/access_action',
+                                    'Common/nudge-next-forward')
         else:
-            osc.send_message('/access_action', 'Common/nudge-next-backward')
+            osc.client.sent_message('/access_action',
+                                    'Common/nudge-next-backward')
         super().press()