Fix Faderport1 port-connection (amend bbb68514
)
This commit is contained in:
parent
24f69d5174
commit
eed07770e1
@ -109,8 +109,8 @@ FaderPort::FaderPort (Session& s)
|
|||||||
);
|
);
|
||||||
|
|
||||||
/* Catch port connections and disconnections */
|
/* Catch port connections and disconnections */
|
||||||
ARDOUR::AudioEngine::instance()->PortConnectedOrDisconnected.connect (port_connection, MISSING_INVALIDATOR, boost::bind (&FaderPort::connection_handler, this, _1, _2, _3, _4, _5), this);
|
ARDOUR::AudioEngine::instance()->PortConnectedOrDisconnected.connect (port_connections, MISSING_INVALIDATOR, boost::bind (&FaderPort::connection_handler, this, _1, _2, _3, _4, _5), this);
|
||||||
ARDOUR::AudioEngine::instance()->PortPrettyNameChanged.connect (port_connection, MISSING_INVALIDATOR, boost::bind (&FaderPort::ConnectionChange, this), this); /* notify GUI */
|
ARDOUR::AudioEngine::instance()->PortPrettyNameChanged.connect (port_connections, MISSING_INVALIDATOR, boost::bind (&FaderPort::ConnectionChange, this), this); /* notify GUI */
|
||||||
|
|
||||||
buttons.insert (std::make_pair (Mute, Button (*this, _("Mute"), Mute, 21)));
|
buttons.insert (std::make_pair (Mute, Button (*this, _("Mute"), Mute, 21)));
|
||||||
buttons.insert (std::make_pair (Solo, Button (*this, _("Solo"), Solo, 22)));
|
buttons.insert (std::make_pair (Solo, Button (*this, _("Solo"), Solo, 22)));
|
||||||
@ -630,7 +630,7 @@ FaderPort::close ()
|
|||||||
|
|
||||||
stop_midi_handling ();
|
stop_midi_handling ();
|
||||||
session_connections.drop_connections ();
|
session_connections.drop_connections ();
|
||||||
port_connection.disconnect ();
|
port_connections.drop_connections ();
|
||||||
blink_connection.disconnect ();
|
blink_connection.disconnect ();
|
||||||
selection_connection.disconnect ();
|
selection_connection.disconnect ();
|
||||||
stripable_connections.drop_connections ();
|
stripable_connections.drop_connections ();
|
||||||
|
@ -183,7 +183,7 @@ class FaderPort : public ARDOUR::ControlProtocol, public AbstractUI<FaderPortReq
|
|||||||
void build_gui ();
|
void build_gui ();
|
||||||
|
|
||||||
bool connection_handler (boost::weak_ptr<ARDOUR::Port>, std::string name1, boost::weak_ptr<ARDOUR::Port>, std::string name2, bool yn);
|
bool connection_handler (boost::weak_ptr<ARDOUR::Port>, std::string name1, boost::weak_ptr<ARDOUR::Port>, std::string name2, bool yn);
|
||||||
PBD::ScopedConnection port_connection;
|
PBD::ScopedConnectionList port_connections;
|
||||||
|
|
||||||
enum ConnectionState {
|
enum ConnectionState {
|
||||||
InputConnected = 0x1,
|
InputConnected = 0x1,
|
||||||
|
Loading…
Reference in New Issue
Block a user