diff options
| author | David Robillard <d@drobilla.net> | 2006-06-15 22:31:13 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-06-15 22:31:13 +0000 |
| commit | e13e84677a9213fb54d641483a7fcf5ecf2feb0d (patch) | |
| tree | e4462e8a8e14f15575ff5cbfbfa7cf42b14c00fc /gtk2_ardour | |
| parent | b5db1f624d347c8865c27fdae23bf4595be372d2 (diff) | |
Merged with trunk revision 610
git-svn-id: svn://localhost/ardour2/branches/midi@611 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/ardour_ui_ed.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/editor.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/gain_meter.cc | 34 | ||||
| -rw-r--r-- | gtk2_ardour/new_session_dialog.cc | 5 |
4 files changed, 26 insertions, 17 deletions
diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index 3ca435a24d..8714eec9a9 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -35,7 +35,7 @@ #include <ardour/session.h> #include <ardour/control_protocol_manager.h> -#include "control_protocol.h" +#include <control_protocol/control_protocol.h> #include "i18n.h" diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 1d78c2fce0..16a8e5d922 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -48,7 +48,7 @@ #include <ardour/tempo.h> #include <ardour/utils.h> -#include "control_protocol.h" +#include <control_protocol/control_protocol.h> #include "ardour_ui.h" #include "editor.h" diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 9d0228dba6..60b4854600 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -326,23 +326,27 @@ GainMeter::update_meters () char buf[32]; for (n = 0, i = meters.begin(); i != meters.end(); ++i, ++n) { - if ((*i).packed) { - peak = _io.peak_input_power (n); + if ((*i).packed) { + peak = _io.peak_input_power (n); (*i).meter->set (log_meter (peak), peak); - - if (peak > max_peak) { - max_peak = peak; - /* set peak display */ - snprintf (buf, sizeof(buf), "%.1f", max_peak); - peak_display_label.set_text (buf); - - if (max_peak >= 0.0f) { - peak_display.set_name ("MixerStripPeakDisplayPeak"); - } - } - } - } + + if (peak > max_peak) { + max_peak = peak; + /* set peak display */ + if (max_peak <= -200.0f) { + peak_display_label.set_text (_("-inf")); + } else { + snprintf (buf, sizeof(buf), "%.1f", max_peak); + peak_display_label.set_text (buf); + } + + if (max_peak >= 0.0f) { + peak_display.set_name ("MixerStripPeakDisplayPeak"); + } + } + } + } } void diff --git a/gtk2_ardour/new_session_dialog.cc b/gtk2_ardour/new_session_dialog.cc index 88944aacb7..d1059cebe0 100644 --- a/gtk2_ardour/new_session_dialog.cc +++ b/gtk2_ardour/new_session_dialog.cc @@ -302,6 +302,11 @@ NewSessionDialog::NewSessionDialog() if (!path.empty()) { m_template->set_current_folder (path + X_("templates/")); } + + const std::string sys_templates_dir = ARDOUR::get_system_data_path() + X_("templates"); + if (Glib::file_test(sys_templates_dir, Glib::FILE_TEST_IS_DIR)) + m_template->add_shortcut_folder(sys_templates_dir); + m_template->set_title(_("select template")); Gtk::FileFilter* session_filter = manage (new (Gtk::FileFilter)); session_filter->add_pattern(X_("*.ardour")); |