X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstep_editor.cc;h=a1bdcca4515763f91f3e8aaf5fb5f247b60118b9;hb=5b2eb6107c3ae056e7c27182008b46b4df5c2b28;hp=c6c34d6c17f3657cac150f766ef353d8b3c78c60;hpb=5d6c986748d77ca9f0cda698113dd19a10ba8fd0;p=ardour.git diff --git a/gtk2_ardour/step_editor.cc b/gtk2_ardour/step_editor.cc index c6c34d6c17..a1bdcca451 100644 --- a/gtk2_ardour/step_editor.cc +++ b/gtk2_ardour/step_editor.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Paul Davis + Copyright (C) 2012 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -33,81 +33,81 @@ using namespace Gtk; using namespace std; StepEditor::StepEditor (PublicEditor& e, boost::shared_ptr t, MidiTimeAxisView& mtv) - : _editor (e) - , _track (t) - , step_editor (0) - , _mtv (mtv) + : _editor (e) + , _track (t) + , step_editor (0) + , _mtv (mtv) { step_edit_insert_position = 0; - _step_edit_triplet_countdown = 0; - _step_edit_within_chord = 0; - _step_edit_chord_duration = 0.0; - step_edit_region_view = 0; - - _track->PlaylistChanged.connect (*this, invalidator (*this), - boost::bind (&StepEditor::playlist_changed, this), - gui_context()); - playlist_changed (); + _step_edit_triplet_countdown = 0; + _step_edit_within_chord = 0; + _step_edit_chord_duration = Temporal::Beats(); + step_edit_region_view = 0; + + _track->PlaylistChanged.connect (*this, invalidator (*this), + boost::bind (&StepEditor::playlist_changed, this), + gui_context()); + playlist_changed (); } StepEditor::~StepEditor() { - delete step_editor; + delete step_editor; } void StepEditor::start_step_editing () { - _step_edit_triplet_countdown = 0; - _step_edit_within_chord = 0; - _step_edit_chord_duration = 0.0; - step_edit_region.reset (); - step_edit_region_view = 0; - last_added_pitch = -1; - last_added_end = 0; - - resync_step_edit_position (); - prepare_step_edit_region (); - reset_step_edit_beat_pos (); - - assert (step_edit_region); - assert (step_edit_region_view); - - if (step_editor == 0) { - step_editor = new StepEntry (*this); - step_editor->signal_delete_event().connect (sigc::mem_fun (*this, &StepEditor::step_editor_hidden)); - step_editor->signal_hide().connect (sigc::mem_fun (*this, &StepEditor::step_editor_hide)); - } - - step_edit_region_view->show_step_edit_cursor (step_edit_beat_pos); - step_edit_region_view->set_step_edit_cursor_width (step_editor->note_length()); - - step_editor->present (); + _step_edit_triplet_countdown = 0; + _step_edit_within_chord = 0; + _step_edit_chord_duration = Temporal::Beats(); + step_edit_region.reset (); + step_edit_region_view = 0; + last_added_pitch = -1; + last_added_end = Temporal::Beats(); + + resync_step_edit_position (); + prepare_step_edit_region (); + reset_step_edit_beat_pos (); + + assert (step_edit_region); + assert (step_edit_region_view); + + if (step_editor == 0) { + step_editor = new StepEntry (*this); + step_editor->signal_delete_event().connect (sigc::mem_fun (*this, &StepEditor::step_editor_hidden)); + step_editor->signal_hide().connect (sigc::mem_fun (*this, &StepEditor::step_editor_hide)); + } + + step_edit_region_view->show_step_edit_cursor (step_edit_beat_pos); + step_edit_region_view->set_step_edit_cursor_width (step_editor->note_length()); + + step_editor->present (); } void StepEditor::resync_step_edit_position () { - step_edit_insert_position = _editor.get_preferred_edit_position (); + step_edit_insert_position = _editor.get_preferred_edit_position (Editing::EDIT_IGNORE_NONE, false, true); } void StepEditor::resync_step_edit_to_edit_point () { - resync_step_edit_position (); - if (step_edit_region) { - reset_step_edit_beat_pos (); - } + resync_step_edit_position (); + if (step_edit_region) { + reset_step_edit_beat_pos (); + } } void StepEditor::prepare_step_edit_region () { - boost::shared_ptr r = _track->playlist()->top_region_at (step_edit_insert_position); + boost::shared_ptr r = _track->playlist()->top_region_at (step_edit_insert_position); - if (r) { - step_edit_region = boost::dynamic_pointer_cast(r); - } + if (r) { + step_edit_region = boost::dynamic_pointer_cast(r); + } if (step_edit_region) { RegionView* rv = _mtv.midi_view()->find_view (step_edit_region); @@ -115,75 +115,78 @@ StepEditor::prepare_step_edit_region () } else { - 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); + const Meter& m = _mtv.session()->tempo_map().meter_at_sample (step_edit_insert_position); + double baf = max (0.0, _mtv.session()->tempo_map().beat_at_sample (step_edit_insert_position)); + double next_bar_in_beats = baf + m.divisions_per_bar(); + samplecnt_t next_bar_pos = _mtv.session()->tempo_map().sample_at_beat (next_bar_in_beats); + samplecnt_t len = next_bar_pos - 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); + 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(rv); - } + RegionView* rv = _mtv.midi_view()->find_view (step_edit_region); + step_edit_region_view = dynamic_cast(rv); + } } void StepEditor::reset_step_edit_beat_pos () { - assert (step_edit_region); - assert (step_edit_region_view); + assert (step_edit_region); + assert (step_edit_region_view); - framecnt_t frames_from_start = _editor.get_preferred_edit_position() - step_edit_region->position(); + samplecnt_t samples_from_start = _editor.get_preferred_edit_position() - step_edit_region->position(); - if (frames_from_start < 0) { - /* this can happen with snap enabled, and the edit point == Playhead. we snap the - position of the new region, and it can end up after the edit point. - */ - frames_from_start = 0; - } + if (samples_from_start < 0) { + /* this can happen with snap enabled, and the edit point == Playhead. we snap the + position of the new region, and it can end up after the edit point. + */ + samples_from_start = 0; + } - step_edit_beat_pos = step_edit_region_view->region_frames_to_region_beats (frames_from_start); - step_edit_region_view->move_step_edit_cursor (step_edit_beat_pos); + step_edit_beat_pos = step_edit_region_view->region_samples_to_region_beats (samples_from_start); + step_edit_region_view->move_step_edit_cursor (step_edit_beat_pos); } bool StepEditor::step_editor_hidden (GdkEventAny*) { - step_editor_hide (); - return true; + step_editor_hide (); + return true; // XXX remember position ?! } void StepEditor::step_editor_hide () { - /* everything else will follow the change in the model */ + /* everything else will follow the change in the model */ _track->set_step_editing (false); } void StepEditor::stop_step_editing () { - if (step_editor) { - step_editor->hide (); - } + if (step_editor) { + step_editor->hide (); + } - if (step_edit_region_view) { - step_edit_region_view->hide_step_edit_cursor(); - } + if (step_edit_region_view) { + step_edit_region_view->hide_step_edit_cursor(); + } - step_edit_region.reset (); + step_edit_region.reset (); } void StepEditor::check_step_edit () { - MidiRingBuffer& incoming (_track->step_edit_ring_buffer()); + MidiRingBuffer& incoming (_track->step_edit_ring_buffer()); uint8_t* buf; uint32_t bufsize = 32; buf = new uint8_t[bufsize]; while (incoming.read_space()) { - framepos_t time; + samplepos_t time; Evoral::EventType type; uint32_t size; @@ -198,239 +201,249 @@ StepEditor::check_step_edit () incoming.read_contents (size, buf); if ((buf[0] & 0xf0) == MIDI_CMD_NOTE_ON) { - step_add_note (buf[0] & 0xf, buf[1], buf[2], 0.0); + step_add_note (buf[0] & 0xf, buf[1], buf[2], Temporal::Beats()); } } + delete [] buf; } int StepEditor::step_add_bank_change (uint8_t /*channel*/, uint8_t /*bank*/) { - return 0; + return 0; } int StepEditor::step_add_program_change (uint8_t /*channel*/, uint8_t /*program*/) { - return 0; + return 0; } void -StepEditor::step_edit_sustain (Evoral::MusicalTime beats) +StepEditor::step_edit_sustain (Temporal::Beats beats) { - if (step_edit_region_view) { - step_edit_region_view->step_sustain (beats); - } + if (step_edit_region_view) { + step_edit_region_view->step_sustain (beats); + } } void -StepEditor::move_step_edit_beat_pos (Evoral::MusicalTime beats) +StepEditor::move_step_edit_beat_pos (Temporal::Beats beats) { - if (beats > 0.0) { - step_edit_beat_pos = min (step_edit_beat_pos + beats, - step_edit_region_view->region_frames_to_region_beats (step_edit_region->length())); - } else if (beats < 0.0) { - if (-beats < step_edit_beat_pos) { - step_edit_beat_pos += beats; // its negative, remember - } else { - step_edit_beat_pos = 0; - } - } - step_edit_region_view->move_step_edit_cursor (step_edit_beat_pos); + if (!step_edit_region_view) { + return; + } + if (beats > 0.0) { + step_edit_beat_pos = min (step_edit_beat_pos + beats, + step_edit_region_view->region_samples_to_region_beats (step_edit_region->length())); + } else if (beats < 0.0) { + if (-beats < step_edit_beat_pos) { + step_edit_beat_pos += beats; // its negative, remember + } else { + step_edit_beat_pos = Temporal::Beats(); + } + } + step_edit_region_view->move_step_edit_cursor (step_edit_beat_pos); } int -StepEditor::step_add_note (uint8_t channel, uint8_t pitch, uint8_t velocity, Evoral::MusicalTime beat_duration) +StepEditor::step_add_note (uint8_t channel, uint8_t pitch, uint8_t velocity, Temporal::Beats beat_duration) { - /* do these things in case undo removed the step edit region - */ - if (!step_edit_region) { - resync_step_edit_position (); - prepare_step_edit_region (); - reset_step_edit_beat_pos (); - step_edit_region_view->show_step_edit_cursor (step_edit_beat_pos); - step_edit_region_view->set_step_edit_cursor_width (step_editor->note_length()); - } + /* do these things in case undo removed the step edit region + */ + if (!step_edit_region) { + resync_step_edit_position (); + prepare_step_edit_region (); + reset_step_edit_beat_pos (); + step_edit_region_view->show_step_edit_cursor (step_edit_beat_pos); + step_edit_region_view->set_step_edit_cursor_width (step_editor->note_length()); + } - assert (step_edit_region); - assert (step_edit_region_view); + assert (step_edit_region); + assert (step_edit_region_view); - if (beat_duration == 0.0 && step_editor) { - beat_duration = step_editor->note_length(); - } else if (beat_duration == 0.0) { - bool success; - beat_duration = _editor.get_grid_type_as_beats (success, step_edit_insert_position); + if (beat_duration == 0.0 && step_editor) { + beat_duration = step_editor->note_length(); + } else if (beat_duration == 0.0) { + bool success; + beat_duration = _editor.get_grid_type_as_beats (success, step_edit_insert_position); - if (!success) { - return -1; - } - } + if (!success) { + return -1; + } + } - MidiStreamView* msv = _mtv.midi_view(); + MidiStreamView* msv = _mtv.midi_view(); - /* make sure its visible on the vertical axis */ + /* make sure its visible on the vertical axis */ - if (pitch < msv->lowest_note() || pitch > msv->highest_note()) { - msv->update_note_range (pitch); - msv->set_note_range (MidiStreamView::ContentsRange); - } + if (pitch < msv->lowest_note() || pitch > msv->highest_note()) { + msv->update_note_range (pitch); + msv->set_note_range (MidiStreamView::ContentsRange); + } - /* make sure its visible on the horizontal axis */ + /* make sure its visible on the horizontal axis */ - framepos_t fpos = step_edit_region_view->region_beats_to_absolute_frames (step_edit_beat_pos + beat_duration); + samplepos_t fpos = step_edit_region_view->region_beats_to_absolute_samples (step_edit_beat_pos + beat_duration); - if (fpos >= (_editor.leftmost_sample() + _editor.current_page_samples())) { - _editor.reset_x_origin (fpos - (_editor.current_page_samples()/4)); - } + if (fpos >= (_editor.leftmost_sample() + _editor.current_page_samples())) { + _editor.reset_x_origin (fpos - (_editor.current_page_samples()/4)); + } - Evoral::MusicalTime at = step_edit_beat_pos; - Evoral::MusicalTime len = beat_duration; + Temporal::Beats at = step_edit_beat_pos; + Temporal::Beats len = beat_duration; - if ((last_added_pitch >= 0) && (pitch == last_added_pitch) && (last_added_end == step_edit_beat_pos)) { + if ((last_added_pitch >= 0) && (pitch == last_added_pitch) && (last_added_end == step_edit_beat_pos)) { - /* avoid any apparent note overlap - move the start of this note - up by 1 tick from where the last note ended - */ + /* avoid any apparent note overlap - move the start of this note + up by 1 tick from where the last note ended + */ - at += 1.0/Timecode::BBT_Time::ticks_per_beat; - len -= 1.0/Timecode::BBT_Time::ticks_per_beat; - } + at += Temporal::Beats::ticks(1); + len -= Temporal::Beats::ticks(1); + } - step_edit_region_view->step_add_note (channel, pitch, velocity, at, len); + step_edit_region_view->step_add_note (channel, pitch, velocity, at, len); - last_added_pitch = pitch; - last_added_end = at+len; + last_added_pitch = pitch; + last_added_end = at+len; - if (_step_edit_triplet_countdown > 0) { - _step_edit_triplet_countdown--; + if (_step_edit_triplet_countdown > 0) { + _step_edit_triplet_countdown--; - if (_step_edit_triplet_countdown == 0) { - _step_edit_triplet_countdown = 3; - } - } + if (_step_edit_triplet_countdown == 0) { + _step_edit_triplet_countdown = 3; + } + } + + if (!_step_edit_within_chord) { + step_edit_beat_pos += beat_duration; + step_edit_region_view->move_step_edit_cursor (step_edit_beat_pos); + } else { + step_edit_beat_pos += Temporal::Beats::ticks(1); // tiny, but no longer overlapping + _step_edit_chord_duration = max (_step_edit_chord_duration, beat_duration); + } - if (!_step_edit_within_chord) { - step_edit_beat_pos += beat_duration; - step_edit_region_view->move_step_edit_cursor (step_edit_beat_pos); - } else { - step_edit_beat_pos += 1.0/Timecode::BBT_Time::ticks_per_beat; // tiny, but no longer overlapping - _step_edit_chord_duration = max (_step_edit_chord_duration, beat_duration); - } + step_edit_region_view->set_step_edit_cursor_width (step_editor->note_length()); - return 0; + return 0; } void -StepEditor::set_step_edit_cursor_width (Evoral::MusicalTime beats) +StepEditor::set_step_edit_cursor_width (Temporal::Beats beats) { - if (step_edit_region_view) { - step_edit_region_view->set_step_edit_cursor_width (beats); - } + if (step_edit_region_view) { + step_edit_region_view->set_step_edit_cursor_width (beats); + } } bool StepEditor::step_edit_within_triplet() const { - return _step_edit_triplet_countdown > 0; + return _step_edit_triplet_countdown > 0; } bool StepEditor::step_edit_within_chord() const { - return _step_edit_within_chord; + return _step_edit_within_chord; } void StepEditor::step_edit_toggle_triplet () { - if (_step_edit_triplet_countdown == 0) { - _step_edit_within_chord = false; - _step_edit_triplet_countdown = 3; - } else { - _step_edit_triplet_countdown = 0; - } + if (_step_edit_triplet_countdown == 0) { + _step_edit_within_chord = false; + _step_edit_triplet_countdown = 3; + } else { + _step_edit_triplet_countdown = 0; + } } void StepEditor::step_edit_toggle_chord () { - if (_step_edit_within_chord) { - _step_edit_within_chord = false; - step_edit_beat_pos += _step_edit_chord_duration; - step_edit_region_view->move_step_edit_cursor (step_edit_beat_pos); - } else { - _step_edit_triplet_countdown = 0; - _step_edit_within_chord = true; - } + if (_step_edit_within_chord) { + _step_edit_within_chord = false; + if (step_edit_region_view) { + step_edit_beat_pos += _step_edit_chord_duration; + step_edit_region_view->move_step_edit_cursor (step_edit_beat_pos); + } + } else { + _step_edit_triplet_countdown = 0; + _step_edit_within_chord = true; + } } void -StepEditor::step_edit_rest (Evoral::MusicalTime beats) +StepEditor::step_edit_rest (Temporal::Beats beats) { bool success; - if (beats == 0.0) { - beats = _editor.get_grid_type_as_beats (success, step_edit_insert_position); - } else { - success = true; - } + if (beats == 0.0) { + beats = _editor.get_grid_type_as_beats (success, step_edit_insert_position); + } else { + success = true; + } - if (success) { - step_edit_beat_pos += beats; - step_edit_region_view->move_step_edit_cursor (step_edit_beat_pos); - } + if (success && step_edit_region_view) { + step_edit_beat_pos += beats; + step_edit_region_view->move_step_edit_cursor (step_edit_beat_pos); + } } void StepEditor::step_edit_beat_sync () { - step_edit_beat_pos = ceil (step_edit_beat_pos); - step_edit_region_view->move_step_edit_cursor (step_edit_beat_pos); + step_edit_beat_pos = step_edit_beat_pos.round_up_to_beat(); + if (step_edit_region_view) { + step_edit_region_view->move_step_edit_cursor (step_edit_beat_pos); + } } void StepEditor::step_edit_bar_sync () { - Session* _session = _mtv.session (); + Session* _session = _mtv.session (); - if (!_session || !step_edit_region_view || !step_edit_region) { - return; - } + if (!_session || !step_edit_region_view || !step_edit_region) { + return; + } - framepos_t fpos = step_edit_region_view->region_beats_to_absolute_frames (step_edit_beat_pos); - fpos = _session->tempo_map().round_to_bar (fpos, 1); - step_edit_beat_pos = ceil (step_edit_region_view->region_frames_to_region_beats (fpos - step_edit_region->position())); - step_edit_region_view->move_step_edit_cursor (step_edit_beat_pos); + samplepos_t fpos = step_edit_region_view->region_beats_to_absolute_samples (step_edit_beat_pos); + fpos = _session->tempo_map().round_to_bar (fpos, RoundUpAlways).sample; + step_edit_beat_pos = step_edit_region_view->region_samples_to_region_beats (fpos - step_edit_region->position()).round_up_to_beat(); + step_edit_region_view->move_step_edit_cursor (step_edit_beat_pos); } void StepEditor::playlist_changed () { - step_edit_region_connection.disconnect (); - _track->playlist()->RegionRemoved.connect (step_edit_region_connection, invalidator (*this), - boost::bind (&StepEditor::region_removed, this, _1), - gui_context()); + step_edit_region_connection.disconnect (); + _track->playlist()->RegionRemoved.connect (step_edit_region_connection, invalidator (*this), + boost::bind (&StepEditor::region_removed, this, _1), + gui_context()); } void StepEditor::region_removed (boost::weak_ptr wr) { - boost::shared_ptr r (wr.lock()); - - if (!r) { - return; - } - - if (step_edit_region == r) { - step_edit_region.reset(); - step_edit_region_view = 0; - // force a recompute of the insert position - step_edit_beat_pos = -1.0; - } + boost::shared_ptr r (wr.lock()); + + if (!r) { + return; + } + + if (step_edit_region == r) { + step_edit_region.reset(); + step_edit_region_view = 0; + // force a recompute of the insert position + step_edit_beat_pos = Temporal::Beats(-1); + } } string StepEditor::name() const { - return _track->name(); + return _track->name(); }