From f4032599f207ecb1e0994088bbffe687c4a90693 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Mon, 25 Jan 2016 12:51:29 -0500
Subject: fix API of VCA strip

Conflicts:
	gtk2_ardour/master_faders.cc
---
 gtk2_ardour/vca_master_strip.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'gtk2_ardour/vca_master_strip.h')

diff --git a/gtk2_ardour/vca_master_strip.h b/gtk2_ardour/vca_master_strip.h
index 1b47b05281..cef7290b9a 100644
--- a/gtk2_ardour/vca_master_strip.h
+++ b/gtk2_ardour/vca_master_strip.h
@@ -28,20 +28,20 @@
 #include "gain_meter.h"
 
 namespace ARDOUR {
-class GainControl;
+	class GainControl;
+	class VCA;
 }
 
-
 class VCAMasterStrip : public AxisView, public Gtk::VBox
 {
-	public:
-	VCAMasterStrip (ARDOUR::Session* /*, boost::shared_ptr<ARDOUR::GainControl> gc*/);
+      public:
+	VCAMasterStrip (ARDOUR::Session*, boost::shared_ptr<ARDOUR::VCA>);
 
-	std::string name() const { return "myname"; }
+	std::string name() const;
 	std::string state_id() const { return "VCAMasterStrip"; }
-	
-	
-	private:
+
+      private:
+	boost::shared_ptr<ARDOUR::VCA> vca;
 	ArdourButton name_button;
 	ArdourButton active_button;
 	GainMeter    gain_meter;
-- 
cgit v1.2.3