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

use GDK event mask for Alt, rather than attempt platform-specific translation from ardour codebase meta-modifiers

Browse source
This commit is contained in:
Paul Davis 2014-11-19 08:26:35 -05:00
parent da486905be
commit 52f77a562b
1 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
gtk2_ardour/gain_meter.cc
View file

@ -63,12 +63,6 @@ using namespace std;
using Gtkmm2ext::Keyboard; using Gtkmm2ext::Keyboard;
using namespace ArdourMeter; using namespace ArdourMeter;
#if defined(__APPLE__)
#define ALT_OPTION (Keyboard::Level4Modifier)
#elif defined(PLATFORM_WINDOWS)
#define ALT_OPTION (Keyboard::SecondaryModifier)
#endif
GainMeter::GainMeter (Session* s, const std::string& layout_script_file) GainMeter::GainMeter (Session* s, const std::string& layout_script_file)
: Gtk::VBox () : Gtk::VBox ()
, WavesUI (layout_script_file, *this) , WavesUI (layout_script_file, *this)
@ -303,7 +297,8 @@ GainMeter::gain_display_button_press (GdkEventButton* ev)
{ {
switch (ev->type) { switch (ev->type) {
case GDK_BUTTON_PRESS: case GDK_BUTTON_PRESS:
if (Keyboard::modifier_state_contains (ev->state, ALT_OPTION)) { /* MOD1 == "Alt" */
if (Keyboard::modifier_state_contains (ev->state, GDK_MOD1_MASK)) {
_amp->set_gain (dB_to_coefficient(0.0), this); _amp->set_gain (dB_to_coefficient(0.0), this);
} }
break; break;
@ -687,7 +682,7 @@ GainMeter::gain_slider_button_press (GdkEventButton* ev)
{ {
switch (ev->type) { switch (ev->type) {
case GDK_BUTTON_PRESS: case GDK_BUTTON_PRESS:
if (Keyboard::modifier_state_contains (ev->state, ALT_OPTION)) { if (Keyboard::modifier_state_contains (ev->state, GDK_MOD1_MASK)) {
_amp->set_gain (dB_to_coefficient(0.0), this); _amp->set_gain (dB_to_coefficient(0.0), this);
return true; return true;
} }