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

[ardour.git] / gtk2_ardour / marker.cc

diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc
index 9e77d0c9e733e10c24021ab2827de3b8edd80ecd..9bc475214ac24f2709942ef92a6f2f6e5135575f 100644 (file)
--- a/gtk2_ardour/marker.cc
+++ b/gtk2_ardour/marker.cc
@@ -18,7 +18,7 @@
 */
 
 #include <sigc++/bind.h>
-#include <ardour/tempo.h>
+#include "ardour/tempo.h"
 
 #include "marker.h"
 #include "public_editor.h"
@@ -29,6 +29,7 @@
 
 #include "i18n.h"
 
+using namespace std;
 using namespace ARDOUR;
 
 Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, const string& annotation, 
@@ -283,10 +284,8 @@ Marker::~Marker ()
        delete mark;
        delete points;
 
-       if (line) {
-               delete line;
-               line = 0;
-       }
+       delete line;
+       line = 0;
 }
 
 void Marker::reparent(ArdourCanvas::Group & parent)