ardour/livetrax
13
0
Fork 0
Code

fix for restoring destructive-ness on session reload using flags, plus an edit/mix group fix to avoid gtk error msgs

Browse Source 
git-svn-id: svn://localhost/trunk/ardour2@391 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2006-03-14 14:32:14 +00:00
parent 84a2923794
commit e72e0caf99
3 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/editor_edit_groups.cc
View File

@ -242,7 +242,6 @@ Editor::edit_groups_changed ()
/* just rebuild the while thing */
edit_group_display.set_model (Glib::RefPtr<TreeModel>(0));
group_model->clear ();
{
@ -255,7 +254,6 @@ Editor::edit_groups_changed ()
}
session->foreach_edit_group (mem_fun (*this, &Editor::add_edit_group));
edit_group_display.set_model (group_model);
}
void

21
gtk2_ardour/mixer_ui.cc
View File

@ -828,7 +828,6 @@ Mixer_UI::mix_groups_changed ()
/* just rebuild the while thing */
group_display.set_model (Glib::RefPtr<TreeModel>(0));
group_model->clear ();
{
@ -841,32 +840,12 @@ Mixer_UI::mix_groups_changed ()
}
session->foreach_mix_group (mem_fun (*this, &Mixer_UI::add_mix_group));
group_display.set_model (group_model);
}
void
Mixer_UI::new_mix_group ()
{
#if 0
ArdourPrompter prompter;
string result;
prompter.set_prompt (_("Name for new mix group"));
prompter.show_all ();
switch (prompter.run ()) {
case Gtk::RESPONSE_ACCEPT:
prompter.get_result (result);
if (result.length()) {
session->add_mix_group (result);
}
break;
}
#else
session->add_mix_group ("");
#endif
}
void

4
libs/ardour/diskstream.cc
View File

@ -2048,8 +2048,8 @@ DiskStream::set_state (const XMLNode& node)
}
}
if ((prop = node.property ("_flags")) != 0) {
_flags = atoi (prop->value().c_str());
if ((prop = node.property ("flags")) != 0) {
_flags = strtol (prop->value().c_str(), 0, 0);
}
if ((prop = node.property ("channels")) != 0) {