Skip to content

Dev other devices refactor #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 10, 2020
Merged

Dev other devices refactor #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6211dee
fix some addressing issues for proC
lazlooose Jun 6, 2020
d350c03
fix some addressing issues for proC
lazlooose Jun 6, 2020
e2ad6b6
debug info change C24 to proC
lazlooose Jun 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# omit logs folder
logs/

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
Expand Down Expand Up @@ -102,4 +105,4 @@ ENV/
.vscode/launch.json

# pycharm
.idea/
.idea/
15 changes: 8 additions & 7 deletions procontrolosc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ def __init__(self, desk, track_number):
# super gives us the common layout, now we add Pro Control specifics
# Only channel strip setup specific to Control24 goes here
if self.track_number < self.desk.real_channels:
self.log.debug('Adding ProC specifics to track instance')
self.reafader = ProCfader(self)
self.reavpot = ProCvpot(self)
self.reaautomode = ProCautomode(self.desk, self)
Expand All @@ -80,18 +81,18 @@ class ProCdesk(_ReaDesk):
busvus = 1
deskmodes = {
'Values': {
'address': '/track/procscribstrip/volume',
'address': '/track/@/procscribstrip/volume',

},
'Group': {
'toggle': True
},
'Names': {
'address': '/track/procscribstrip/name',
'address': '/track/@/procscribstrip/name',
'default': True
},
'Info': {
'address': '/track/procscribstrip/pan'
'address': '/track/@/procscribstrip/pan'
}
}

Expand All @@ -117,7 +118,7 @@ class ProCscribstrip(_ReaScribStrip):
this version specific to the Control24 """

digits = 8
defaultaddress = '/track/number'
defaultaddress = '/track/@/number'
bank = 0

def __init__(self, track):
Expand All @@ -135,15 +136,15 @@ def __init__(self, track):

class ProCvpot(_ReaVpot):
"""Class for the Pro Control Virtual Pots"""
defaultaddress = '/track/reavpot/{}'
defaultaddress = '/track/{}/reavpot'

def __init__(self, track):
super(ProCvpot, self).__init__(track, ProCvpot.defaultaddress)


class ProCfader(_ReaFader):
"""Class for the Pro Control Faders"""
defaultaddress = '/track/reafader/{}'
defaultaddress = '/track/{}/reafader'

def __init__(self, track):
super(ProCfader, self).__init__(track, ProCfader.defaultaddress)
Expand All @@ -152,7 +153,7 @@ def __init__(self, track):
class ProCautomode(_ReaAutomode):
""" class to deal with the automation toggle on a track
with the various LEDs and modes exchanged between DAW and desk"""
defaultaddress = '/track/reaautomode/{}/{}'
defaultaddress = '/track/{}/reaautomode/{}'

def __init__(self, desk, track):
super(ProCautomode, self).__init__(desk, track, ProCautomode.defaultaddress)
Expand Down