projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 2b6111f58af02c15e0662c591a62c5f8304a0b95..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 = 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;
editor = 0;
mixer = 0;
meterbridge = 0;
@@
-1213,7
+1217,7
@@
ARDOUR_UI::update_cpu_load ()
should also be changed.
*/
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);
}
snprintf (buf, sizeof (buf), _("DSP: <span foreground=\"%s\">%5.1f%%</span>"), c >= 90 ? X_("red") : X_("green"), c);
cpu_load_label.set_markup (buf);
}
@@
-3565,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(),
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()) {
);
}
switch (transcode_video_dialog->import_option()) {