diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2015-10-09 14:01:22 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-10-09 14:01:22 -0400 |
| commit | 9b5a071c3317697bec9fd4269d86b2f254816f38 (patch) | |
| tree | 37e1364f02d10d9da07513c8690c10d3515b8790 /libs/surfaces/mackie/surface.h | |
| parent | 7e771c9fdc025791e8b1e23520532566eed19cd8 (diff) | |
varied and wide changes to get input and output combos closer to working
Diffstat (limited to 'libs/surfaces/mackie/surface.h')
| -rw-r--r-- | libs/surfaces/mackie/surface.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libs/surfaces/mackie/surface.h b/libs/surfaces/mackie/surface.h index 68b3c5f799..c0a2cff871 100644 --- a/libs/surfaces/mackie/surface.h +++ b/libs/surfaces/mackie/surface.h @@ -165,11 +165,11 @@ public: void display_message_for (std::string const& msg, uint64_t msecs); + bool connection_handler (boost::weak_ptr<ARDOUR::Port>, std::string name1, boost::weak_ptr<ARDOUR::Port>, std::string name2, bool); + XMLNode& get_state (); int set_state (const XMLNode&, int version); - protected: - private: MackieControlProtocol& _mcp; SurfacePort* _port; @@ -181,7 +181,6 @@ public: Mackie::JogWheel* _jog_wheel; Fader* _master_fader; float _last_master_gain_written; - PBD::ScopedConnection port_connection; void handle_midi_sysex (MIDI::Parser&, MIDI::byte *, size_t count); MidiByteArray host_connection_query (MidiByteArray& bytes); @@ -192,7 +191,6 @@ public: void init_strips (uint32_t n); void setup_master (); void master_gain_changed (); - void connection_handler (boost::weak_ptr<ARDOUR::Port>, std::string name1, boost::weak_ptr<ARDOUR::Port>, std::string name2, bool); enum ConnectionState { InputConnected = 0x1, |