NO-OP: whitespace
This commit is contained in:
parent
35647577e0
commit
226cac95e7
@ -18,15 +18,15 @@
|
||||
|
||||
#include <gtkmm/box.h>
|
||||
|
||||
#include "pbd/convert.h"
|
||||
#include "ardour/async_midi_port.h"
|
||||
#include "ardour/session.h"
|
||||
#include "pbd/convert.h"
|
||||
#include "widgets/tooltips.h"
|
||||
|
||||
#include "ardour_ui.h"
|
||||
#include "virtual_keyboard_window.h"
|
||||
#include "ui_config.h"
|
||||
#include "utils.h"
|
||||
#include "virtual_keyboard_window.h"
|
||||
|
||||
#include "pbd/i18n.h"
|
||||
|
||||
@ -72,7 +72,7 @@ VirtualKeyboardWindow::VirtualKeyboardWindow ()
|
||||
sigc::bind (sigc::mem_fun (*this, &VirtualKeyboardWindow::select_keyboard_layout), "AZERTY")));
|
||||
_keyboard_layout.AddMenuElem (MenuElem ("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);
|
||||
_pgm_display.set_active (false);
|
||||
@ -84,10 +84,9 @@ VirtualKeyboardWindow::VirtualKeyboardWindow ()
|
||||
_pitchbend = boost::shared_ptr<VKBDControl> (new VKBDControl ("PB", 8192, 16383));
|
||||
_pitch_slider = manage (new VSliderController (&_pitch_adjustment, _pitchbend, 0, PX_SCALE (15)));
|
||||
_pitch_slider_tooltip = new Gtkmm2ext::PersistentTooltip (_pitch_slider);
|
||||
_pitch_adjustment.signal_value_changed().connect (
|
||||
sigc::mem_fun (*this, &VirtualKeyboardWindow::pitch_slider_adjusted));
|
||||
_pitchbend->ValueChanged.connect_same_thread (_cc_connections,
|
||||
boost::bind (&VirtualKeyboardWindow::pitch_bend_event_handler, this, _1));
|
||||
|
||||
_pitch_adjustment.signal_value_changed ().connect (sigc::mem_fun (*this, &VirtualKeyboardWindow::pitch_slider_adjusted));
|
||||
_pitchbend->ValueChanged.connect_same_thread (_cc_connections, 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_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_min_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 {
|
||||
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 ());
|
||||
}
|
||||
update_sensitivity ();
|
||||
}
|
||||
@ -527,7 +524,6 @@ VirtualKeyboardWindow::pitch_slider_adjusted ()
|
||||
_pitch_slider_tooltip->set_tip (buf);
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
VirtualKeyboardWindow::note_on_event_handler (int note, int velocity)
|
||||
{
|
||||
|
@ -22,8 +22,8 @@
|
||||
#include <gtkmm/box.h>
|
||||
#include <gtkmm/spinbutton.h>
|
||||
|
||||
#include "pbd/signals.h"
|
||||
#include "pbd/controllable.h"
|
||||
#include "pbd/signals.h"
|
||||
|
||||
#include "gtkmm2ext/persistent_tooltip.h"
|
||||
|
||||
@ -39,7 +39,8 @@ namespace ARDOUR {
|
||||
class Session;
|
||||
}
|
||||
|
||||
class VKBDControl : public PBD::Controllable {
|
||||
class VKBDControl : public PBD::Controllable
|
||||
{
|
||||
public:
|
||||
VKBDControl (const std::string& name, double normal = 127, double upper = 127)
|
||||
: PBD::Controllable (name, Flag (0))
|
||||
@ -50,7 +51,8 @@ public:
|
||||
{}
|
||||
|
||||
/* Controllable API */
|
||||
void set_value (double v, PBD::Controllable::GroupControlDisposition gcd) {
|
||||
void set_value (double v, PBD::Controllable::GroupControlDisposition gcd)
|
||||
{
|
||||
if (v != _value) {
|
||||
_value = std::max (_lower, std::min (_upper, v));
|
||||
Changed (true, gcd); /* EMIT SIGNAL */
|
||||
@ -58,10 +60,6 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
double get_value () const {
|
||||
return _value;
|
||||
}
|
||||
|
||||
std::string get_user_string () const
|
||||
{
|
||||
char buf[32];
|
||||
@ -69,6 +67,7 @@ public:
|
||||
return std::string (buf);
|
||||
}
|
||||
|
||||
double get_value () const { return _value; }
|
||||
double lower () const { return _lower; }
|
||||
double upper () const { return _upper; }
|
||||
double normal () const { return _normal; }
|
||||
@ -82,7 +81,6 @@ protected:
|
||||
double _value;
|
||||
};
|
||||
|
||||
|
||||
class VirtualKeyboardWindow : public ArdourWindow
|
||||
{
|
||||
public:
|
||||
|
Loading…
Reference in New Issue
Block a user