diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-03-14 14:32:14 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-03-14 14:32:14 +0000 |
| commit | e72e0caf9949be20b3d5416648a902ab3fe9c588 (patch) | |
| tree | f936d1baed48a9a00a12704254f77061e3d239ad | |
| parent | 84a2923794c76525856909c0b73d46c27106ccfc (diff) | |
fix for restoring destructive-ness on session reload using flags, plus an edit/mix group fix to avoid gtk error msgs
git-svn-id: svn://localhost/trunk/ardour2@391 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/editor_edit_groups.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/mixer_ui.cc | 21 | ||||
| -rw-r--r-- | libs/ardour/diskstream.cc | 4 |
3 files changed, 2 insertions, 25 deletions
diff --git a/gtk2_ardour/editor_edit_groups.cc b/gtk2_ardour/editor_edit_groups.cc index e15da94f0c..56a3b6c4c4 100644 --- a/gtk2_ardour/editor_edit_groups.cc +++ b/gtk2_ardour/editor_edit_groups.cc @@ -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 diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index 0d8b0f243c..0a0f7afe7f 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -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 diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc index 78f6d13335..cd67659290 100644 --- a/libs/ardour/diskstream.cc +++ b/libs/ardour/diskstream.cc @@ -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) { |