show internal edit mode status correctly on session load
git-svn-id: svn://localhost/ardour2/branches/3.0@9101 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
f07ea81751
commit
92578ddef5
|
@ -191,6 +191,12 @@ AudioStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wai
|
||||||
|
|
||||||
region_views.push_front (region_view);
|
region_views.push_front (region_view);
|
||||||
|
|
||||||
|
if (_trackview.editor().internal_editing()) {
|
||||||
|
region_view->hide_rect ();
|
||||||
|
} else {
|
||||||
|
region_view->show_rect ();
|
||||||
|
}
|
||||||
|
|
||||||
/* catch region going away */
|
/* catch region going away */
|
||||||
|
|
||||||
r->DropReferences.connect (*this, invalidator (*this), boost::bind (&AudioStreamView::remove_region_view, this, boost::weak_ptr<Region> (r)), gui_context());
|
r->DropReferences.connect (*this, invalidator (*this), boost::bind (&AudioStreamView::remove_region_view, this, boost::weak_ptr<Region> (r)), gui_context());
|
||||||
|
|
|
@ -4945,6 +4945,12 @@ Editor::handle_new_route (RouteList& routes)
|
||||||
|
|
||||||
rtv->effective_gain_display ();
|
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()->RegionViewAdded.connect (sigc::mem_fun (*this, &Editor::region_view_added));
|
||||||
rtv->view()->RegionViewRemoved.connect (sigc::mem_fun (*this, &Editor::region_view_removed));
|
rtv->view()->RegionViewRemoved.connect (sigc::mem_fun (*this, &Editor::region_view_removed));
|
||||||
}
|
}
|
||||||
|
|
|
@ -172,6 +172,12 @@ MidiStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wfd,
|
||||||
|
|
||||||
region_views.push_front (region_view);
|
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 events and find note range */
|
||||||
display_region (region_view, wfd);
|
display_region (region_view, wfd);
|
||||||
|
|
||||||
|
@ -186,8 +192,9 @@ MidiStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wfd,
|
||||||
void
|
void
|
||||||
MidiStreamView::display_region(MidiRegionView* region_view, bool load_model)
|
MidiStreamView::display_region(MidiRegionView* region_view, bool load_model)
|
||||||
{
|
{
|
||||||
if ( ! region_view)
|
if (!region_view) {
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
region_view->enable_display(true);
|
region_view->enable_display(true);
|
||||||
|
|
||||||
|
|
|
@ -249,7 +249,7 @@ MidiTimeAxisView::enter_internal_edit_mode ()
|
||||||
{
|
{
|
||||||
if (midi_view()) {
|
if (midi_view()) {
|
||||||
midi_view()->enter_internal_edit_mode ();
|
midi_view()->enter_internal_edit_mode ();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
Loading…
Reference in New Issue
Block a user