fix merge errors with master

[ardour.git] / gtk2_ardour / ardour_ui.cc

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 127927e80a8ecdf80bd28247c24dfece50d4114c..6337b1919fed3ea6b2a5b5fef17fb3a68b85272c 100644 (file)
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -215,6 +215,10 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
 
        ui_config = new UIConfiguration();
 
+       ui_config->ParameterChanged.connect (sigc::mem_fun (*this, &ARDOUR_UI::parameter_changed));
+       boost::function<void (string)> pc (boost::bind (&ARDOUR_UI::parameter_changed, this, _1));
+       ui_config->map_parameters (pc);
+
        editor = 0;
        mixer = 0;
        meterbridge = 0;
@@ -1213,7 +1217,7 @@ ARDOUR_UI::update_cpu_load ()
           should also be changed.
        */
 
-       float const c = AudioEngine::instance()->get_cpu_load ();
+       float const c = AudioEngine::instance()->get_dsp_load ();
        snprintf (buf, sizeof (buf), _("DSP: <span foreground=\"%s\">%5.1f%%</span>"), c >= 90 ? X_("red") : X_("green"), c);
        cpu_load_label.set_markup (buf);
 }
@@ -2190,8 +2194,13 @@ ARDOUR_UI::snapshot_session (bool switch_to_it)
 
        prompter.set_name ("Prompter");
        prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
-       prompter.set_title (_("Take Snapshot"));
-       prompter.set_prompt (_("Name of new snapshot"));
+       if (switch_to_it) {
+               prompter.set_title (_("Save as..."));
+               prompter.set_prompt (_("New session name"));
+       } else {
+               prompter.set_title (_("Take Snapshot"));
+               prompter.set_prompt (_("Name of new snapshot"));
+       }
 
        if (!switch_to_it) {
                char timebuf[128];
@@ -3250,6 +3259,11 @@ ARDOUR_UI::setup_order_hint ()
                                order_hint = (*s)->route()->order_key();
                        }
                }
+
+               if (!mixer->selection().routes.empty()) {
+                       order_hint++;
+               }
+
        } else {
                for (TrackSelection::iterator s = editor->get_selection().tracks.begin(); s != editor->get_selection().tracks.end(); ++s) {
                        RouteTimeAxisView* tav = dynamic_cast<RouteTimeAxisView*> (*s);
@@ -3257,10 +3271,10 @@ ARDOUR_UI::setup_order_hint ()
                                order_hint = tav->route()->order_key();
                        }
                }
-       }
 
-       if (!mixer->selection().routes.empty() || !editor->get_selection().tracks.empty()) {
-               order_hint++;
+               if (!editor->get_selection().tracks.empty()) {
+                       order_hint++;
+               }
        }
 
        _session->set_order_hint (order_hint);
@@ -3555,7 +3569,8 @@ ARDOUR_UI::add_video (Gtk::Window* float_window)
                                if (!transcode_video_dialog->get_audiofile().empty()) {
                                        editor->embed_audio_from_video(
                                                        transcode_video_dialog->get_audiofile(),
-                                                       video_timeline->get_offset()
+                                                       video_timeline->get_offset(),
+                                                       (transcode_video_dialog->import_option() != VTL_IMPORT_NO_VIDEO)
                                                        );
                                }
                                switch (transcode_video_dialog->import_option()) {