Jog Wheel Fun:

- When ffwd/rew is pressed, wheel controls speed
- Zoom button allows jog wheel to zoom
- Scrub button cycles jog from scrub to shuttle to whatever it was before



git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2155 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 9 insertions, 6 deletions

diff --git a/libs/surfaces/mackie/scripts/surface-cc-template.erb b/libs/surfaces/mackie/scripts/surface-cc-template.erb
index a04d5addd7..79cd2e4ae0 100644
--- a/libs/surfaces/mackie/scripts/surface-cc-template.erb
+++ b/libs/surfaces/mackie/scripts/surface-cc-template.erb
@@ -52,17 +52,20 @@ void Mackie::<%= sf.name %>Surface::init_controls()
 % end
 
 	// initialise controls
-	Control * control = 0;
+	Fader * fader = 0;
+	Pot * pot = 0;
+	Button * button = 0;
+	Led * led = 0;
 
 % sf.controls.each do |control|
 	group = groups["<%=control.group.name%>"];
-	control = new <%= control.class.name %> ( <%= control.id %>, <%= control.ordinal %>, "<%=control.name%>", *group );
-	<%=control.class.name.downcase%>s[0x<%=control.id.to_hex %>] = control;
-	controls.push_back( control );
+	<%= control.class.name.downcase %> = new <%= control.class.name %> ( <%= control.id %>, <%= control.ordinal %>, "<%=control.name%>", *group );
+	<%=control.class.name.downcase%>s[0x<%=control.id.to_hex %>] = <%= control.class.name.downcase %>;
+	controls.push_back( <%= control.class.name.downcase %> );
 	<%- if control.group.class != Strip -%>
-	controls_by_name["<%= control.name %>"] = control;
+	controls_by_name["<%= control.name %>"] = <%= control.class.name.downcase %>;
 	<%- end -%>
-	group->add( *control );
+	group->add( *<%= control.class.name.downcase %> );
 
 % end
 }