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

[ardour.git] / gtk2_ardour / editor_tempodisplay.cc

diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index 9bef055b57aec7e3e33d8c0f3b4c756fdd270969..be7203f2db5f3044f821b898202a0954b08d67bf 100644 (file)
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -25,14 +25,14 @@
 
 #include <libgnomecanvasmm.h>
 
-#include <pbd/error.h>
-#include <pbd/memento_command.h>
+#include "pbd/error.h"
+#include "pbd/memento_command.h"
 
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/gtk_ui.h>
 
-#include <ardour/session.h>
-#include <ardour/tempo.h>
+#include "ardour/session.h"
+#include "ardour/tempo.h"
 #include <gtkmm2ext/doi.h>
 #include <gtkmm2ext/utils.h>
 
@@ -337,7 +337,7 @@ Editor::edit_tempo_section (TempoSection* section)
        tempo_dialog.set_position (Gtk::WIN_POS_MOUSE);
 
        ensure_float (tempo_dialog);
-       
+
        switch (tempo_dialog.run ()) {
        case RESPONSE_ACCEPT:
                break;
@@ -350,16 +350,16 @@ Editor::edit_tempo_section (TempoSection* section)
        BBT_Time when;
        tempo_dialog.get_bbt_time(when);
        bpm = max (0.01, bpm);
-       
+
        cerr << "Editing tempo section to be at " << when << endl;
        session->tempo_map().dump (cerr);
        begin_reversible_command (_("replace tempo mark"));
-        XMLNode &before = session->tempo_map().get_state();
+       XMLNode &before = session->tempo_map().get_state();
        session->tempo_map().replace_tempo (*section, Tempo (bpm,nt));
        session->tempo_map().dump (cerr);
        session->tempo_map().move_tempo (*section, when);
        session->tempo_map().dump (cerr);
-        XMLNode &after = session->tempo_map().get_state();
+       XMLNode &after = session->tempo_map().get_state();
        session->add_command (new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
        commit_reversible_command ();
 }