Merged with trunk R1612.

[ardour.git] / gtk2_ardour / redirect_automation_line.cc

diff --git a/gtk2_ardour/redirect_automation_line.cc b/gtk2_ardour/redirect_automation_line.cc
index fb79c1288b7398c08b7177b9ec1f24e054c621ac..b1b19d530f296592e3788267ed1e27107083dcb5 100644 (file)
--- a/gtk2_ardour/redirect_automation_line.cc
+++ b/gtk2_ardour/redirect_automation_line.cc
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include "public_editor.h"
@@ -32,19 +31,20 @@
 
 using namespace std;
 using namespace ARDOUR;
-
-RedirectAutomationLine::RedirectAutomationLine (string name, Redirect& rd, uint32_t port, Session& s,
-                                               TimeAxisView& tv, GnomeCanvasItem* parent,
-                                               AutomationList& l,
-                                               gint (*point_callback)(GnomeCanvasItem*, GdkEvent*, gpointer),
-                                               gint (*line_callback)(GnomeCanvasItem*, GdkEvent*, gpointer))
-
-       : AutomationLine (name, tv, parent, l, point_callback, line_callback),
+using namespace PBD;
+
+RedirectAutomationLine::RedirectAutomationLine (const string & name, Redirect& rd, uint32_t port, Session& s,
+                                               
+                                               TimeAxisView& tv, ArdourCanvas::Group& parent,
+                                               
+                                               AutomationList& l)
+  
+        : AutomationLine (name, tv, parent, l),
          session (s),
          _redirect (rd),
          _port (port)
 {
-       set_verbose_cursor_uses_gain_mapping (false);
+        set_verbose_cursor_uses_gain_mapping (false);
 
        PluginInsert *pi;
        Plugin::ParameterDescriptor desc;
@@ -54,7 +54,7 @@ RedirectAutomationLine::RedirectAutomationLine (string name, Redirect& rd, uint3
                /*NOTREACHED*/
        }
 
-       pi->plugin().get_parameter_descriptor (_port, desc);
+       pi->plugin()->get_parameter_descriptor (_port, desc);
 
        upper = desc.upper;
        lower = desc.lower;