diff options
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/editor_drag.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/midi_region_view.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/step_editor.cc | 7 | ||||
| -rw-r--r-- | gtk2_ardour/tempo_dialog.cc | 7 | ||||
| -rw-r--r-- | gtk2_ardour/tempo_dialog.h | 1 |
5 files changed, 16 insertions, 3 deletions
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index f6f7f2b67c..238a0d8ab0 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -519,7 +519,7 @@ Drag::add_midi_region (MidiTimeAxisView* view, bool commit) /* not that the frame rate used here can be affected by pull up/down which might be wrong. */ - framecnt_t len = m.frames_per_bar (map.tempo_at (pos), _editor->session()->frame_rate()); + framecnt_t len = map.frame_at_beat (map.beat_at_frame (pos) + 1.0) - pos; return view->add_region (grab_frame(), len, commit); } diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index c00cc9b565..961ab147c1 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -4123,7 +4123,7 @@ MidiRegionView::get_grid_beats(framepos_t pos) const { PublicEditor& editor = trackview.editor(); bool success = false; - Evoral::Beats beats = editor.get_grid_type_as_beats(success, pos); + Evoral::Beats beats = editor.get_grid_type_as_beats (success, pos); if (!success) { beats = Evoral::Beats(1); } diff --git a/gtk2_ardour/step_editor.cc b/gtk2_ardour/step_editor.cc index e19f89fa4a..e8579a94f5 100644 --- a/gtk2_ardour/step_editor.cc +++ b/gtk2_ardour/step_editor.cc @@ -118,7 +118,12 @@ StepEditor::prepare_step_edit_region () const Meter& m = _mtv.session()->tempo_map().meter_at (step_edit_insert_position); const Tempo& t = _mtv.session()->tempo_map().tempo_at (step_edit_insert_position); - step_edit_region = _mtv.add_region (step_edit_insert_position, floor (m.frames_per_bar (t, _mtv.session()->frame_rate())), true); + double baf = _mtv.session()->tempo_map().beat_at_frame (step_edit_insert_position); + double next_bar_in_beats = baf + m.divisions_per_bar(); + framecnt_t next_bar_pos = _mtv.session()->tempo_map().frame_at_beat (next_bar_in_beats); + framecnt_t len = next_bar_pos - step_edit_insert_position; + + step_edit_region = _mtv.add_region (step_edit_insert_position, len, true); RegionView* rv = _mtv.midi_view()->find_view (step_edit_region); step_edit_region_view = dynamic_cast<MidiRegionView*>(rv); diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc index 0d6a6cc75e..613a2d9a5a 100644 --- a/gtk2_ardour/tempo_dialog.cc +++ b/gtk2_ardour/tempo_dialog.cc @@ -194,6 +194,7 @@ TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type, when_beat_entry.signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &TempoDialog::response), RESPONSE_ACCEPT)); when_beat_entry.signal_key_release_event().connect (sigc::mem_fun (*this, &TempoDialog::entry_key_release), false); pulse_selector.signal_changed().connect (sigc::mem_fun (*this, &TempoDialog::pulse_change)); + tempo_type.signal_changed().connect (sigc::mem_fun (*this, &TempoDialog::tempo_type_change)); tap_tempo_button.signal_button_press_event().connect (sigc::mem_fun (*this, &TempoDialog::tap_tempo_button_press), false); tap_tempo_button.signal_focus_out_event().connect (sigc::mem_fun (*this, &TempoDialog::tap_tempo_focus_out)); @@ -290,6 +291,12 @@ TempoDialog::pulse_change () set_response_sensitive (RESPONSE_ACCEPT, is_user_input_valid()); } +void +TempoDialog::tempo_type_change () +{ + set_response_sensitive (RESPONSE_ACCEPT, is_user_input_valid()); +} + bool TempoDialog::tap_tempo_button_press (GdkEventButton *ev) { diff --git a/gtk2_ardour/tempo_dialog.h b/gtk2_ardour/tempo_dialog.h index f04a5417f7..842c2f2c3c 100644 --- a/gtk2_ardour/tempo_dialog.h +++ b/gtk2_ardour/tempo_dialog.h @@ -54,6 +54,7 @@ private: bool bpm_button_release (GdkEventButton* ); bool entry_key_release (GdkEventKey* ); void pulse_change (); + void tempo_type_change (); bool tap_tempo_button_press (GdkEventButton* ); bool tap_tempo_focus_out (GdkEventFocus* ); |