*/
#include <string>
-#include <climits>
-
-#include <midi++/controllable.h>
#include <gtkmm2ext/gtk_ui.h>
+#include <gtkmm2ext/pixfader.h>
#include <gtkmm2ext/slider_controller.h>
-#include <gtkmm2ext/pix.h>
+#include "pbd/controllable.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace Gtkmm2ext;
-
-SliderController::SliderController (Pix *pixset,
- Gtk::Adjustment *adj,
- MIDI::Controllable *mc,
- bool with_numeric)
-
- : PixScroller (*adj, *pixset),
- spin (*adj, 0, 2),
- prompter (Gtk::WIN_POS_MOUSE, 30000, false),
- midi_control (mc),
- bind_button (2),
- bind_statemask (Gdk::CONTROL_MASK)
-
-{
- pixset->generate ();
-
- signal_button_press_event().connect (mem_fun (this, &SliderController::button_press));
- spin.set_name ("SliderControllerValue");
- spin.set_size_request (70,-1); // should be based on font size somehow
- spin.set_numeric (true);
- spin.set_snap_to_ticks (false);
-
- prompter.signal_unmap_event().connect (mem_fun (*this, &SliderController::prompter_hiding));
-
- prompting = false;
- unprompting = false;
-
- if (mc) {
- mc->learning_started.connect (mem_fun (*this, &SliderController::midicontrol_prompt));
- mc->learning_stopped.connect (mem_fun (*this, &SliderController::midicontrol_unprompt));
- }
-}
-
-void
-SliderController::set_value (float v)
+using namespace PBD;
+
+SliderController::SliderController (Gtk::Adjustment *adj, boost::shared_ptr<PBD::Controllable> mc, int orientation, int fader_length, int fader_girth)
+ : PixFader (*adj, orientation, fader_length, fader_girth)
+ , _ctrl (mc)
+ , _ctrl_adj (adj)
+ , _spin_adj (0, 0, 1.0, .1, .01)
+ , _spin (_spin_adj, 0, 2)
+ , _ctrl_ignore (false)
+ , _spin_ignore (false)
{
- adj.set_value (v);
-}
-
-void
-SliderController::set_bind_button_state (guint button, guint statemask)
-{
- bind_button = button;
- bind_statemask = statemask;
-}
+ if (mc) {
+ _spin_adj.set_lower (mc->lower ());
+ _spin_adj.set_upper (mc->upper ());
+ _spin_adj.set_step_increment(_ctrl->interface_to_internal(adj->get_step_increment()) - mc->lower ());
+ _spin_adj.set_page_increment(_ctrl->interface_to_internal(adj->get_page_increment()) - mc->lower ());
-void
-SliderController::get_bind_button_state (guint &button, guint &statemask)
-{
- button = bind_button;
- statemask = bind_statemask;
-}
+ adj->signal_value_changed().connect (sigc::mem_fun(*this, &SliderController::ctrl_adjusted));
+ _spin_adj.signal_value_changed().connect (sigc::mem_fun(*this, &SliderController::spin_adjusted));
-void
-SliderController::midi_learn()
-{
- if (midi_control) {
- prompting = true;
- midi_control->learn_about_external_control ();
+ _binding_proxy.set_controllable (mc);
}
+
+ _spin.set_name ("SliderControllerValue");
+ _spin.set_numeric (true);
+ _spin.set_snap_to_ticks (false);
}
bool
-SliderController::button_press (GdkEventButton *ev)
+SliderController::on_button_press_event (GdkEventButton *ev)
{
- if ((ev->state & bind_statemask) && ev->button == bind_button) {
- midi_learn ();
+ if (_binding_proxy.button_press_handler (ev)) {
return true;
}
- return false;
+ return PixFader::on_button_press_event (ev);
}
void
-SliderController::midicontrol_set_tip ()
-
-{
- if (midi_control) {
- // Gtkmm2ext::UI::instance()->set_tip (this, midi_control->control_description());
- }
-}
-
-bool
-SliderController::prompter_hiding (GdkEventAny *ev)
+SliderController::ctrl_adjusted ()
{
- if (unprompting) {
- if (midi_control) {
- midi_control->stop_learning();
- }
- unprompting = false;
- }
-
- return false;
+ assert (_ctrl); // only used w/BarControlle
+ if (_spin_ignore) return;
+ _ctrl_ignore = true;
+ // TODO consider using internal_to_user, too (amp, dB)
+ // (also needs _spin_adj min/max range changed accordingly
+ // and dedicated support for log-scale, revert parts of ceff2e3a62f839)
+ _spin_adj.set_value (_ctrl->interface_to_internal (_ctrl_adj->get_value()));
+ _ctrl_ignore = false;
}
void
-SliderController::midicontrol_prompt ()
-
+SliderController::spin_adjusted ()
{
- if (prompting) {
-
- string prompt = _("operate MIDI controller now");
- prompter.set_text (prompt);
- Gtkmm2ext::UI::instance()->touch_display (&prompter);
-
- unprompting = true;
- prompting = false;
- }
+ assert (_ctrl); // only used w/BarController
+ if (_ctrl_ignore) return;
+ _spin_ignore = true;
+ // TODO consider using user_to_internal, as well
+ _ctrl_adj->set_value(_ctrl->internal_to_interface (_spin_adj.get_value()));
+ _spin_ignore = false;
}
-void
-SliderController::midicontrol_unprompt ()
-{
- if (unprompting) {
- Gtkmm2ext::UI::instance()->touch_display (&prompter);
- unprompting = false;
- }
-}
-
-VSliderController::VSliderController (Pix *pixset,
- Gtk::Adjustment *adj,
- MIDI::Controllable *mcontrol,
- bool with_numeric)
-
- : SliderController (pixset, adj, mcontrol, with_numeric)
+VSliderController::VSliderController (Gtk::Adjustment *adj, boost::shared_ptr<PBD::Controllable> mc, int fader_length, int fader_girth)
+ : SliderController (adj, mc, VERT, fader_length, fader_girth)
{
- if (with_numeric) {
- spin_frame.add (spin);
- spin_frame.set_shadow_type (Gtk::SHADOW_IN);
- spin_frame.set_name ("BaseFrame");
- spin_hbox.pack_start (spin_frame, false, true);
- // pack_start (spin_hbox, false, false);
- }
}
-HSliderController::HSliderController (Pix *pixset,
- Gtk::Adjustment *adj,
- MIDI::Controllable *mcontrol,
- bool with_numeric)
-
- : SliderController (pixset, adj, mcontrol, with_numeric)
+HSliderController::HSliderController (Gtk::Adjustment *adj, boost::shared_ptr<PBD::Controllable> mc, int fader_length, int fader_girth)
+ : SliderController (adj, mc, HORIZ, fader_length, fader_girth)
{
- if (with_numeric) {
- spin_frame.add (spin);
- //spin_frame.set_shadow_type (Gtk::SHADOW_IN);
- spin_frame.set_name ("BaseFrame");
- spin_hbox.pack_start (spin_frame, false, true);
- // pack_start (spin_hbox, false, false);
- }
}
projects / ardour.git / blobdiff