ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

show internal edit mode status correctly on session load

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@9101 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-03-08 01:49:13 +00:00
parent f07ea81751
commit 92578ddef5
4 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk2_ardour/audio_streamview.cc
View File

@ -191,6 +191,12 @@ AudioStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wai
region_views.push_front (region_view);
if (_trackview.editor().internal_editing()) {
region_view->hide_rect ();
} else {
region_view->show_rect ();
}
/* catch region going away */
r->DropReferences.connect (*this, invalidator (*this), boost::bind (&AudioStreamView::remove_region_view, this, boost::weak_ptr<Region> (r)), gui_context());

6
gtk2_ardour/editor.cc
View File

@ -4945,6 +4945,12 @@ Editor::handle_new_route (RouteList& routes)
rtv->effective_gain_display ();
if (internal_editing()) {
rtv->enter_internal_edit_mode ();
} else {
rtv->leave_internal_edit_mode ();
}
rtv->view()->RegionViewAdded.connect (sigc::mem_fun (*this, &Editor::region_view_added));
rtv->view()->RegionViewRemoved.connect (sigc::mem_fun (*this, &Editor::region_view_removed));
}

9
gtk2_ardour/midi_streamview.cc
View File

@ -172,6 +172,12 @@ MidiStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wfd,
region_views.push_front (region_view);
if (_trackview.editor().internal_editing()) {
region_view->hide_rect ();
} else {
region_view->show_rect ();
}
/* display events and find note range */
display_region (region_view, wfd);
@ -186,8 +192,9 @@ MidiStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wfd,
void
MidiStreamView::display_region(MidiRegionView* region_view, bool load_model)
{
if ( ! region_view)
if (!region_view) {
return;
}
region_view->enable_display(true);

2
gtk2_ardour/midi_time_axis.cc
View File

@ -249,7 +249,7 @@ MidiTimeAxisView::enter_internal_edit_mode ()
{
if (midi_view()) {
midi_view()->enter_internal_edit_mode ();
}
}
}
void