rename Timecode::BBT_Time::ticks_per_beat to Timecode::BBT_Time::ticks_per_bar_divisi...

[ardour.git] / gtk2_ardour / edit_note_dialog.cc

diff --git a/gtk2_ardour/edit_note_dialog.cc b/gtk2_ardour/edit_note_dialog.cc
index b84be45413d1752bf65bc537f1eb7b55985e3dc9..5f3cb16502514a4d374dcfce769c04ac90ae0a28 100644 (file)
--- a/gtk2_ardour/edit_note_dialog.cc
+++ b/gtk2_ardour/edit_note_dialog.cc
@@ -20,9 +20,11 @@
 #include <gtkmm/stock.h>
 #include <gtkmm/table.h>
 #include "ardour/midi_model.h"
+#include "ardour/midi_region.h"
 #include "edit_note_dialog.h"
 #include "canvas-note-event.h"
 #include "midi_region_view.h"
+#include "i18n.h"
 
 using namespace Gtk;
 
@@ -36,8 +38,8 @@ EditNoteDialog::EditNoteDialog (MidiRegionView* rv, Gnome::Canvas::CanvasNoteEve
        : ArdourDialog (_("Note"))
        , _region_view (rv)
        , _event (ev)
-       , _time_clock (X_("notetime"), true, X_("NoteTimeClock"), true, false)
-       , _length_clock (X_("notelength"), true, X_("NoteLengthClock"), true, false, true)
+       , _time_clock (X_("notetime"), true, "", true, false)
+       , _length_clock (X_("notelength"), true, "", true, false, true)
 {
        Table* table = manage (new Table (4, 2));
        table->set_spacings (6);
@@ -82,7 +84,7 @@ EditNoteDialog::EditNoteDialog (MidiRegionView* rv, Gnome::Canvas::CanvasNoteEve
 
        _time_clock.set_session (_region_view->get_time_axis_view().session ());
        _time_clock.set_mode (AudioClock::BBT);
-       _time_clock.set (_region_view->time_converter().to (ev->note()->time ()), true);
+       _time_clock.set (_region_view->source_relative_time_converter().to (ev->note()->time ()), true);
 
        l = manage (new Label (_("Length")));
        l->set_alignment (0, 0.5);
@@ -92,7 +94,7 @@ EditNoteDialog::EditNoteDialog (MidiRegionView* rv, Gnome::Canvas::CanvasNoteEve
 
        _length_clock.set_session (_region_view->get_time_axis_view().session ());
        _length_clock.set_mode (AudioClock::BBT);
-       _length_clock.set (_region_view->time_converter().to (ev->note()->length ()), true);
+       _length_clock.set (_region_view->region_relative_time_converter().to (ev->note()->length ()), true);
 
        get_vbox()->pack_start (*table);
 
@@ -111,8 +113,15 @@ EditNoteDialog::run ()
                return r;
        }
 
-       _region_view->start_diff_command (_("edit note"));
-       
+       /* These calls mean that if a value is entered using the keyboard
+          it will be returned by the get_value_as_int()s below.
+       */
+       _channel.update ();
+       _pitch.update ();
+       _velocity.update ();
+
+       _region_view->start_note_diff_command (_("edit note"));
+
        bool had_change = false;
 
        if (_channel.get_value_as_int() - 1 != _event->note()->channel()) {
@@ -130,14 +139,14 @@ EditNoteDialog::run ()
                had_change = true;
        }
 
-       double const t = _region_view->time_converter().from (_time_clock.current_time ());
-       
+       double const t = _region_view->source_relative_time_converter().from (_time_clock.current_time ());
+
        if (t != _event->note()->time()) {
                _region_view->change_note_time (_event, t);
                had_change = true;
        }
 
-       double const d = _region_view->time_converter().from (_length_clock.current_duration ());
+       double const d = _region_view->region_relative_time_converter().from (_length_clock.current_duration ());
 
        if (d != _event->note()->length()) {
                _region_view->change_note_length (_event, d);
@@ -150,7 +159,7 @@ EditNoteDialog::run ()
 
        _region_view->apply_diff ();
 
-        _event->set_selected (_event->selected()); // change color 
-       
+       _event->set_selected (_event->selected()); // change color
+
        return r;
 }