X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=config.py;fp=config.py;h=93d56541c6ec2593e803ce5f5a27d585bdda7e8b;hb=97b83b23e43e16f98cc8e2f9d1ac3f55d0de580c;hp=3ec155cddeeeb8529a0342ecd5c61e8fbb9fe6d2;hpb=811a95d9a6a797149cdfc6a8ad9c6b2a779a87bc;p=audiocontrol.git

diff --git a/config.py b/config.py
index 3ec155c..93d5654 100644
--- a/config.py
+++ b/config.py
@@ -168,14 +168,14 @@ if ctl is not None:
     Action.register( Looper.AssignController( 'looper_parm_rate', looper, ctl, 'Rate',
                                               'rate', 0.5, 2.0, steps ) )
 
-    looper_param_map.add( Binding( Event('jb0',5),  'Feedb', Action['looper_parm_feedback'] ) )
-    looper_param_map.add( Binding( Event('jb0',6),  'Dry',   Action['looper_parm_dry'] ) )
-    looper_param_map.add( Binding( Event('jb0',7),  'Wet',   Action['looper_parm_wet'] ) )
-    looper_param_map.add( Binding( Event('jb0',8),  'Gain',  Action['looper_parm_igain'] ) )
-    looper_param_map.add( Binding( Event('jb0',9),  'Rec T', Action['looper_parm_rec_thresh'] ) )
-    looper_param_map.add( Binding( Event('jb0',12), '',      Actions.Nop() ) )
-    looper_param_map.add( Binding( Event('jb0',13), 'Rev',    Action['looper_reverse'] ) )
-    looper_param_map.add( Binding( Event('jb0',14), 'Rate',  Action['looper_parm_rate'] ) )
+    looper_param_map.add( Binding( Event('jb0',5),  '(Feedb)', Action['looper_parm_feedback'] ) )
+    looper_param_map.add( Binding( Event('jb0',6),  '(Dry)',   Action['looper_parm_dry'] ) )
+    looper_param_map.add( Binding( Event('jb0',7),  '(Wet)',   Action['looper_parm_wet'] ) )
+    looper_param_map.add( Binding( Event('jb0',8),  '(Gain)',  Action['looper_parm_igain'] ) )
+    looper_param_map.add( Binding( Event('jb0',9),  '(Rec T)', Action['looper_parm_rec_thresh'] ) )
+    looper_param_map.add( Binding( Event('jb0',12), '',        Actions.Nop() ) )
+    looper_param_map.add( Binding( Event('jb0',13), 'Rev',     Action['looper_reverse'] ) )
+    looper_param_map.add( Binding( Event('jb0',14), '(Rate)',  Action['looper_parm_rate'] ) )
 
 looper_param_map.add( Binding( Event('jb0',11), '[Main]',    Action['unset_this_map'] ) )
 
@@ -222,33 +222,31 @@ gain = Mixer.register(
     remote  = ('127.0.0.1', 9902),
 )
 
-Action.register( Mixer.AssignController( 'mixer_guitar_level', mixer, ctl, 'Guitar', 1 ) )
-Action.register( Mixer.ToggleMuteChannel( 'mixer_mute_guitar', mixer, 1 ) )
-Action.register( Mixer.AssignController( 'mixer_voice_level', mixer, ctl, 'Voice', 2 ) )
-Action.register( Mixer.ToggleMuteChannel( 'mixer_mute_voice', mixer, 2 ) )
-Action.register( Mixer.AssignController( 'mixer_master_level', mixer, ctl, 'Master', 0 ) )
-Action.register( Mixer.ToggleMuteAll( 'mixer_mute_all', mixer ) )
-Action.register( Mixer.CycleVolume( 'mixer_cycle_gain', gain, 1, ( 0.0, 2.0, 4.0 ) ) )
-
-mixer_map.add( Binding( Event('jb0',0),  'Rec',    Action['looper_record'] ) )
-mixer_map.add( Binding( Event('jb0',1),  'Over',   Action['looper_overdub'] ) )
-mixer_map.add( Binding( Event('jb0',2),  'Mult',   Action['looper_multiply'] ) )
-mixer_map.add( Binding( Event('jb0',3),  'Undo',   Action['looper_undo'] ) )
-mixer_map.add( Binding( Event('jb0',4),  'Redo',   Action['looper_redo'] ) )
-mixer_map.add( Binding( Event('jb0',5), 'Un All', Action['looper_undo_all'] ) )
-
-mixer_map.add( Binding( Event('jb0',6), 'Lead', Action['mixer_cycle_gain'] ) )
-mixer_map.add( Binding( Event('jb0',7), 'Mute G', Action['mixer_mute_guitar'] ) )
-mixer_map.add( Binding( Event('jb0',8), 'Mute V', Action['mixer_mute_voice'] ) )
-mixer_map.add( Binding( Event('jb0',9), 'Mute', Action['mixer_mute_all'] ) )
-
-mixer_map.add( Binding( Event('jb0',13), 'Vol G', Action['mixer_guitar_level'] ) )
-mixer_map.add( Binding( Event('jb0',14), 'Vol V', Action['mixer_voice_level'] ) )
-
-mixer.set(1,0.0)
-mixer.set(2,0.0)
+Action.register( Mixer.AssignController  ( 'mixer_guitar_level', mixer, ctl, 'Guitar', 1 ) )
+Action.register( Mixer.ToggleMuteChannel ( 'mixer_mute_guitar',  mixer, 1 ) )
+Action.register( Mixer.AssignController  ( 'mixer_voice_level',  mixer, ctl, 'Voice', 2 ) )
+Action.register( Mixer.ToggleMuteChannel ( 'mixer_mute_voice',   mixer, 2 ) )
+Action.register( Mixer.AssignController  ( 'mixer_master_level', mixer, ctl, 'Master', 0 ) )
+Action.register( Mixer.ToggleMuteAll     ( 'mixer_mute_all',     mixer ) )
+Action.register( Mixer.CycleVolume       ( 'mixer_cycle_gain',   gain, 1, ( 0.0, 2.0, 4.0 ) ) )
+
+mixer_map.add( Binding( Event('jb0',0),  'Rec',     Action['looper_record'] ) )
+mixer_map.add( Binding( Event('jb0',1),  'Over',    Action['looper_overdub'] ) )
+mixer_map.add( Binding( Event('jb0',2),  'Mult',    Action['looper_multiply'] ) )
+mixer_map.add( Binding( Event('jb0',3),  'Undo',    Action['looper_undo'] ) )
+mixer_map.add( Binding( Event('jb0',4),  'Redo',    Action['looper_redo'] ) )
+mixer_map.add( Binding( Event('jb0',5),  'Un All',  Action['looper_undo_all'] ) )
+
+mixer_map.add( Binding( Event('jb0',6), 'Lead',     Action['mixer_cycle_gain'] ) )
+mixer_map.add( Binding( Event('jb0',7), 'Mute G',   Action['mixer_mute_guitar'] ) )
+mixer_map.add( Binding( Event('jb0',8), 'Mute V',   Action['mixer_mute_voice'] ) )
+mixer_map.add( Binding( Event('jb0',9), 'Mute',     Action['mixer_mute_all'] ) )
+
+mixer_map.add( Binding( Event('jb0',13), '(Vol G)', Action['mixer_guitar_level'] ) )
+mixer_map.add( Binding( Event('jb0',14), '(Vol V)', Action['mixer_voice_level'] ) )
+
+mixer.mute(2)
 mixer.assignController( ctl, 'Guitar', 1 )
-gain.set(1,0.0)
     
 ###########################################################################