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

NO-OP: whitespace

Browse source
This commit is contained in:
Robin Gareus 2019-10-21 16:06:29 +02:00
parent 35647577e0
commit 226cac95e7
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
2 changed files with 122 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

20
gtk2_ardour/virtual_keyboard_window.cc
View file

@ -18,15 +18,15 @@
#include <gtkmm/box.h> #include <gtkmm/box.h>
#include "pbd/convert.h"
#include "ardour/async_midi_port.h" #include "ardour/async_midi_port.h"
#include "ardour/session.h" #include "ardour/session.h"
#include "pbd/convert.h"
#include "widgets/tooltips.h" #include "widgets/tooltips.h"
#include "ardour_ui.h" #include "ardour_ui.h"
#include "virtual_keyboard_window.h"
#include "ui_config.h" #include "ui_config.h"
#include "utils.h" #include "utils.h"
#include "virtual_keyboard_window.h"
#include "pbd/i18n.h" #include "pbd/i18n.h"
@ -72,7 +72,7 @@ VirtualKeyboardWindow::VirtualKeyboardWindow ()
sigc::bind (sigc::mem_fun (*this, &VirtualKeyboardWindow::select_keyboard_layout), "AZERTY"))); sigc::bind (sigc::mem_fun (*this, &VirtualKeyboardWindow::select_keyboard_layout), "AZERTY")));
_keyboard_layout.AddMenuElem (MenuElem ("DVORAK", _keyboard_layout.AddMenuElem (MenuElem ("DVORAK",
sigc::bind (sigc::mem_fun (*this, &VirtualKeyboardWindow::select_keyboard_layout), "DVORAK"))); sigc::bind (sigc::mem_fun (*this, &VirtualKeyboardWindow::select_keyboard_layout), "DVORAK")));
_keyboard_layout.set_active (_("QWERTY")); _keyboard_layout.set_active ("QWERTY");
_cfg_display.set_active (false); _cfg_display.set_active (false);
_pgm_display.set_active (false); _pgm_display.set_active (false);
@ -84,10 +84,9 @@ VirtualKeyboardWindow::VirtualKeyboardWindow ()
_pitchbend = boost::shared_ptr<VKBDControl> (new VKBDControl ("PB", 8192, 16383)); _pitchbend = boost::shared_ptr<VKBDControl> (new VKBDControl ("PB", 8192, 16383));
_pitch_slider = manage (new VSliderController (&_pitch_adjustment, _pitchbend, 0, PX_SCALE (15))); _pitch_slider = manage (new VSliderController (&_pitch_adjustment, _pitchbend, 0, PX_SCALE (15)));
_pitch_slider_tooltip = new Gtkmm2ext::PersistentTooltip (_pitch_slider); _pitch_slider_tooltip = new Gtkmm2ext::PersistentTooltip (_pitch_slider);
_pitch_adjustment.signal_value_changed().connect (
sigc::mem_fun (*this, &VirtualKeyboardWindow::pitch_slider_adjusted)); _pitch_adjustment.signal_value_changed ().connect (sigc::mem_fun (*this, &VirtualKeyboardWindow::pitch_slider_adjusted));
_pitchbend->ValueChanged.connect_same_thread (_cc_connections, _pitchbend->ValueChanged.connect_same_thread (_cc_connections, boost::bind (&VirtualKeyboardWindow::pitch_bend_event_handler, this, _1));
boost::bind (&VirtualKeyboardWindow::pitch_bend_event_handler, this, _1));
set_tooltip (_highlight_grand_piano, "Shade keys outside the range of a Grand Piano (A0-C8)."); set_tooltip (_highlight_grand_piano, "Shade keys outside the range of a Grand Piano (A0-C8).");
set_tooltip (_highlight_key_range, "Indicate which notes can be controlled by keyboard-shortcuts."); set_tooltip (_highlight_key_range, "Indicate which notes can be controlled by keyboard-shortcuts.");
@ -498,14 +497,12 @@ VirtualKeyboardWindow::update_velocity_settings (int ctrl)
piano_keyboard_set_velocities (_piano, piano_keyboard_set_velocities (_piano,
_piano_min_velocity.get_value_as_int (), _piano_min_velocity.get_value_as_int (),
_piano_max_velocity.get_value_as_int (), _piano_max_velocity.get_value_as_int (),
_piano_key_velocity.get_value_as_int () _piano_key_velocity.get_value_as_int ());
);
} else { } else {
piano_keyboard_set_velocities (_piano, piano_keyboard_set_velocities (_piano,
_piano_key_velocity.get_value_as_int (), _piano_key_velocity.get_value_as_int (),
_piano_key_velocity.get_value_as_int (), _piano_key_velocity.get_value_as_int (),
_piano_key_velocity.get_value_as_int () _piano_key_velocity.get_value_as_int ());
);
} }
update_sensitivity (); update_sensitivity ();
} }
@ -527,7 +524,6 @@ VirtualKeyboardWindow::pitch_slider_adjusted ()
_pitch_slider_tooltip->set_tip (buf); _pitch_slider_tooltip->set_tip (buf);
} }
void void
VirtualKeyboardWindow::note_on_event_handler (int note, int velocity) VirtualKeyboardWindow::note_on_event_handler (int note, int velocity)
{ {

14
gtk2_ardour/virtual_keyboard_window.h
View file

@ -22,8 +22,8 @@
#include <gtkmm/box.h> #include <gtkmm/box.h>
#include <gtkmm/spinbutton.h> #include <gtkmm/spinbutton.h>
#include "pbd/signals.h"
#include "pbd/controllable.h" #include "pbd/controllable.h"
#include "pbd/signals.h"
#include "gtkmm2ext/persistent_tooltip.h" #include "gtkmm2ext/persistent_tooltip.h"
@ -39,7 +39,8 @@ namespace ARDOUR {
class Session; class Session;
} }
class VKBDControl : public PBD::Controllable { class VKBDControl : public PBD::Controllable
{
public: public:
VKBDControl (const std::string& name, double normal = 127, double upper = 127) VKBDControl (const std::string& name, double normal = 127, double upper = 127)
: PBD::Controllable (name, Flag (0)) : PBD::Controllable (name, Flag (0))
@ -50,7 +51,8 @@ public:
{} {}
/* Controllable API */ /* Controllable API */
void set_value (double v, PBD::Controllable::GroupControlDisposition gcd) { void set_value (double v, PBD::Controllable::GroupControlDisposition gcd)
{
if (v != _value) { if (v != _value) {
_value = std::max (_lower, std::min (_upper, v)); _value = std::max (_lower, std::min (_upper, v));
Changed (true, gcd); /* EMIT SIGNAL */ Changed (true, gcd); /* EMIT SIGNAL */
@ -58,10 +60,6 @@ public:
} }
} }
double get_value () const {
return _value;
}
std::string get_user_string () const std::string get_user_string () const
{ {
char buf[32]; char buf[32];
@ -69,6 +67,7 @@ public:
return std::string (buf); return std::string (buf);
} }
double get_value () const { return _value; }
double lower () const { return _lower; } double lower () const { return _lower; }
double upper () const { return _upper; } double upper () const { return _upper; }
double normal () const { return _normal; } double normal () const { return _normal; }
@ -82,7 +81,6 @@ protected:
double _value; double _value;
}; };
class VirtualKeyboardWindow : public ArdourWindow class VirtualKeyboardWindow : public ArdourWindow
{ {
public: public: