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

meter line-up and fall-off standard values & names

Browse source
This commit is contained in:
Robin Gareus 2013-07-06 01:40:57 +02:00
parent 8427faf1fb
commit c1f56d4d7c
5 changed files with 40 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

22
gtk2_ardour/rc_option_editor.cc
View file

@ -1914,13 +1914,15 @@ RCOptionEditor::RCOptionEditor ()
sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_falloff) sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_falloff)
); );
mfo->add (METER_FALLOFF_OFF, _("off")); mfo->add (METER_FALLOFF_OFF, _("off"));
mfo->add (METER_FALLOFF_SLOWEST, _("slowest")); mfo->add (METER_FALLOFF_SLOWEST, _("slowest [6.6dB/sec]"));
mfo->add (METER_FALLOFF_SLOW, _("slow")); mfo->add (METER_FALLOFF_SLOW, _("slow [8.6dB/sec] (BBC PPM, EBU PPM)"));
mfo->add (METER_FALLOFF_MEDIUM, _("medium")); mfo->add (METER_FALLOFF_SLOWISH, _("slowish [12.0dB/sec] (DIN)"));
mfo->add (METER_FALLOFF_FAST, _("fast")); mfo->add (METER_FALLOFF_MODERATE, _("moderate [13.3dB/sec] (EBU Digi PPM, IRT Digi PPM)"));
mfo->add (METER_FALLOFF_FASTER, _("faster")); mfo->add (METER_FALLOFF_MEDIUM, _("medium [20dB/sec]"));
mfo->add (METER_FALLOFF_FASTEST, _("fastest")); mfo->add (METER_FALLOFF_FAST, _("fast [32dB/sec]"));
mfo->add (METER_FALLOFF_FASTER, _("faster [46dB/sec]"));
mfo->add (METER_FALLOFF_FASTEST, _("fastest [70dB/sec]"));
add_option (S_("Preferences|GUI"), mfo); add_option (S_("Preferences|GUI"), mfo);
@ -1932,10 +1934,12 @@ RCOptionEditor::RCOptionEditor ()
); );
mlu->add (MeteringLineUp24, _("-24dB")); mlu->add (MeteringLineUp24, _("-24dB"));
mlu->add (MeteringLineUp20, _("-20dB")); mlu->add (MeteringLineUp20, _("-20dB (SMPTE)"));
mlu->add (MeteringLineUp18, _("-18dB")); mlu->add (MeteringLineUp18, _("-18dB (EBU)"));
mlu->add (MeteringLineUp15, _("-15dB")); mlu->add (MeteringLineUp15, _("-15dB"));
Gtkmm2ext::UI::instance()->set_tip (mlu->tip_widget(), _("Configure meter-ticks and color-knee point."));
add_option (S_("Preferences|GUI"), mlu); add_option (S_("Preferences|GUI"), mlu);
Gtk::Adjustment *mpk = manage (new Gtk::Adjustment(-.1, -10, 0, .01, .1)); Gtk::Adjustment *mpk = manage (new Gtk::Adjustment(-.1, -10, 0, .01, .1));

10
libs/ardour/ardour/types.h
View file

