X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstep_entry.cc;h=d7b177949f2e00a0b158b1b5590c95f1b5e98c41;hb=18efe8f446f45b541f19a2f99dd707f66fb72a3e;hp=27ec3b4059fafb06f30dfc4977ae2248dd19ee90;hpb=650964f3203319b013c49a286b5fc5fc203f3bbb;p=ardour.git

diff --git a/gtk2_ardour/step_entry.cc b/gtk2_ardour/step_entry.cc
index 27ec3b4059..d7b177949f 100644
--- a/gtk2_ardour/step_entry.cc
+++ b/gtk2_ardour/step_entry.cc
@@ -36,16 +36,13 @@
 
 #include "i18n.h"
 
-#ifdef SearchPath
-#undef SearchPath
-#endif
-
 using namespace std;
 using namespace Gtk;
 using namespace Glib;
 using namespace Gtkmm2ext;
 using namespace PBD;
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 
 static void
 _note_off_event_handler (GtkWidget* /*widget*/, int note, gpointer arg)
@@ -282,8 +279,8 @@ StepEntry::StepEntry (StepEditor& seditor)
 	ARDOUR_UI::instance()->set_tip (&velocity_mp_button, _("Set volume (velocity) to mezzo-piano"), "");
 	ARDOUR_UI::instance()->set_tip (&velocity_mf_button, _("Set volume (velocity) to mezzo-forte"), "");
 	ARDOUR_UI::instance()->set_tip (&velocity_f_button, _("Set volume (velocity) to forte"), "");
-	ARDOUR_UI::instance()->set_tip (&velocity_ff_button, _("Set volume (velocity) to forteissimo"), "");
-	ARDOUR_UI::instance()->set_tip (&velocity_fff_button, _("Set volume (velocity) to forteississimo"), "");
+	ARDOUR_UI::instance()->set_tip (&velocity_ff_button, _("Set volume (velocity) to fortissimo"), "");
+	ARDOUR_UI::instance()->set_tip (&velocity_fff_button, _("Set volume (velocity) to fortississimo"), "");
 
 	note_velocity_box.pack_start (velocity_ppp_button, false, false);
 	note_velocity_box.pack_start (velocity_pp_button, false, false);
@@ -529,13 +526,13 @@ StepEntry::on_key_release_event (GdkEventKey* ev)
 void
 StepEntry::rest_event_handler ()
 {
-	se->step_edit_rest (0.0);
+	se->step_edit_rest (Evoral::MusicalTime());
 }
 
 Evoral::MusicalTime
 StepEntry::note_length ()
 {
-        Evoral::MusicalTime base_time = 4.0 / (Evoral::MusicalTime) length_divisor_adjustment.get_value();
+        double base_time = 4.0 / (double) length_divisor_adjustment.get_value();
 
         RefPtr<Action> act = myactions.find_action ("StepEditing/toggle-triplet");
         RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic (act);
@@ -552,13 +549,13 @@ StepEntry::note_length ()
                 base_time *= 1 + ((dots - 1.0)/dots);
         }
 
-        return base_time;
+        return Evoral::MusicalTime(base_time);
 }
 
 uint8_t
 StepEntry::note_velocity () const
 {
-        return (Evoral::MusicalTime) velocity_adjustment.get_value();
+	return velocity_adjustment.get_value();
 }
 
 uint8_t
@@ -713,7 +710,7 @@ StepEntry::load_bindings ()
 
 	std::string binding_file;
 
-	if (find_file_in_search_path (ardour_config_search_path(), "step_editing.bindings", binding_file)) {
+	if (find_file (ardour_config_search_path(), "step_editing.bindings", binding_file)) {
                 bindings.load (binding_file);
         }
 }
@@ -798,7 +795,7 @@ StepEntry::insert_rest ()
 void
 StepEntry::insert_grid_rest ()
 {
-	se->step_edit_rest (0.0);
+	se->step_edit_rest (Evoral::MusicalTime());
 }
 
 void