Fix handling of master fader

2 files changed, 10 insertions, 4 deletions

diff --git a/tascam_fw_console/console.py b/tascam_fw_console/console.py
index 103f755..80cb9e5 100644
--- a/tascam_fw_console/console.py
+++ b/tascam_fw_console/console.py
@@ -207,7 +207,7 @@ class Console():
 
     def master_fader_handler(self, addr, pos):
         print('master_fader_handler', pos)
-        self.strips[0].fader.position(1023 * pos)
+        self.strip_fader_handler(addr, 0, pos)
 
     def default_handler(self, addr, *args):
         print(addr, args)
diff --git a/tascam_fw_console/faders.py b/tascam_fw_console/faders.py
index c9145a2..3ee4de7 100644
--- a/tascam_fw_console/faders.py
+++ b/tascam_fw_console/faders.py
@@ -41,14 +41,17 @@ class Fader(Button):
         name = 'Strip {} Fader'. format(strip.num)
         super().__init__(console, name)
         self.strip = strip
-        self.addr = '/strip/fader'
+        if self.strip.num == 0:
+            self.addr = '/master/fader'
+        else:
+            self.addr = '/strip/fader'
         self.status_quadlet = status_quadlets[self.strip.num]
         self.status_bits = status_bits[self.strip.num]
         self.status_callback = self.send_pos
 
     @property
     def position(self):
-        return self.console.status.field(self.status_quadlet, self.status_bits)
+        return self.console.status.field(self.status_quadlet, *self.status_bits)
 
     @position.setter
     def position(self, pos):
@@ -56,7 +59,10 @@ class Fader(Button):
 
     def send_pos(self, pos):
         print('{}, ({}, {})'.format(self.addr, self.strip.num, pos/1023))
-        osc.client.send_message(self.addr, (self.strip.num, pos/1023))
+        if self.strip.num == 0:
+            osc.client.send_message(self.addr, pos/1023)
+        else:
+            osc.client.send_message(self.addr, (self.strip.num, pos/1023))
 
     def press(self):
         self.console.status_thread.add_callback(self)