smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 19:56:31 +01:00
Code Issues Projects Releases Wiki Activity

catch the step edit region if it goes away and prepare to use a new one; step edit insert position starts at the edit point, not the start of the edited region

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7515 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-07-27 15:42:14 +00:00
parent ece5093234
commit 32b2ddd24a
2 changed files with 46 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

51
gtk2_ardour/midi_time_axis.cc
View file

@ -165,6 +165,12 @@ MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session* sess,
/* ask for notifications of any new RegionViews */ /* ask for notifications of any new RegionViews */
_view->RegionViewAdded.connect (sigc::mem_fun(*this, &MidiTimeAxisView::region_view_added)); _view->RegionViewAdded.connect (sigc::mem_fun(*this, &MidiTimeAxisView::region_view_added));
_view->attach (); _view->attach ();
midi_track()->PlaylistChanged.connect (*this, invalidator (*this),
boost::bind (&MidiTimeAxisView::playlist_changed, this),
gui_context());
playlist_changed ();
} }
HBox* midi_controls_hbox = manage(new HBox()); HBox* midi_controls_hbox = manage(new HBox());
@ -229,6 +235,31 @@ MidiTimeAxisView::~MidiTimeAxisView ()
delete controller_menu; delete controller_menu;
} }
void
MidiTimeAxisView::playlist_changed ()
{
step_edit_region_connection.disconnect ();
midi_track()->playlist()->RegionRemoved.connect (step_edit_region_connection, invalidator (*this),
ui_bind (&MidiTimeAxisView::region_removed, this, _1),
gui_context());
}
void
MidiTimeAxisView::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();
// force a recompute of the insert position
step_edit_beat_pos = -1.0;
}
}
void MidiTimeAxisView::model_changed() void MidiTimeAxisView::model_changed()
{ {
std::list<std::string> device_modes = MIDI::Name::MidiPatchManager::instance() std::list<std::string> device_modes = MIDI::Name::MidiPatchManager::instance()
@ -876,7 +907,7 @@ void
MidiTimeAxisView::start_step_editing () MidiTimeAxisView::start_step_editing ()
{ {
step_edit_insert_position = _editor.get_preferred_edit_position (); step_edit_insert_position = _editor.get_preferred_edit_position ();
step_edit_beat_pos = 0; step_edit_beat_pos = -1.0;
step_edit_region = playlist()->top_region_at (step_edit_insert_position); step_edit_region = playlist()->top_region_at (step_edit_insert_position);
if (step_edit_region) { if (step_edit_region) {
@ -925,18 +956,18 @@ MidiTimeAxisView::check_step_edit ()
step_edit_region = add_region (step_edit_insert_position); step_edit_region = add_region (step_edit_insert_position);
RegionView* rv = view()->find_view (step_edit_region); RegionView* rv = view()->find_view (step_edit_region);
if (rv) {
step_edit_region_view = dynamic_cast<MidiRegionView*>(rv); step_edit_region_view = dynamic_cast<MidiRegionView*>(rv);
} else {
fatal << X_("programming error: no view found for new MIDI region") << endmsg;
/*NOTREACHED*/
}
cerr << "New step edit region is called " << step_edit_region->name()
<< " view @ " << step_edit_region_view << endl;
} }
if (step_edit_region_view) { if (step_edit_region && step_edit_region_view) {
if (step_edit_beat_pos < 0.0) {
framecnt_t frames_from_start = _editor.get_preferred_edit_position() - step_edit_region->position();
if (frames_from_start < 0) {
continue;
}
step_edit_beat_pos = step_edit_region_view->frames_to_beats (frames_from_start);
}
bool success; bool success;
Evoral::MusicalTime beats = _editor.get_grid_type_as_beats (success, step_edit_insert_position); Evoral::MusicalTime beats = _editor.get_grid_type_as_beats (success, step_edit_insert_position);

3
gtk2_ardour/midi_time_axis.h
View file

@ -136,6 +136,9 @@ class MidiTimeAxisView : public RouteTimeAxisView
Evoral::MusicalTime step_edit_beat_pos; Evoral::MusicalTime step_edit_beat_pos;
boost::shared_ptr<ARDOUR::Region> step_edit_region; boost::shared_ptr<ARDOUR::Region> step_edit_region;
MidiRegionView* step_edit_region_view; MidiRegionView* step_edit_region_view;
void region_removed (boost::weak_ptr<ARDOUR::Region>);
void playlist_changed ();
PBD::ScopedConnection step_edit_region_connection;
Gtk::Menu* build_def_channel_menu(); Gtk::Menu* build_def_channel_menu();
void set_default_channel (int); void set_default_channel (int);