along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
#include <limits.h>
#include <ardour/session_route.h>
#include <ardour/dB.h>
+#include <gtkmm/style.h>
+#include <gdkmm/color.h>
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/fastmeter.h>
#include <gtkmm2ext/stop_signal.h>
#include <gtkmm2ext/barcontroller.h>
+#include <gtkmm2ext/gtk_ui.h>
#include <midi++/manager.h>
#include <pbd/fastlog.h>
#include "logmeter.h"
#include "gui_thread.h"
#include "keyboard.h"
+#include "public_editor.h"
#include <ardour/session.h>
#include <ardour/route.h>
+#include <ardour/meter.h>
#include "i18n.h"
ignore_toggle = false;
meter_menu = 0;
next_release_selects = false;
+ style_changed = true;
gain_slider = manage (new VSliderController (slider,
&gain_adjustment,
gain_display.signal_focus_in_event().connect (mem_fun (*this, &GainMeter::gain_focused), false);
gain_display.signal_focus_out_event().connect (mem_fun (*this, &GainMeter::gain_focused), false);
+ gain_display_box.set_name ("MeterMetricsStrip");
gain_display_box.set_homogeneous (true);
gain_display_box.set_spacing (2);
gain_display_box.pack_start (gain_display, true, true);
peak_display.set_name ("MixerStripPeakDisplay");
- peak_display.set_has_frame (false);
- peak_display.set_editable (false);
+// peak_display.set_has_frame (false);
+// peak_display.set_editable (false);
set_size_request_to_display_given_text (peak_display, "-80.g", 2, 6); /* note the descender */
max_peak = minus_infinity();
- peak_display.set_text (_("-inf"));
+ peak_display.set_label (_("-inf"));
peak_display.unset_flags (Gtk::CAN_FOCUS);
meter_metric_area.set_name ("MeterMetricsStrip");
fader_vbox->pack_start (*fader_centering_box, false, false, 0);
hbox.set_spacing (2);
- hbox.pack_start (*fader_vbox, true, true);
- set_width(Narrow);
+ if (_io->default_type() == ARDOUR::DataType::AUDIO) {
+ hbox.pack_start (*fader_vbox, true, true);
+ }
+
+ set_width (Narrow);
Route* r;
using namespace Menu_Helpers;
- gain_astate_menu.items().push_back (MenuElem (_("Off"),
+ gain_astate_menu.items().push_back (MenuElem (_("Manual"),
bind (mem_fun (*_io, &IO::set_gain_automation_state), (AutoState) Off)));
gain_astate_menu.items().push_back (MenuElem (_("Play"),
bind (mem_fun (*_io, &IO::set_gain_automation_state), (AutoState) Play)));
ResetAllPeakDisplays.connect (mem_fun(*this, &GainMeter::reset_peak_display));
ResetGroupPeakDisplays.connect (mem_fun(*this, &GainMeter::reset_group_peak_display));
+
+ UI::instance()->theme_changed.connect (mem_fun(*this, &GainMeter::on_theme_changed));
}
void
Glib::RefPtr<Gdk::Pixmap>
GainMeter::render_metrics (Gtk::Widget& w)
{
+ //cerr << "GainMeter::render_metrics() called, red = " << w.get_style()->get_bg(Gtk::STATE_NORMAL).get_red() << endl;//DEBUG
Glib::RefPtr<Gdk::Window> win (w.get_window());
Glib::RefPtr<Gdk::GC> fg_gc (w.get_style()->get_fg_gc (Gtk::STATE_NORMAL));
Glib::RefPtr<Gdk::GC> bg_gc (w.get_style()->get_bg_gc (Gtk::STATE_NORMAL));
- gint x, y, width, height, depth;
+ gint width, height;
int db_points[] = { -50, -40, -20, -30, -10, -3, 0, 4 };
char buf[32];
- win->get_geometry (x, y, width, height, depth);
+ win->get_size (width, height);
Glib::RefPtr<Gdk::Pixmap> pixmap = Gdk::Pixmap::create (win, width, height);
gint
GainMeter::meter_metrics_expose (GdkEventExpose *ev)
{
+ /* Only draw dB scale if we're metering audio */
+ if (_io->n_inputs().n_audio() + _io->n_outputs().n_audio() == 0)
+ return true;
+
+ static Glib::RefPtr<Gtk::Style> meter_style;
+
+ if (style_changed) {
+ meter_style = meter_metric_area.get_style();
+ }
+
Glib::RefPtr<Gdk::Window> win (meter_metric_area.get_window());
- Glib::RefPtr<Gdk::GC> fg_gc (meter_metric_area.get_style()->get_fg_gc (Gtk::STATE_NORMAL));
- Glib::RefPtr<Gdk::GC> bg_gc (meter_metric_area.get_style()->get_bg_gc (Gtk::STATE_NORMAL));
+ Glib::RefPtr<Gdk::GC> fg_gc (meter_style->get_fg_gc (Gtk::STATE_NORMAL));
+ Glib::RefPtr<Gdk::GC> bg_gc (meter_style->get_bg_gc (Gtk::STATE_NORMAL));
+
GdkRectangle base_rect;
GdkRectangle draw_rect;
- gint x, y, width, height, depth;
+ gint width, height;
- win->get_geometry (x, y, width, height, depth);
+ win->get_size (width, height);
base_rect.width = width;
base_rect.height = height;
Glib::RefPtr<Gdk::Pixmap> pixmap;
std::map<string,Glib::RefPtr<Gdk::Pixmap> >::iterator i = metric_pixmaps.find (meter_metric_area.get_name());
- if (i == metric_pixmaps.end()) {
+ if (i == metric_pixmaps.end() || style_changed) {
pixmap = render_metrics (meter_metric_area);
} else {
pixmap = i->second;
gdk_rectangle_intersect (&ev->area, &base_rect, &draw_rect);
win->draw_rectangle (bg_gc, true, draw_rect.x, draw_rect.y, draw_rect.width, draw_rect.height);
- win->draw_drawable (bg_gc, pixmap, draw_rect.x, draw_rect.y, draw_rect.x, draw_rect.y, draw_rect.width, draw_rect.height);
+ win->draw_drawable (fg_gc, pixmap, draw_rect.x, draw_rect.y, draw_rect.x, draw_rect.y, draw_rect.width, draw_rect.height);
+ style_changed = false;
return true;
}
+void
+GainMeter::on_theme_changed()
+{
+ style_changed = true;
+}
+
GainMeter::~GainMeter ()
{
if (meter_menu) {
{
vector<MeterInfo>::iterator i;
uint32_t n;
- float peak;
+ float peak, mpeak;
char buf[32];
for (n = 0, i = meters.begin(); i != meters.end(); ++i, ++n) {
if ((*i).packed) {
- peak = _io->peak_input_power (n);
+ peak = _io->peak_meter().peak_power (n);
+
+ (*i).meter->set (log_meter (peak));
- (*i).meter->set (log_meter (peak), peak);
-
- if (peak > max_peak) {
- max_peak = peak;
+ mpeak = _io->peak_meter().max_peak_power(n);
+
+ if (mpeak > max_peak) {
+ max_peak = mpeak;
/* set peak display */
if (max_peak <= -200.0f) {
- peak_display.set_text (_("-inf"));
+ peak_display.set_label (_("-inf"));
} else {
snprintf (buf, sizeof(buf), "%.1f", max_peak);
- peak_display.set_text (buf);
+ peak_display.set_label (buf);
}
if (max_peak >= 0.0f) {
void
GainMeter::setup_meters ()
{
- uint32_t nmeters = _io->n_outputs();
+ uint32_t nmeters = _io->n_outputs().n_total();
guint16 width;
hide_all_meters ();
if ((r = dynamic_cast<Route*> (_io.get())) != 0) {
switch (r->meter_point()) {
- case MeterPreFader:
case MeterInput:
- nmeters = r->n_inputs();
+ nmeters = r->n_inputs().n_total();
+ break;
+ case MeterPreFader:
+ nmeters = r->pre_fader_streams().n_total();
break;
case MeterPostFader:
- nmeters = r->n_outputs();
+ nmeters = r->n_outputs().n_total();
break;
}
} else {
- nmeters = _io->n_outputs();
+ nmeters = _io->n_outputs().n_total();
}
/* pack them backwards */
if (_width == Wide) {
- meter_packer.pack_end (meter_metric_area, false, false);
+ meter_packer.pack_end (meter_metric_area, false, false);
meter_metric_area.show_all ();
}
}
}
+int
+GainMeter::get_gm_width ()
+{
+ Gtk::Requisition sz = hbox.size_request ();
+ return sz.width;
+}
+
bool
GainMeter::gain_key_press (GdkEventKey* ev)
{
void
GainMeter::reset_peak_display ()
{
- max_peak = minus_infinity();
- peak_display.set_text (_("-Inf"));
+ Route * r;
+ if ((r = dynamic_cast<Route*> (_io.get())) != 0) {
+ r->peak_meter().reset_max();
+ }
+
+ max_peak = -INFINITY;
+ peak_display.set_label (_("-Inf"));
peak_display.set_name ("MixerStripPeakDisplay");
}
case 1:
meters[which].meter->clear();
max_peak = minus_infinity();
- peak_display.set_text (_("-inf"));
+ peak_display.set_label (_("-inf"));
peak_display.set_name ("MixerStripPeakDisplay");
break;
f = min (f, 6.0f);
- _io->set_gain (dB_to_coefficient (f), this);
+ _io->set_gain (dB_to_coefficient(f), this);
+
+ if (gain_display.has_focus()) {
+ PublicEditor::instance().reset_focus();
+ }
}
}
switch (state) {
case Off:
- sstr = (shrt ? "O" : _("O"));
+ sstr = (shrt ? "M" : _("M"));
break;
case Play:
sstr = (shrt ? "P" : _("P"));
projects / ardour.git / blobdiff