ardour/livetrax
13
0
Fork 0
Code

Always call set_width_enum after set_route on mixer strips, to ensure that width is correctly set to editor_mixer_strip_width (as set_route will probably call set_width_enum itself)

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@5810 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2009-10-19 19:20:48 +00:00
parent da9cb135f1
commit 0e601ee51a
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gtk2_ardour/editor_mixer.cc
View File

@ -111,21 +111,13 @@ Editor::show_editor_mixer (bool yn)
} }
if (r) { if (r) {
bool created;
if (current_mixer_strip == 0) { if (current_mixer_strip == 0) {
create_editor_mixer (); create_editor_mixer ();
created = true;
} else {
created = false;
} }
current_mixer_strip->set_route (r); current_mixer_strip->set_route (r);
if (created) {
current_mixer_strip->set_width_enum (editor_mixer_strip_width, (void*) this); current_mixer_strip->set_width_enum (editor_mixer_strip_width, (void*) this);
} }
}
if (current_mixer_strip->get_parent() == 0) { if (current_mixer_strip->get_parent() == 0) {
global_hpacker.pack_start (*current_mixer_strip, Gtk::PACK_SHRINK ); global_hpacker.pack_start (*current_mixer_strip, Gtk::PACK_SHRINK );
@ -186,7 +178,6 @@ void
Editor::set_selected_mixer_strip (TimeAxisView& view) Editor::set_selected_mixer_strip (TimeAxisView& view)
{ {
RouteTimeAxisView* at; RouteTimeAxisView* at;
bool created;
if (!session || (at = dynamic_cast<RouteTimeAxisView*>(&view)) == 0) { if (!session || (at = dynamic_cast<RouteTimeAxisView*>(&view)) == 0) {
return; return;
@ -204,9 +195,6 @@ Editor::set_selected_mixer_strip (TimeAxisView& view)
if (current_mixer_strip == 0) { if (current_mixer_strip == 0) {
create_editor_mixer (); create_editor_mixer ();
created = true;
} else {
created = false;
} }
/* might be nothing to do */ /* might be nothing to do */
@ -215,11 +203,8 @@ Editor::set_selected_mixer_strip (TimeAxisView& view)
return; return;
} }
if (created) {
current_mixer_strip->set_width_enum (editor_mixer_strip_width, (void*) this);
}
current_mixer_strip->set_route (at->route()); current_mixer_strip->set_route (at->route());
current_mixer_strip->set_width_enum (editor_mixer_strip_width, (void*) this);
} }
double current = 0.0; double current = 0.0;