smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 15:25:01 +01:00
Code Issues Projects Releases Wiki Activity

RecorderUI: handle meter-theme changes

Browse source
This commit is contained in:
Robin Gareus 2021-02-28 18:04:36 +01:00
parent b064b3c136
commit f8c75914c4
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
2 changed files with 74 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

94
gtk2_ardour/input_port_monitor.cc
View file

@ -46,6 +46,7 @@ InputPortMonitor::InputPortMonitor (ARDOUR::DataType dt, samplecnt_t sample_rate
, _audio_scope (0) , _audio_scope (0)
, _midi_meter (0) , _midi_meter (0)
, _midi_monitor (0) , _midi_monitor (0)
, _orientation (o)
{ {
if (o == Vertical) { if (o == Vertical) {
_box = new Gtk::HBox; _box = new Gtk::HBox;
@ -54,35 +55,10 @@ InputPortMonitor::InputPortMonitor (ARDOUR::DataType dt, samplecnt_t sample_rate
} }
if (_dt == DataType::AUDIO) { if (_dt == DataType::AUDIO) {
_audio_meter = new FastMeter ( setup_audio_meter ();
(uint32_t)floor (UIConfiguration::instance ().get_meter_hold ()),
18,
o == Vertical ? FastMeter::Vertical : FastMeter::Horizontal,
PX_SCALE (200),
UIConfiguration::instance ().color ("meter color0"),
UIConfiguration::instance ().color ("meter color1"),
UIConfiguration::instance ().color ("meter color2"),
UIConfiguration::instance ().color ("meter color3"),
UIConfiguration::instance ().color ("meter color4"),
UIConfiguration::instance ().color ("meter color5"),
UIConfiguration::instance ().color ("meter color6"),
UIConfiguration::instance ().color ("meter color7"),
UIConfiguration::instance ().color ("meter color8"),
UIConfiguration::instance ().color ("meter color9"),
UIConfiguration::instance ().color ("meter background bottom"),
UIConfiguration::instance ().color ("meter background top"),
0x991122ff, // red highlight gradient Bot
0x551111ff, // red highlight gradient Top
(115.0 * log_meter0dB (-18)),
89.125, // 115.0 * log_meter0dB(-9);
106.375, // 115.0 * log_meter0dB(-3);
115.0, // 115.0 * log_meter0dB(0);
(UIConfiguration::instance ().get_meter_style_led () ? 3 : 1));
_audio_scope = new InputScope (sample_rate, PX_SCALE (200), 25, o); _audio_scope = new InputScope (sample_rate, PX_SCALE (200), 25, o);
_audio_meter->show ();
if (UIConfiguration::instance ().get_input_meter_scopes ()) { if (UIConfiguration::instance ().get_input_meter_scopes ()) {
_audio_scope->show (); _audio_scope->show ();
} else { } else {
@ -91,9 +67,12 @@ InputPortMonitor::InputPortMonitor (ARDOUR::DataType dt, samplecnt_t sample_rate
ArdourWidgets::set_tooltip (_audio_scope, _("5 second history waveform")); ArdourWidgets::set_tooltip (_audio_scope, _("5 second history waveform"));
_box->pack_start (*_audio_meter, false, false); _box->pack_start (_bin, false, false);
_box->pack_start (*_audio_scope, true, true, 1); _box->pack_start (*_audio_scope, true, true, 1);
UIConfiguration::instance().ParameterChanged.connect (sigc::mem_fun (*this, &InputPortMonitor::parameter_changed));
UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &InputPortMonitor::color_handler));
} else if (_dt == DataType::MIDI) { } else if (_dt == DataType::MIDI) {
_midi_meter = new EventMeter (o); _midi_meter = new EventMeter (o);
_midi_monitor = new EventMonitor (o); _midi_monitor = new EventMonitor (o);
@ -124,6 +103,29 @@ InputPortMonitor::~InputPortMonitor ()
delete _box; delete _box;
} }
void
InputPortMonitor::parameter_changed (std::string const& p)
{
if (_audio_scope) {
_audio_scope->parameter_changed (p);
}
if (_audio_meter) {
if (p == "meter-hold") {
_audio_meter->set_hold_count ((uint32_t) floor(UIConfiguration::instance().get_meter_hold()));
} else if (p == "meter-style-led") {
setup_audio_meter ();
}
}
}
void
InputPortMonitor::color_handler ()
{
if (_audio_meter) {
setup_audio_meter ();
}
}
void void
InputPortMonitor::clear () InputPortMonitor::clear ()
{ {
@ -141,6 +143,43 @@ InputPortMonitor::clear ()
} }
} }
void
InputPortMonitor::setup_audio_meter ()
{
_bin.remove ();
delete _audio_meter;
_audio_meter = new FastMeter (
(uint32_t)floor (UIConfiguration::instance ().get_meter_hold ()),
18,
_orientation == Vertical ? FastMeter::Vertical : FastMeter::Horizontal,
PX_SCALE (200),
UIConfiguration::instance ().color ("meter color0"),
UIConfiguration::instance ().color ("meter color1"),
UIConfiguration::instance ().color ("meter color2"),
UIConfiguration::instance ().color ("meter color3"),
UIConfiguration::instance ().color ("meter color4"),
UIConfiguration::instance ().color ("meter color5"),
UIConfiguration::instance ().color ("meter color6"),
UIConfiguration::instance ().color ("meter color7"),
UIConfiguration::instance ().color ("meter color8"),
UIConfiguration::instance ().color ("meter color9"),
UIConfiguration::instance ().color ("meter background bottom"),
UIConfiguration::instance ().color ("meter background top"),
0x991122ff, // red highlight gradient Bot
0x551111ff, // red highlight gradient Top
(115.0 * log_meter0dB (-18)),
89.125, // 115.0 * log_meter0dB(-9);
106.375, // 115.0 * log_meter0dB(-3);
115.0, // 115.0 * log_meter0dB(0);
(UIConfiguration::instance ().get_meter_style_led () ? 3 : 1));
_bin.add (*_audio_meter);
_bin.show ();
_audio_meter->show ();
}
void void
InputPortMonitor::update (float l, float p) InputPortMonitor::update (float l, float p)
{ {
@ -181,7 +220,6 @@ InputPortMonitor::InputScope::InputScope (samplecnt_t rate, int l, int g, Orient
_surface = Cairo::ImageSurface::create (Cairo::FORMAT_ARGB32, l, g); _surface = Cairo::ImageSurface::create (Cairo::FORMAT_ARGB32, l, g);
use_image_surface (false); /* we already use a surface */ use_image_surface (false); /* we already use a surface */
UIConfiguration::instance().ParameterChanged.connect (sigc::mem_fun (*this, &InputScope::parameter_changed));
parameter_changed ("waveform-clip-level"); parameter_changed ("waveform-clip-level");
parameter_changed ("show-waveform-clipping"); parameter_changed ("show-waveform-clipping");
parameter_changed ("waveform-scale"); parameter_changed ("waveform-scale");

9
gtk2_ardour/input_port_monitor.h
View file

@ -20,6 +20,7 @@
#define __gtk_ardour_input_port_monitor_h__ #define __gtk_ardour_input_port_monitor_h__
#include <gtkmm/box.h> #include <gtkmm/box.h>
#include <gtkmm/alignment.h>
#include "gtkmm2ext/cairo_widget.h" #include "gtkmm2ext/cairo_widget.h"
@ -55,6 +56,7 @@ private:
InputScope (ARDOUR::samplecnt_t, int length , int gauge, Orientation); InputScope (ARDOUR::samplecnt_t, int length , int gauge, Orientation);
void update (ARDOUR::CircularSampleBuffer&); void update (ARDOUR::CircularSampleBuffer&);
void clear (); void clear ();
void parameter_changed (std::string const&);
protected: protected:
void render (Cairo::RefPtr<Cairo::Context> const&, cairo_rectangle_t*); void render (Cairo::RefPtr<Cairo::Context> const&, cairo_rectangle_t*);
@ -62,7 +64,6 @@ private:
void on_size_allocate (Gtk::Allocation&); void on_size_allocate (Gtk::Allocation&);
private: private:
void parameter_changed (std::string const&);
int _pos; int _pos;
ARDOUR::samplecnt_t _rate; ARDOUR::samplecnt_t _rate;
@ -118,12 +119,18 @@ private:
Orientation _orientation; Orientation _orientation;
}; };
void setup_audio_meter ();
void color_handler ();
void parameter_changed (std::string const&);
Gtk::Box* _box; Gtk::Box* _box;
Gtk::Alignment _bin;
ARDOUR::DataType _dt; ARDOUR::DataType _dt;
ArdourWidgets::FastMeter* _audio_meter; ArdourWidgets::FastMeter* _audio_meter;
InputScope* _audio_scope; InputScope* _audio_scope;
EventMeter* _midi_meter; EventMeter* _midi_meter;
EventMonitor* _midi_monitor; EventMonitor* _midi_monitor;
Orientation _orientation;
}; };
#endif #endif