summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2015-01-07 20:12:14 -0500
committerDavid Robillard <d@drobilla.net>2015-01-07 20:12:14 -0500
commit69069e038126b0837853b913e8aebcd6cc0c5f3a (patch)
treed0cd1ca78295e0b5cdce4dae9c030abef2bc2c06 /gtk2_ardour
parente705e93376427d15def4d64ee955b6e29a096765 (diff)
Fix whitespace (noop).
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/route_ui.cc100
-rw-r--r--gtk2_ardour/step_editor.cc400
-rw-r--r--gtk2_ardour/step_editor.h91
3 files changed, 295 insertions, 296 deletions
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index a59e4cd475..b7bdeb0a65 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -676,15 +676,15 @@ RouteUI::rec_enable_press(GdkEventButton* ev)
return false;
}
- if (is_midi_track()) {
+ if (is_midi_track()) {
- /* rec-enable button exits from step editing */
+ /* rec-enable button exits from step editing */
- if (midi_track()->step_editing()) {
+ if (midi_track()->step_editing()) {
midi_track()->set_step_editing (false);
return false;
- }
- }
+ }
+ }
if (is_track() && rec_enable_button) {
@@ -856,79 +856,79 @@ RouteUI::monitor_release (GdkEventButton* ev, MonitorChoice monitor_choice)
void
RouteUI::build_record_menu ()
{
- if (record_menu) {
- return;
- }
+ if (record_menu) {
+ return;
+ }
- /* no rec-button context menu for non-MIDI tracks
- */
+ /* no rec-button context menu for non-MIDI tracks
+ */
- if (is_midi_track()) {
- record_menu = new Menu;
- record_menu->set_name ("ArdourContextMenu");
+ if (is_midi_track()) {
+ record_menu = new Menu;
+ record_menu->set_name ("ArdourContextMenu");
- using namespace Menu_Helpers;
- MenuList& items = record_menu->items();
+ using namespace Menu_Helpers;
+ MenuList& items = record_menu->items();
- items.push_back (CheckMenuElem (_("Step Entry"), sigc::mem_fun (*this, &RouteUI::toggle_step_edit)));
- step_edit_item = dynamic_cast<Gtk::CheckMenuItem*> (&items.back());
+ items.push_back (CheckMenuElem (_("Step Entry"), sigc::mem_fun (*this, &RouteUI::toggle_step_edit)));
+ step_edit_item = dynamic_cast<Gtk::CheckMenuItem*> (&items.back());
- if (_route->record_enabled()) {
- step_edit_item->set_sensitive (false);
- }
+ if (_route->record_enabled()) {
+ step_edit_item->set_sensitive (false);
+ }
- step_edit_item->set_active (midi_track()->step_editing());
- }
+ step_edit_item->set_active (midi_track()->step_editing());
+ }
}
void
RouteUI::toggle_step_edit ()
{
- if (!is_midi_track() || _route->record_enabled()) {
- return;
- }
+ if (!is_midi_track() || _route->record_enabled()) {
+ return;
+ }
- midi_track()->set_step_editing (step_edit_item->get_active());
+ midi_track()->set_step_editing (step_edit_item->get_active());
}
void
RouteUI::step_edit_changed (bool yn)
{
- if (yn) {
- if (rec_enable_button) {
- rec_enable_button->set_active_state (Gtkmm2ext::ExplicitActive);
- }
+ if (yn) {
+ if (rec_enable_button) {
+ rec_enable_button->set_active_state (Gtkmm2ext::ExplicitActive);
+ }
- start_step_editing ();
+ start_step_editing ();
- if (step_edit_item) {
- step_edit_item->set_active (true);
- }
+ if (step_edit_item) {
+ step_edit_item->set_active (true);
+ }
- } else {
+ } else {
- if (rec_enable_button) {
- rec_enable_button->unset_active_state ();
- }
+ if (rec_enable_button) {
+ rec_enable_button->unset_active_state ();
+ }
- stop_step_editing ();
+ stop_step_editing ();
- if (step_edit_item) {
- step_edit_item->set_active (false);
- }
- }
+ if (step_edit_item) {
+ step_edit_item->set_active (false);
+ }
+ }
}
bool
RouteUI::rec_enable_release (GdkEventButton* ev)
{
- if (Keyboard::is_context_menu_event (ev)) {
- build_record_menu ();
- if (record_menu) {
- record_menu->popup (1, ev->time);
- }
- return false;
- }
+ if (Keyboard::is_context_menu_event (ev)) {
+ build_record_menu ();
+ if (record_menu) {
+ record_menu->popup (1, ev->time);
+ }
+ return false;
+ }
return false;
}
diff --git a/gtk2_ardour/step_editor.cc b/gtk2_ardour/step_editor.cc
index db34dcbf84..4648299188 100644
--- a/gtk2_ardour/step_editor.cc
+++ b/gtk2_ardour/step_editor.cc
@@ -33,56 +33,56 @@ using namespace Gtk;
using namespace std;
StepEditor::StepEditor (PublicEditor& e, boost::shared_ptr<MidiTrack> 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 = Evoral::Beats();
- 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 = Evoral::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 = Evoral::Beats();
- step_edit_region.reset ();
- step_edit_region_view = 0;
- last_added_pitch = -1;
- last_added_end = Evoral::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 ();
+ _step_edit_triplet_countdown = 0;
+ _step_edit_within_chord = 0;
+ _step_edit_chord_duration = Evoral::Beats();
+ step_edit_region.reset ();
+ step_edit_region_view = 0;
+ last_added_pitch = -1;
+ last_added_end = Evoral::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
@@ -94,20 +94,20 @@ StepEditor::resync_step_edit_position ()
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<Region> r = _track->playlist()->top_region_at (step_edit_insert_position);
+ boost::shared_ptr<Region> r = _track->playlist()->top_region_at (step_edit_insert_position);
- if (r) {
- step_edit_region = boost::dynamic_pointer_cast<MidiRegion>(r);
- }
+ if (r) {
+ step_edit_region = boost::dynamic_pointer_cast<MidiRegion>(r);
+ }
if (step_edit_region) {
RegionView* rv = _mtv.midi_view()->find_view (step_edit_region);
@@ -118,59 +118,59 @@ 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);
+ step_edit_region = _mtv.add_region (step_edit_insert_position, floor (m.frames_per_bar (t, _mtv.session()->frame_rate())), true);
- RegionView* rv = _mtv.midi_view()->find_view (step_edit_region);
- step_edit_region_view = dynamic_cast<MidiRegionView*>(rv);
- }
+ RegionView* rv = _mtv.midi_view()->find_view (step_edit_region);
+ step_edit_region_view = dynamic_cast<MidiRegionView*>(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();
+ framecnt_t frames_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 (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;
+ }
- 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_frames_to_region_beats (frames_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; // XXX remember position ?!
+ 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
@@ -206,162 +206,162 @@ StepEditor::check_step_edit ()
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::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::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 = Evoral::Beats();
- }
- }
- step_edit_region_view->move_step_edit_cursor (step_edit_beat_pos);
+ 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 = Evoral::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::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);
+ framepos_t fpos = step_edit_region_view->region_beats_to_absolute_frames (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::Beats at = step_edit_beat_pos;
- Evoral::Beats len = beat_duration;
+ Evoral::Beats at = step_edit_beat_pos;
+ Evoral::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 += Evoral::Beats::ticks(1);
- len -= Evoral::Beats::ticks(1);
- }
+ at += Evoral::Beats::ticks(1);
+ len -= Evoral::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 += Evoral::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 += Evoral::Beats::ticks(1); // tiny, but no longer overlapping
+ _step_edit_chord_duration = max (_step_edit_chord_duration, beat_duration);
+ }
- return 0;
+ return 0;
}
void
StepEditor::set_step_edit_cursor_width (Evoral::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;
+ 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
@@ -369,68 +369,68 @@ StepEditor::step_edit_rest (Evoral::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_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 = step_edit_beat_pos.round_up_to_beat();
- step_edit_region_view->move_step_edit_cursor (step_edit_beat_pos);
+ step_edit_beat_pos = step_edit_beat_pos.round_up_to_beat();
+ 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, RoundUpAlways);
- step_edit_beat_pos = step_edit_region_view->region_frames_to_region_beats (fpos - step_edit_region->position()).round_up_to_beat();
- step_edit_region_view->move_step_edit_cursor (step_edit_beat_pos);
+ framepos_t fpos = step_edit_region_view->region_beats_to_absolute_frames (step_edit_beat_pos);
+ fpos = _session->tempo_map().round_to_bar (fpos, RoundUpAlways);
+ step_edit_beat_pos = step_edit_region_view->region_frames_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<Region> wr)
{
- boost::shared_ptr<Region> 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 = Evoral::Beats(-1);
- }
+ boost::shared_ptr<Region> 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 = Evoral::Beats(-1);
+ }
}
string
StepEditor::name() const
{
- return _track->name();
+ return _track->name();
}
diff --git a/gtk2_ardour/step_editor.h b/gtk2_ardour/step_editor.h
index 299025d292..fa2f294d9d 100644
--- a/gtk2_ardour/step_editor.h
+++ b/gtk2_ardour/step_editor.h
@@ -14,11 +14,10 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
*/
-#ifndef __pbd__step_editor_h__
-#define __pbd__step_editor_h__
+#ifndef __gtk2_ardour_step_editor_h__
+#define __gtk2_ardour_step_editor_h__
#include <string>
@@ -29,8 +28,8 @@
#include "evoral/types.hpp"
namespace ARDOUR {
- class MidiTrack;
- class MidiRegion;
+class MidiTrack;
+class MidiRegion;
}
class MidiRegionView;
@@ -40,55 +39,55 @@ class StepEntry;
class StepEditor : public PBD::ScopedConnectionList, public sigc::trackable
{
- public:
- StepEditor (PublicEditor&, boost::shared_ptr<ARDOUR::MidiTrack>, MidiTimeAxisView&);
- virtual ~StepEditor ();
+public:
+ StepEditor (PublicEditor&, boost::shared_ptr<ARDOUR::MidiTrack>, MidiTimeAxisView&);
+ virtual ~StepEditor ();
void check_step_edit ();
void step_edit_rest (Evoral::Beats beats);
- void step_edit_beat_sync ();
- void step_edit_bar_sync ();
- int step_add_bank_change (uint8_t channel, uint8_t bank);
- int step_add_program_change (uint8_t channel, uint8_t program);
- int step_add_note (uint8_t channel, uint8_t pitch, uint8_t velocity,
- Evoral::Beats beat_duration);
- void step_edit_sustain (Evoral::Beats beats);
- bool step_edit_within_triplet () const;
- void step_edit_toggle_triplet ();
- bool step_edit_within_chord () const;
- void step_edit_toggle_chord ();
- void reset_step_edit_beat_pos ();
- void resync_step_edit_to_edit_point ();
- void move_step_edit_beat_pos (Evoral::Beats beats);
- void set_step_edit_cursor_width (Evoral::Beats beats);
-
- std::string name() const;
+ void step_edit_beat_sync ();
+ void step_edit_bar_sync ();
+ int step_add_bank_change (uint8_t channel, uint8_t bank);
+ int step_add_program_change (uint8_t channel, uint8_t program);
+ int step_add_note (uint8_t channel, uint8_t pitch, uint8_t velocity,
+ Evoral::Beats beat_duration);
+ void step_edit_sustain (Evoral::Beats beats);
+ bool step_edit_within_triplet () const;
+ void step_edit_toggle_triplet ();
+ bool step_edit_within_chord () const;
+ void step_edit_toggle_chord ();
+ void reset_step_edit_beat_pos ();
+ void resync_step_edit_to_edit_point ();
+ void move_step_edit_beat_pos (Evoral::Beats beats);
+ void set_step_edit_cursor_width (Evoral::Beats beats);
+
+ std::string name() const;
void start_step_editing ();
void stop_step_editing ();
- private:
- ARDOUR::framepos_t step_edit_insert_position;
- Evoral::Beats step_edit_beat_pos;
+private:
+ ARDOUR::framepos_t step_edit_insert_position;
+ Evoral::Beats step_edit_beat_pos;
boost::shared_ptr<ARDOUR::MidiRegion> step_edit_region;
MidiRegionView* step_edit_region_view;
- uint8_t _step_edit_triplet_countdown;
- bool _step_edit_within_chord;
- Evoral::Beats _step_edit_chord_duration;
- PBD::ScopedConnection step_edit_region_connection;
- PublicEditor& _editor;
- boost::shared_ptr<ARDOUR::MidiTrack> _track;
- StepEntry* step_editor;
- MidiTimeAxisView& _mtv;
- int8_t last_added_pitch;
- Evoral::Beats last_added_end;
-
- void region_removed (boost::weak_ptr<ARDOUR::Region>);
- void playlist_changed ();
- bool step_editor_hidden (GdkEventAny*);
- void step_editor_hide ();
- void resync_step_edit_position ();
- void prepare_step_edit_region ();
+ uint8_t _step_edit_triplet_countdown;
+ bool _step_edit_within_chord;
+ Evoral::Beats _step_edit_chord_duration;
+ PBD::ScopedConnection step_edit_region_connection;
+ PublicEditor& _editor;
+ boost::shared_ptr<ARDOUR::MidiTrack> _track;
+ StepEntry* step_editor;
+ MidiTimeAxisView& _mtv;
+ int8_t last_added_pitch;
+ Evoral::Beats last_added_end;
+
+ void region_removed (boost::weak_ptr<ARDOUR::Region>);
+ void playlist_changed ();
+ bool step_editor_hidden (GdkEventAny*);
+ void step_editor_hide ();
+ void resync_step_edit_position ();
+ void prepare_step_edit_region ();
};
-#endif /* __pbd__step_editor_h__ */
+#endif /* __gtk2_ardour_step_editor_h__ */