"merge" (i.e. wholesale import) 2.0-ongoing Mackie code and then fix to compile in...

[ardour.git] / libs / surfaces / mackie / scripts / bcf-controls.csv

diff --git a/libs/surfaces/mackie/scripts/bcf-controls.csv b/libs/surfaces/mackie/scripts/bcf-controls.csv
index e22965a906543e70307ab286121188076662293f..4dd3bfdd28591de9ec64e87966a8ef4f80be3cbd 100644 (file)
--- a/libs/surfaces/mackie/scripts/bcf-controls.csv
+++ b/libs/surfaces/mackie/scripts/bcf-controls.csv
@@ -20,13 +20,13 @@ button,1,assignment,io,1,1,0x28
 button,1,assignment,sends,1,1,0x5a
 button,1,assignment,pan,1,1,0x59
 button,1,assignment,plugin,1,1,0x57
-button,1,assignment,eq,1,1,0x58
-button,1,assignment,dyn,1,1,0x2d
+button,1,functions,drop,1,1,0x58 # was eq
+button,1,assignment,zoom,1,1,0x2d
 button,1,bank,left,1,0,0x2e
 button,1,bank,right,1,0,0x2f
 button,1,bank,channel_left,1,0,0x30
 button,1,bank,channel_right,1,0,0x31
-button,1,,flip,1,1,0x32
+button,1,,scrub,1,1,0x32
 button,1,,edit,1,1,0x56
 
 button,1,display,name_value,1,0,0x34
@@ -54,12 +54,13 @@ button,1,modifiers,cmd_alt,1,0,0x49
 button,1,automation,on,1,1,0x4a
 button,1,automation,rec_ready,1,1,0x4b
 button,1,functions,undo,1,1,0x4c
-button,1,automation,snapshot,1,1,0x4d
+button,1,automation,snapshot,1,1,0x5f
 button,1,functions,redo,1,1,0x4f
 button,1,functions,marker,1,1,0x47
 button,1,functions,enter,1,1,0x51
 button,1,functions,cancel,1,0,0x52
 button,1,functions,mixer,1,0,0x53
+button,1,functions,save,1,0,0x4d
 
 # transport buttons
 button,1,transport,frm_left,1,1,0x5b
@@ -78,8 +79,8 @@ button,1,cursor,"cursor_up",1,0,0x60
 button,1,cursor,"cursor_down",1,0,0x61
 button,1,cursor,"cursor_left",1,0,0x62
 button,1,cursor,"cursor_right",1,0,0x63
-button,1,,"zoom",1,1,0x64
-button,1,,"scrub",1,1,0x65
+button,1,,"dyn",1,1,0x64
+button,1,,"flip",1,1,0x65
 button,1,user,"user_a",1,0,0x66
 button,1,user,"user_b",1,0,0x67