fix for restoring destructive-ness on session reload using flags, plus an edit/mix...

git-svn-id: svn://localhost/trunk/ardour2@391 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/editor_edit_groups.cc b/gtk2_ardour/editor_edit_groups.cc
index e15da94f0ccbc13a2a04ecaff72c8b60bcac6006..56a3b6c4c489598339ee1025eb2f00159808a8f9 100644 (file)
--- 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 0d8b0f243c319df42efc45f55eaae408c36e6e66..0a0f7afe7f2bbaf0dc4894fcf2e1e98f2acf3285 100644 (file)
--- 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 78f6d1333553ad008802bf03c8b10a259e812775..cd67659290501bee8778bd4113db10d5f5bf425a 100644 (file)
--- 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) {