Move control surface options into RC prefs editor. Remove Options menu.

[ardour.git] / gtk2_ardour / time_axis_view.cc

diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index be3c0655b83646f9704d5799614f9ecb6a033470..b2b0bde460ed621812468ab9f5aee312cf09374c 100644 (file)
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -27,17 +27,17 @@
 #include <libgnomecanvasmm/canvas.h>
 #include <libgnomecanvasmm/item.h>
 
-#include <pbd/error.h>
+#include "pbd/error.h"
 
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/selector.h>
 #include <gtkmm2ext/stop_signal.h>
 
-#include <ardour/session.h>
-#include <ardour/utils.h>
-#include <ardour/ladspa_plugin.h>
-#include <ardour/processor.h>
-#include <ardour/location.h>
+#include "ardour/session.h"
+#include "ardour/utils.h"
+#include "ardour/ladspa_plugin.h"
+#include "ardour/processor.h"
+#include "ardour/location.h"
 
 #include "ardour_ui.h"
 #include "public_editor.h"
@@ -54,6 +54,7 @@
 
 #include "i18n.h"
 
+using namespace std;
 using namespace Gtk;
 using namespace Gdk;
 using namespace sigc; 
@@ -1104,8 +1105,6 @@ TimeAxisView::compute_controls_size_info ()
        two_row_table.show_all ();
        req = two_row_table.size_request ();
 
-       cerr << "Normal height is " << req.height << " + " << extra_height << endl;
-
        // height required to show all normal buttons 
 
        hNormal = /*req.height*/ 48 + extra_height;