diff --git a/ardour.rc.in b/ardour.rc.in
index 710bc21a21..bbc0f091ec 100644
--- a/ardour.rc.in
+++ b/ardour.rc.in
@@ -37,6 +37,7 @@
+
diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
index 00d15d29f1..388a416143 100644
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -174,6 +174,7 @@ keyboard.cc
keyeditor.cc
ladspa_pluginui.cc
latency_gui.cc
+level_meter.cc
location_ui.cc
main.cc
marker.cc
diff --git a/gtk2_ardour/ardour.menus b/gtk2_ardour/ardour.menus
index 0c374bbd67..6bcc0d7898 100644
--- a/gtk2_ardour/ardour.menus
+++ b/gtk2_ardour/ardour.menus
@@ -385,6 +385,7 @@
+
diff --git a/gtk2_ardour/ardour2_ui_default.conf b/gtk2_ardour/ardour2_ui_default.conf
index 2d2c0fb73c..43c6027563 100644
--- a/gtk2_ardour/ardour2_ui_default.conf
+++ b/gtk2_ardour/ardour2_ui_default.conf
@@ -83,6 +83,10 @@
+
+
+
+
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index 74400396af..0cbc9935bf 100644
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -723,6 +723,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
void toggle_RegionEquivalentsOverlap ();
void toggle_PrimaryClockDeltaEditCursor ();
void toggle_SecondaryClockDeltaEditCursor ();
+ void toggle_ShowTrackMeters ();
void toggle_only_copy_imported_files ();
void mtc_port_changed ();
diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index 7f4a0a1e69..38aae959cf 100644
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -418,8 +418,9 @@ ARDOUR_UI::install_actions ()
ActionManager::register_toggle_action (option_actions, X_("GainReduceFastTransport"), _("-12dB gain reduce ffwd/rewind"), mem_fun (*this, &ARDOUR_UI::toggle_GainReduceFastTransport));
ActionManager::register_toggle_action (option_actions, X_("LatchedRecordEnable"), _("Rec-enable stays engaged at stop"), mem_fun (*this, &ARDOUR_UI::toggle_LatchedRecordEnable));
ActionManager::register_toggle_action (option_actions, X_("RegionEquivalentsOverlap"), _("Region equivalents overlap"), mem_fun (*this, &ARDOUR_UI::toggle_RegionEquivalentsOverlap));
- ActionManager::register_toggle_action (option_actions, X_("PrimaryClockDeltaEditCursor"), _("Primary Clock delta to edit cursor"), mem_fun (*this, &ARDOUR_UI::toggle_PrimaryClockDeltaEditCursor));
- ActionManager::register_toggle_action (option_actions, X_("SecondaryClockDeltaEditCursor"), _("Secondary Clock delta to edit cursor"), mem_fun (*this, &ARDOUR_UI::toggle_SecondaryClockDeltaEditCursor));
+ ActionManager::register_toggle_action (option_actions, X_("PrimaryClockDeltaEditCursor"), _("Primary Clock delta to edit point"), mem_fun (*this, &ARDOUR_UI::toggle_PrimaryClockDeltaEditCursor));
+ ActionManager::register_toggle_action (option_actions, X_("SecondaryClockDeltaEditCursor"), _("Secondary Clock delta to edit point"), mem_fun (*this, &ARDOUR_UI::toggle_SecondaryClockDeltaEditCursor));
+ ActionManager::register_toggle_action (option_actions, X_("ShowTrackMeters"), _("Display Editor Meters"), mem_fun (*this, &ARDOUR_UI::toggle_ShowTrackMeters));
ActionManager::register_toggle_action (option_actions, X_("OnlyCopyImportedFiles"), _("Always copy imported files"), mem_fun (*this, &ARDOUR_UI::toggle_only_copy_imported_files));
RadioAction::Group denormal_group;
@@ -464,6 +465,7 @@ ARDOUR_UI::install_actions ()
act = ActionManager::register_toggle_action (option_actions, X_("DoNotRunPluginsWhileRecording"), _("Do not run plugins while recording"), mem_fun (*this, &ARDOUR_UI::toggle_DoNotRunPluginsWhileRecording));
ActionManager::session_sensitive_actions.push_back (act);
+
act = ActionManager::register_toggle_action (option_actions, X_("LatchedSolo"), _("Latched solo"), mem_fun (*this, &ARDOUR_UI::toggle_LatchedSolo));
ActionManager::session_sensitive_actions.push_back (act);
act = ActionManager::register_toggle_action (option_actions, X_("ShowSoloMutes"), _("Show solo muting"), mem_fun (*this, &ARDOUR_UI::toggle_ShowSoloMutes));
diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc
index b63d17266b..56c4ac649f 100644
--- a/gtk2_ardour/ardour_ui_options.cc
+++ b/gtk2_ardour/ardour_ui_options.cc
@@ -510,6 +510,12 @@ ARDOUR_UI::toggle_SecondaryClockDeltaEditCursor()
ActionManager::toggle_config_state ("options", "SecondaryClockDeltaEditCursor", &Configuration::set_secondary_clock_delta_edit_cursor, &Configuration::get_secondary_clock_delta_edit_cursor);
}
+void
+ARDOUR_UI::toggle_ShowTrackMeters()
+{
+ ActionManager::toggle_config_state ("options", "ShowTrackMeters", &Configuration::set_show_track_meters, &Configuration::get_show_track_meters);
+}
+
void
ARDOUR_UI::mtc_port_changed ()
{
diff --git a/gtk2_ardour/canvas_vars.h b/gtk2_ardour/canvas_vars.h
index c0822d8e9c..5c682c5aa1 100644
--- a/gtk2_ardour/canvas_vars.h
+++ b/gtk2_ardour/canvas_vars.h
@@ -80,6 +80,10 @@ CANVAS_VARIABLE(canvasvar_TrimHandleLocked, "trim handle locked")
CANVAS_VARIABLE(canvasvar_TrimHandle, "trim handle")
CANVAS_VARIABLE(canvasvar_EditPoint, "edit point")
CANVAS_VARIABLE(canvasvar_PlayHead, "play head")
+CANVAS_VARIABLE(canvasvar_MeterColorBase, "MeterColorBase")
+CANVAS_VARIABLE(canvasvar_MeterColorMid, "MeterColorMid")
+CANVAS_VARIABLE(canvasvar_MeterColorTop, "MeterColorTop")
+CANVAS_VARIABLE(canvasvar_MeterColorClip, "MeterColorClip")
CANVAS_VARIABLE(canvasvar_MidiSelectRectOutline, "midi select rect outline")
CANVAS_VARIABLE(canvasvar_MidiSelectRectFill, "midi select rect fill")
CANVAS_VARIABLE(canvasvar_MidiNoteOutlineMin, "midi note outline min")
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 2acf76fc6c..bd0f91ad21 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -2035,6 +2035,14 @@ class Editor : public PublicEditor
RegionSelection tmp_regions;
RegionSelection& get_regions_for_action ();
+
+ sigc::connection fast_screen_update_connection;
+ gint start_updating ();
+ gint stop_updating ();
+ void toggle_meter_updating();
+ void fast_update_strips ();
+
+ bool meters_running;
};
#endif /* __ardour_editor_h__ */
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index 5a0542f5d1..8b607f5080 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -1208,7 +1208,9 @@ Editor::parameter_changed (const char* parameter_name)
} else if (PARAM_IS ("subframes-per-frame")) {
update_subframes_per_frame ();
update_just_smpte ();
- }
+ } else if (PARAM_IS ("show-track-meters")) {
+ toggle_meter_updating();
+ }
#undef PARAM_IS
}
diff --git a/gtk2_ardour/editor_audiotrack.cc b/gtk2_ardour/editor_audiotrack.cc
index 87fa8a06b8..43f63eed79 100644
--- a/gtk2_ardour/editor_audiotrack.cc
+++ b/gtk2_ardour/editor_audiotrack.cc
@@ -20,9 +20,11 @@
#include
#include
+#include "ardour_ui.h"
#include "editor.h"
#include "editing.h"
#include "audio_time_axis.h"
+#include "route_time_axis.h"
#include "audio_region_view.h"
#include "selection.h"
@@ -91,3 +93,68 @@ Editor::set_show_waveforms_recording (bool yn)
}
}
}
+
+gint
+Editor::start_updating ()
+{
+ RouteTimeAxisView* rtv;
+
+ //cerr << "Editor::start_updating () called" << endl;//DEBUG
+ if (is_mapped() && session) {
+ for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
+ if ((rtv = dynamic_cast(*i)) != 0) {
+ rtv->reset_meter ();
+ }
+ }
+ }
+
+ if (!meters_running) {
+ fast_screen_update_connection = ARDOUR_UI::SuperRapidScreenUpdate.connect (mem_fun(*this, &Editor::fast_update_strips));
+ meters_running = true;
+ }
+ return 0;
+}
+
+gint
+Editor::stop_updating ()
+{
+ RouteTimeAxisView* rtv;
+
+ meters_running = false;
+ fast_screen_update_connection.disconnect();
+ //cerr << "Editor::stop_updating () called" << endl;//DEBUG
+ if (is_mapped() && session) {
+ for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
+ if ((rtv = dynamic_cast(*i)) != 0) {
+ rtv->hide_meter ();
+ }
+ }
+ }
+
+ return 0;
+}
+
+void
+Editor::toggle_meter_updating()
+{
+ if (Config->get_show_track_meters()) {
+ start_updating();
+ } else {
+ stop_updating ();
+ }
+}
+
+void
+Editor::fast_update_strips ()
+{
+ RouteTimeAxisView* rtv;
+
+ if (is_mapped() && session) {
+ for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
+ if ((rtv = dynamic_cast(*i)) != 0) {
+ rtv->fast_update ();
+ }
+ }
+ }
+}
+
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index 9b4823c90c..dae51935ec 100644
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -77,7 +77,8 @@ GainMeter::GainMeter (boost::shared_ptr io, Session& s)
// 0.781787 is the value needed for gain to be set to 0.
gain_adjustment (0.781787, 0.0, 1.0, 0.01, 0.1),
gain_automation_style_button (""),
- gain_automation_state_button ("")
+ gain_automation_state_button (""),
+ regular_meter_width(5)
{
if (slider == 0) {
@@ -235,7 +236,7 @@ GainMeter::GainMeter (boost::shared_ptr io, Session& s)
}
void
-GainMeter::set_width (Width w)
+GainMeter::set_width (Width w, int len)
{
switch (w) {
case Wide:
@@ -247,7 +248,7 @@ GainMeter::set_width (Width w)
}
_width = w;
- setup_meters ();
+ setup_meters (len);
}
Glib::RefPtr
@@ -432,7 +433,7 @@ GainMeter::hide_all_meters ()
}
void
-GainMeter::setup_meters ()
+GainMeter::setup_meters (int len)
{
uint32_t nmeters = _io->n_outputs().n_total();
guint16 width;
@@ -483,11 +484,11 @@ GainMeter::setup_meters ()
}
for (int32_t n = nmeters-1; nmeters && n >= 0 ; --n) {
- if (meters[n].width != width) {
+ if (meters[n].width != width || meters[n].length != len) {
delete meters[n].meter;
- meters[n].meter = new FastMeter ((uint32_t) floor (Config->get_meter_hold()), width, FastMeter::Vertical);
+ meters[n].meter = new FastMeter ((uint32_t) floor (Config->get_meter_hold()), width, FastMeter::Vertical, len);
meters[n].width = width;
-
+ meters[n].length = len;
meters[n].meter->add_events (Gdk::BUTTON_RELEASE_MASK);
meters[n].meter->signal_button_release_event().connect (bind (mem_fun(*this, &GainMeter::meter_button_release), n));
}
diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h
index 3839221e73..969757313c 100644
--- a/gtk2_ardour/gain_meter.h
+++ b/gtk2_ardour/gain_meter.h
@@ -67,8 +67,8 @@ class GainMeter : public Gtk::VBox
void effective_gain_display ();
- void set_width (Width);
- void setup_meters ();
+ void set_width (Width, int len=0);
+ void setup_meters (int len=0);
int get_gm_width ();
@@ -129,17 +129,19 @@ class GainMeter : public Gtk::VBox
struct MeterInfo {
Gtkmm2ext::FastMeter *meter;
- gint16 width;
+ gint16 width;
+ int length;
bool packed;
MeterInfo() {
meter = 0;
width = 0;
+ length = 0;
packed = false;
}
};
- static const guint16 regular_meter_width = 5;
+ guint16 regular_meter_width;
static const guint16 thin_meter_width = 2;
vector meters;
float max_peak;
diff --git a/gtk2_ardour/ladspa_pluginui.cc b/gtk2_ardour/ladspa_pluginui.cc
index ad1f8fbc7e..f4123c7d8c 100644
--- a/gtk2_ardour/ladspa_pluginui.cc
+++ b/gtk2_ardour/ladspa_pluginui.cc
@@ -517,7 +517,7 @@ LadspaPluginUI::build_control_ui (guint32 port_index, boost::shared_ptrmeterinfo = info;
- info->meter = new FastMeter (5, 100, FastMeter::Vertical);
+ info->meter = new FastMeter (5, 5, FastMeter::Vertical);
info->min_unbound = desc.min_unbound;
info->max_unbound = desc.max_unbound;
diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc
new file mode 100644
index 0000000000..f4f8e8952f
--- /dev/null
+++ b/gtk2_ardour/level_meter.cc
@@ -0,0 +1,223 @@
+/*
+ Copyright (C) 2002 Paul Davis
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "ardour_ui.h"
+#include "level_meter.h"
+#include "utils.h"
+#include "logmeter.h"
+#include "gui_thread.h"
+#include "keyboard.h"
+#include "public_editor.h"
+
+#include
+#include
+#include
+
+#include "i18n.h"
+
+using namespace ARDOUR;
+using namespace PBD;
+using namespace Gtkmm2ext;
+using namespace Gtk;
+using namespace sigc;
+using namespace std;
+
+//sigc::signal LevelMeter::ResetAllPeakDisplays;
+//sigc::signal LevelMeter::ResetGroupPeakDisplays;
+
+
+LevelMeter::LevelMeter (boost::shared_ptr io, Session& s)
+ : _io (io),
+ _session (s)
+
+{
+ set_spacing (1);
+ Config->ParameterChanged.connect (mem_fun (*this, &LevelMeter::parameter_changed));
+ UI::instance()->theme_changed.connect (mem_fun(*this, &LevelMeter::on_theme_changed));
+ ColorsChanged.connect (mem_fun (*this, &LevelMeter::color_handler));
+}
+
+void
+LevelMeter::on_theme_changed()
+{
+ style_changed = true;
+}
+
+LevelMeter::~LevelMeter ()
+{
+ for (vector::iterator i = meters.begin(); i != meters.end(); i++) {
+ if ((*i).meter) {
+ delete (*i).meter;
+ }
+ }
+}
+
+void
+LevelMeter::update_meters ()
+{
+ vector::iterator i;
+ uint32_t n;
+ float peak, mpeak;
+
+ for (n = 0, i = meters.begin(); i != meters.end(); ++i, ++n) {
+ if ((*i).packed) {
+ peak = _io->peak_meter().peak_power (n);
+ (*i).meter->set (log_meter (peak));
+ mpeak = _io->peak_meter().max_peak_power(n);
+ }
+ }
+}
+
+void
+LevelMeter::parameter_changed(const char* parameter_name)
+{
+#define PARAM_IS(x) (!strcmp (parameter_name, (x)))
+
+ ENSURE_GUI_THREAD (bind (mem_fun(*this, &LevelMeter::parameter_changed), parameter_name));
+
+ if (PARAM_IS ("meter-hold")) {
+
+ vector::iterator i;
+ uint32_t n;
+
+ for (n = 0, i = meters.begin(); i != meters.end(); ++i, ++n) {
+
+ (*i).meter->set_hold_count ((uint32_t) floor(Config->get_meter_hold()));
+ }
+ }
+
+#undef PARAM_IS
+}
+
+void
+LevelMeter::hide_all_meters ()
+{
+
+ for (vector::iterator i = meters.begin(); i != meters.end(); ++i) {
+ if ((*i).packed) {
+ remove (*((*i).meter));
+ (*i).packed = false;
+ }
+ }
+}
+
+void
+LevelMeter::setup_meters (int len)
+{
+ uint32_t nmeters = _io->n_outputs().n_total();
+ guint16 width;
+
+ hide_all_meters ();
+
+ Route* r;
+
+ if ((r = dynamic_cast (_io.get())) != 0) {
+
+ switch (r->meter_point()) {
+ case MeterInput:
+ nmeters = r->n_inputs().n_total();
+ break;
+ case MeterPreFader:
+ nmeters = r->pre_fader_streams().n_total();
+ break;
+ case MeterPostFader:
+ nmeters = r->n_outputs().n_total();
+ break;
+ }
+
+ } else {
+
+ nmeters = _io->n_outputs().n_total();
+
+ }
+
+ if (nmeters == 0) {
+ return;
+ }
+
+ if (nmeters <= 2) {
+ width = regular_meter_width;
+ } else {
+ width = thin_meter_width;
+ }
+
+ while (meters.size() < nmeters) {
+ meters.push_back (MeterInfo());
+ }
+
+
+ int b = ARDOUR_UI::config()->canvasvar_MeterColorBase.get();
+ int m = ARDOUR_UI::config()->canvasvar_MeterColorMid.get();
+ int t = ARDOUR_UI::config()->canvasvar_MeterColorTop.get();
+ int c = ARDOUR_UI::config()->canvasvar_MeterColorClip.get();
+
+ //cerr << "LevelMeter::setup_meters() called color_changed = " << color_changed << " colors: " << endl;//DEBUG
+
+ for (int32_t n = nmeters-1; nmeters && n >= 0 ; --n) {
+ if (meters[n].width != width || meters[n].length != len || color_changed) {
+ delete meters[n].meter;
+ meters[n].meter = new FastMeter ((uint32_t) floor (Config->get_meter_hold()), width, FastMeter::Vertical, len, b, m, t, c);
+ //cerr << "LevelMeter::setup_meters() w:l = " << width << ":" << len << endl;//DEBUG
+ meters[n].width = width;
+ meters[n].length = len;
+ meters[n].meter->add_events (Gdk::BUTTON_RELEASE_MASK);
+ }
+
+ pack_end (*meters[n].meter, false, false);
+ meters[n].meter->show_all ();
+ meters[n].packed = true;
+ }
+ show();
+ color_changed = false;
+}
+
+void LevelMeter::clear_meters ()
+{
+ for (vector::iterator i = meters.begin(); i < meters.end(); i++) {
+ (*i).meter->clear();
+ }
+}
+
+void LevelMeter::hide_meters ()
+{
+ hide_all_meters();
+}
+
+void
+LevelMeter::color_handler ()
+{
+ color_changed = true;
+}
+
diff --git a/gtk2_ardour/level_meter.h b/gtk2_ardour/level_meter.h
new file mode 100644
index 0000000000..dfae72a576
--- /dev/null
+++ b/gtk2_ardour/level_meter.h
@@ -0,0 +1,109 @@
+/*
+ Copyright (C) 2002 Paul Davis
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifndef __ardour_gtk_track_meter_h__
+#define __ardour_gtk_track_meter_h__
+
+#include
+#include