@ -308,10 +308,12 @@ namespace ARDOUR {
MeterFalloffOff = 0, MeterFalloffOff = 0,
MeterFalloffSlowest = 1, MeterFalloffSlowest = 1,
MeterFalloffSlow = 2, MeterFalloffSlow = 2,
MeterFalloffMedium = 3, MeterFalloffSlowish = 3,
MeterFalloffFast = 4, MeterFalloffModerate = 4,
MeterFalloffFaster = 5, MeterFalloffMedium = 5,
MeterFalloffFastest = 6 MeterFalloffFast = 6,
MeterFalloffFaster = 7,
MeterFalloffFastest = 8,
}; };
enum MeterHold { enum MeterHold {

16
libs/ardour/ardour/utils.h
View file

@ -149,13 +149,15 @@ double slider_position_to_gain_with_max (double g, double max_gain = 2.0);
* These rates are db/sec. * These rates are db/sec.
*/ */
#define METER_FALLOFF_OFF 0.0f #define METER_FALLOFF_OFF 0.0f
#define METER_FALLOFF_SLOWEST 6.6f // BBC standard #define METER_FALLOFF_SLOWEST 6.6f // BBC standard
#define METER_FALLOFF_SLOW 8.6f // BBC standard #define METER_FALLOFF_SLOW 8.6f // BBC standard, EBU 24dB / 2.8sec
#define METER_FALLOFF_MEDIUM 20.0f #define METER_FALLOFF_SLOWISH 12.0f // DIN 20dB / 1.7 sec
#define METER_FALLOFF_FAST 32.0f #define METER_FALLOFF_MODERATE 13.3f // EBU-PPM, IRT PPM- 20dB / 1.5 sec
#define METER_FALLOFF_FASTER 46.0f #define METER_FALLOFF_MEDIUM 20.0f
#define METER_FALLOFF_FASTEST 70.0f #define METER_FALLOFF_FAST 32.0f
#define METER_FALLOFF_FASTER 46.0f
#define METER_FALLOFF_FASTEST 70.0f
float meter_falloff_to_float (ARDOUR::MeterFalloff); float meter_falloff_to_float (ARDOUR::MeterFalloff);
ARDOUR::MeterFalloff meter_falloff_from_float (float); ARDOUR::MeterFalloff meter_falloff_from_float (float);

2
libs/ardour/enums.cc
View file

@ -194,6 +194,8 @@ setup_enum_writer ()
REGISTER_ENUM (MeterFalloffOff); REGISTER_ENUM (MeterFalloffOff);
REGISTER_ENUM (MeterFalloffSlowest); REGISTER_ENUM (MeterFalloffSlowest);
REGISTER_ENUM (MeterFalloffSlow); REGISTER_ENUM (MeterFalloffSlow);
REGISTER_ENUM (MeterFalloffSlowish);
REGISTER_ENUM (MeterFalloffModerate);
REGISTER_ENUM (MeterFalloffMedium); REGISTER_ENUM (MeterFalloffMedium);
REGISTER_ENUM (MeterFalloffFast); REGISTER_ENUM (MeterFalloffFast);
REGISTER_ENUM (MeterFalloffFaster); REGISTER_ENUM (MeterFalloffFaster);

10
libs/ardour/utils.cc
View file

@ -442,8 +442,12 @@ meter_falloff_to_float (MeterFalloff falloff)
return METER_FALLOFF_SLOWEST; return METER_FALLOFF_SLOWEST;
case MeterFalloffSlow: case MeterFalloffSlow:
return METER_FALLOFF_SLOW; return METER_FALLOFF_SLOW;
case MeterFalloffSlowish:
return METER_FALLOFF_SLOWISH;
case MeterFalloffMedium: case MeterFalloffMedium:
return METER_FALLOFF_MEDIUM; return METER_FALLOFF_MEDIUM;
case MeterFalloffModerate:
return METER_FALLOFF_MODERATE;
case MeterFalloffFast: case MeterFalloffFast:
return METER_FALLOFF_FAST; return METER_FALLOFF_FAST;
case MeterFalloffFaster: case MeterFalloffFaster:
@ -467,6 +471,12 @@ meter_falloff_from_float (float val)
else if (val <= METER_FALLOFF_SLOW) { else if (val <= METER_FALLOFF_SLOW) {
return MeterFalloffSlow; return MeterFalloffSlow;
} }
else if (val <= METER_FALLOFF_SLOWISH) {
return MeterFalloffSlowish;
}
else if (val <= METER_FALLOFF_MODERATE) {
return MeterFalloffModerate;
}
else if (val <= METER_FALLOFF_MEDIUM) { else if (val <= METER_FALLOFF_MEDIUM) {
return MeterFalloffMedium; return MeterFalloffMedium;
} }