From 22b07e0233a29d9633ffa825a79503befaf2e16e Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 5 Oct 2015 16:17:49 +0200 Subject: NOOP, remove trailing tabs/whitespace. --- .../generic_midi/generic_midi_control_protocol.cc | 88 +++++++++++----------- .../generic_midi/generic_midi_control_protocol.h | 6 +- libs/surfaces/generic_midi/gmcp_gui.cc | 12 +-- libs/surfaces/generic_midi/interface.cc | 6 +- libs/surfaces/generic_midi/midicontrollable.cc | 10 +-- libs/surfaces/generic_midi/midicontrollable.h | 4 +- libs/surfaces/generic_midi/midiinvokable.cc | 2 +- libs/surfaces/generic_midi/midiinvokable.h | 2 +- 8 files changed, 65 insertions(+), 65 deletions(-) (limited to 'libs/surfaces/generic_midi') diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc index f05e138f05..4b59151079 100644 --- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc +++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc @@ -168,11 +168,11 @@ GenericMidiControlProtocol::reload_maps () mi.name = prop->value (); mi.path = fullpath; - + map_info.push_back (mi); } } - + void GenericMidiControlProtocol::drop_all () { @@ -258,7 +258,7 @@ GenericMidiControlProtocol::send_feedback () } _send_feedback (); - + last_feedback_time = now; } @@ -282,7 +282,7 @@ GenericMidiControlProtocol::_send_feedback () if (!lm.locked ()) { return; } - + for (MIDIControllables::iterator r = controllables.begin(); r != controllables.end(); ++r) { MIDI::byte* end = (*r)->write_feedback (buf, bsize); if (end != buf) { @@ -314,7 +314,7 @@ GenericMidiControlProtocol::start_learning (Controllable* c) { Glib::Threads::Mutex::Lock lm (pending_lock); - + MIDIPendingControllables::iterator ptmp; for (MIDIPendingControllables::iterator i = pending_controllables.begin(); i != pending_controllables.end(); ) { ptmp = i; @@ -341,7 +341,7 @@ GenericMidiControlProtocol::start_learning (Controllable* c) if (!mc) { mc = new MIDIControllable (this, *_input_port->parser(), *c, false); } - + { Glib::Threads::Mutex::Lock lm (pending_lock); @@ -360,7 +360,7 @@ GenericMidiControlProtocol::learning_stopped (MIDIControllable* mc) { Glib::Threads::Mutex::Lock lm (pending_lock); Glib::Threads::Mutex::Lock lm2 (controllables_lock); - + MIDIPendingControllables::iterator tmp; for (MIDIPendingControllables::iterator i = pending_controllables.begin(); i != pending_controllables.end(); ) { @@ -401,7 +401,7 @@ GenericMidiControlProtocol::stop_learning (Controllable* c) break; } } - + delete dptr; } @@ -410,17 +410,17 @@ GenericMidiControlProtocol::delete_binding (PBD::Controllable* control) { if (control != 0) { Glib::Threads::Mutex::Lock lm2 (controllables_lock); - + for (MIDIControllables::iterator iter = controllables.begin(); iter != controllables.end();) { MIDIControllable* existingBinding = (*iter); - + if (control == (existingBinding->get_controllable())) { delete existingBinding; iter = controllables.erase (iter); } else { ++iter; } - + } } } @@ -431,10 +431,10 @@ GenericMidiControlProtocol::create_binding (PBD::Controllable* control, int pos, { if (control != NULL) { Glib::Threads::Mutex::Lock lm2 (controllables_lock); - + MIDI::channel_t channel = (pos & 0xf); MIDI::byte value = control_number; - + // Create a MIDIControllable MIDIControllable* mc = new MIDIControllable (this, *_input_port->parser(), *control, false); @@ -442,19 +442,19 @@ GenericMidiControlProtocol::create_binding (PBD::Controllable* control, int pos, // Note: can't use delete_binding() here because we don't know the specific controllable we want to remove, only the midi information for (MIDIControllables::iterator iter = controllables.begin(); iter != controllables.end();) { MIDIControllable* existingBinding = (*iter); - + if ((existingBinding->get_control_channel() & 0xf ) == channel && existingBinding->get_control_additional() == value && (existingBinding->get_control_type() & 0xf0 ) == MIDI::controller) { - + delete existingBinding; iter = controllables.erase (iter); } else { ++iter; } - + } - + // Update the MIDI Controllable based on the the pos param // Here is where a table lookup for user mappings could go; for now we'll just wing it... mc->bind_midi(channel, MIDI::controller, value); @@ -593,7 +593,7 @@ GenericMidiControlProtocol::set_state (const XMLNode& node, int version) } boost::shared_ptr c; - + { Glib::Threads::Mutex::Lock lm (pending_lock); for (MIDIPendingControllables::iterator i = pending_controllables.begin(); i != pending_controllables.end(); ++i) { @@ -625,20 +625,20 @@ GenericMidiControlProtocol::set_state (const XMLNode& node, int version) if (!nlist.empty()) { for (niter = nlist.begin(); niter != nlist.end(); ++niter) { - + if ((prop = (*niter)->property ("id")) != 0) { - + ID id = prop->value (); DEBUG_TRACE (DEBUG::GenericMidi, string_compose ("Relearned binding for session: Control ID: %1\n", id.to_s())); Controllable* c = Controllable::by_id (id); - + if (c) { MIDIControllable* mc = new MIDIControllable (this, *_input_port->parser(), *c, false); - + if (mc->set_state (**niter, version) == 0) { controllables.push_back (mc); } - + } else { warning << string_compose ( _("Generic MIDI control: controllable %1 not found in session (ignored)"), @@ -697,7 +697,7 @@ GenericMidiControlProtocol::load_bindings (const string& xmlpath) sscanf (prop->value().c_str(), "%d.%d.%d", &major, &minor, µ); Stateful::loading_state_version = (major * 1000) + minor; } - + const XMLNodeList& children (root->children()); XMLNodeConstIterator citer; XMLNodeConstIterator gciter; @@ -708,7 +708,7 @@ GenericMidiControlProtocol::load_bindings (const string& xmlpath) DEBUG_TRACE (DEBUG::GenericMidi, "Loading bindings\n"); for (citer = children.begin(); citer != children.end(); ++citer) { - + if ((*citer)->name() == "DeviceInfo") { const XMLProperty* prop; @@ -736,7 +736,7 @@ GenericMidiControlProtocol::load_bindings (const string& xmlpath) if (child->property ("uri")) { /* controllable */ - + if ((mc = create_binding (*child)) != 0) { Glib::Threads::Mutex::Lock lm2 (controllables_lock); controllables.push_back (mc); @@ -760,7 +760,7 @@ GenericMidiControlProtocol::load_bindings (const string& xmlpath) } } } - + if ((prop = root->property ("name")) != 0) { _current_binding = prop->value (); } @@ -805,17 +805,17 @@ GenericMidiControlProtocol::create_binding (const XMLNode& node) } else { return 0; } - + if (sscanf (prop->value().c_str(), "%d", &intval) != 1) { return 0; } - + detail = (MIDI::byte) intval; if ((prop = node.property (X_("channel"))) == 0) { return 0; } - + if (sscanf (prop->value().c_str(), "%d", &intval) != 1) { return 0; } @@ -830,7 +830,7 @@ GenericMidiControlProtocol::create_binding (const XMLNode& node) } else { momentary = false; } - + prop = node.property (X_("uri")); uri = prop->value(); @@ -918,7 +918,7 @@ GenericMidiControlProtocol::create_function (const XMLNode& node) cnt = 0; stringstream ss (prop->value()); ss << hex; - + while (ss >> val) { cnt++; } @@ -930,12 +930,12 @@ GenericMidiControlProtocol::create_function (const XMLNode& node) data = new MIDI::byte[cnt]; data_size = cnt; - + { stringstream ss (prop->value()); ss << hex; cnt = 0; - + while (ss >> val) { data[cnt++] = (MIDI::byte) val; } @@ -950,13 +950,13 @@ GenericMidiControlProtocol::create_function (const XMLNode& node) if (sscanf (prop->value().c_str(), "%d", &intval) != 1) { return 0; } - + detail = (MIDI::byte) intval; if ((prop = node.property (X_("channel"))) == 0) { return 0; } - + if (sscanf (prop->value().c_str(), "%d", &intval) != 1) { return 0; } @@ -972,9 +972,9 @@ GenericMidiControlProtocol::create_function (const XMLNode& node) } prop = node.property (X_("function")); - + MIDIFunction* mf = new MIDIFunction (*_input_port->parser()); - + if (mf->setup (*this, prop->value(), argument, data, data_size)) { delete mf; return 0; @@ -1018,7 +1018,7 @@ GenericMidiControlProtocol::create_action (const XMLNode& node) cnt = 0; stringstream ss (prop->value()); ss << hex; - + while (ss >> val) { cnt++; } @@ -1030,12 +1030,12 @@ GenericMidiControlProtocol::create_action (const XMLNode& node) data = new MIDI::byte[cnt]; data_size = cnt; - + { stringstream ss (prop->value()); ss << hex; cnt = 0; - + while (ss >> val) { data[cnt++] = (MIDI::byte) val; } @@ -1050,13 +1050,13 @@ GenericMidiControlProtocol::create_action (const XMLNode& node) if (sscanf (prop->value().c_str(), "%d", &intval) != 1) { return 0; } - + detail = (MIDI::byte) intval; if ((prop = node.property (X_("channel"))) == 0) { return 0; } - + if (sscanf (prop->value().c_str(), "%d", &intval) != 1) { return 0; } @@ -1068,7 +1068,7 @@ GenericMidiControlProtocol::create_action (const XMLNode& node) } prop = node.property (X_("action")); - + MIDIAction* ma = new MIDIAction (*_input_port->parser()); if (ma->init (*this, prop->value(), data, data_size)) { diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.h b/libs/surfaces/generic_midi/generic_midi_control_protocol.h index c9d11c3e09..f09c8e4883 100644 --- a/libs/surfaces/generic_midi/generic_midi_control_protocol.h +++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.h @@ -30,7 +30,7 @@ namespace PBD { class Controllable; class ControllableDescriptor; -} +} namespace ARDOUR { class Session; @@ -73,7 +73,7 @@ class GenericMidiControlProtocol : public ARDOUR::ControlProtocol { void drop_bindings (); void check_used_event (int, int); - + std::string current_binding() const { return _current_binding; } struct MapInfo { @@ -89,7 +89,7 @@ class GenericMidiControlProtocol : public ARDOUR::ControlProtocol { void prev_bank (); void set_motorised (bool); - + bool motorised () const { return _motorised; } diff --git a/libs/surfaces/generic_midi/gmcp_gui.cc b/libs/surfaces/generic_midi/gmcp_gui.cc index 773cf36772..710b61be8e 100644 --- a/libs/surfaces/generic_midi/gmcp_gui.cc +++ b/libs/surfaces/generic_midi/gmcp_gui.cc @@ -40,7 +40,7 @@ class GMCPGUI : public Gtk::VBox public: GMCPGUI (GenericMidiControlProtocol&); ~GMCPGUI (); - + private: GenericMidiControlProtocol& cp; Gtk::ComboBoxText map_combo; @@ -110,7 +110,7 @@ GMCPGUI::GMCPGUI (GenericMidiControlProtocol& p) } set_popdown_strings (map_combo, popdowns); - + if (cp.current_binding().empty()) { map_combo.set_active_text (popdowns[0]); } else { @@ -126,7 +126,7 @@ GMCPGUI::GMCPGUI (GenericMidiControlProtocol& p) table->set_row_spacings (6); table->set_col_spacings (6); table->show (); - + int n = 0; Label* label = manage (new Label (_("MIDI Bindings:"))); @@ -134,10 +134,10 @@ GMCPGUI::GMCPGUI (GenericMidiControlProtocol& p) table->attach (*label, 0, 1, n, n + 1); table->attach (map_combo, 1, 2, n, n + 1); ++n; - + map_combo.show (); label->show (); - + bank_adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &GMCPGUI::bank_changed)); label = manage (new Label (_("Current Bank:"))); @@ -145,7 +145,7 @@ GMCPGUI::GMCPGUI (GenericMidiControlProtocol& p) table->attach (*label, 0, 1, n, n + 1); table->attach (bank_spinner, 1, 2, n, n + 1); ++n; - + bank_spinner.show (); label->show (); diff --git a/libs/surfaces/generic_midi/interface.cc b/libs/surfaces/generic_midi/interface.cc index b9b0e36a4d..b7e7b63dd7 100644 --- a/libs/surfaces/generic_midi/interface.cc +++ b/libs/surfaces/generic_midi/interface.cc @@ -28,13 +28,13 @@ static ControlProtocol* new_generic_midi_protocol (ControlProtocolDescriptor* /*descriptor*/, Session* s) { GenericMidiControlProtocol* gmcp; - + try { gmcp = new GenericMidiControlProtocol (*s); } catch (failed_constructor& err) { return 0; } - + if (gmcp->set_active (true)) { delete gmcp; return 0; @@ -67,6 +67,6 @@ static ControlProtocolDescriptor generic_midi_descriptor = { /*initialize : */ new_generic_midi_protocol, /*destroy : */ delete_generic_midi_protocol }; - + extern "C" ARDOURSURFACE_API ControlProtocolDescriptor* protocol_descriptor () { return &generic_midi_descriptor; } diff --git a/libs/surfaces/generic_midi/midicontrollable.cc b/libs/surfaces/generic_midi/midicontrollable.cc index 4a9b89de80..9dca702e68 100644 --- a/libs/surfaces/generic_midi/midicontrollable.cc +++ b/libs/surfaces/generic_midi/midicontrollable.cc @@ -71,7 +71,7 @@ MIDIControllable::MIDIControllable (GenericMidiControlProtocol* s, MIDI::Parser& , _momentary (m) { set_controllable (&c); - + _learned = true; /* from controllable */ _encoder = No_enc; setting = false; @@ -123,7 +123,7 @@ MIDIControllable::set_controllable (Controllable* c) if (c == controllable) { return; } - + controllable_death_connection.disconnect (); controllable = c; @@ -478,7 +478,7 @@ MIDIControllable::bind_midi (channel_t chn, eventType ev, MIDI::byte additional) } _control_description = "MIDI control: NoteOn"; break; - + case MIDI::controller: _parser.channel_controller[chn_i].connect_same_thread (midi_sense_connection[0], boost::bind (&MIDIControllable::midi_sense_controller, this, _1, _2)); snprintf (buf, sizeof (buf), "MIDI control: Controller %d", control_additional); @@ -507,7 +507,7 @@ MIDIControllable::write_feedback (MIDI::byte* buf, int32_t& bufsize, bool /*forc if (!controllable || control_type == none || !feedback || bufsize <= 2) { return buf; } - + int const gm = control_to_midi (controllable->get_value()); if (gm == last_value) { @@ -611,7 +611,7 @@ int MIDIControllable::max_value_for_type () const { /* XXX: this is not complete */ - + if (control_type == MIDI::pitchbend) { return 16383; } diff --git a/libs/surfaces/generic_midi/midicontrollable.h b/libs/surfaces/generic_midi/midicontrollable.h index 5a4a762089..2e5d41c5d6 100644 --- a/libs/surfaces/generic_midi/midicontrollable.h +++ b/libs/surfaces/generic_midi/midicontrollable.h @@ -68,7 +68,7 @@ class MIDIControllable : public PBD::Stateful }; MIDI::byte* write_feedback (MIDI::byte* buf, int32_t& bufsize, bool force = false); - + void midi_rebind (MIDI::channel_t channel=-1); void midi_forget (); void learn_about_external_control (); @@ -104,7 +104,7 @@ class MIDIControllable : public PBD::Stateful MIDI::byte get_control_additional () { return control_additional; } int lookup_controllable(); - + private: int max_value_for_type () const; diff --git a/libs/surfaces/generic_midi/midiinvokable.cc b/libs/surfaces/generic_midi/midiinvokable.cc index 48d8497ce3..9d679b1e8e 100644 --- a/libs/surfaces/generic_midi/midiinvokable.cc +++ b/libs/surfaces/generic_midi/midiinvokable.cc @@ -141,7 +141,7 @@ MIDIInvokable::bind_midi (channel_t chn, eventType ev, MIDI::byte additional) case MIDI::on: _parser.channel_note_on[chn_i].connect_same_thread (midi_sense_connection[0], boost::bind (&MIDIInvokable::midi_sense_note_on, this, _1, _2)); break; - + case MIDI::controller: _parser.channel_controller[chn_i].connect_same_thread (midi_sense_connection[0], boost::bind (&MIDIInvokable::midi_sense_controller, this, _1, _2)); break; diff --git a/libs/surfaces/generic_midi/midiinvokable.h b/libs/surfaces/generic_midi/midiinvokable.h index bde59b64de..dee87ed09c 100644 --- a/libs/surfaces/generic_midi/midiinvokable.h +++ b/libs/surfaces/generic_midi/midiinvokable.h @@ -50,7 +50,7 @@ class MIDIInvokable : public PBD::Stateful MIDI::channel_t get_control_channel () { return control_channel; } MIDI::eventType get_control_type () { return control_type; } MIDI::byte get_control_additional () { return control_additional; } - + protected: GenericMidiControlProtocol* _ui; std::string _invokable_name; -- cgit v1.2.3