ardour/livetrax
13
0
Fork 0
Code

a few post-rebase cleanups

Browse Source
This commit is contained in:
Paul Davis 2016-07-06 14:03:24 -04:00
parent da7d7f9502
commit cf9706974c
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/ardour/session.cc
View File

@ -148,7 +148,6 @@ PBD::Signal0<void> Session::Quit;
PBD::Signal0<void> Session::FeedbackDetected;
PBD::Signal0<void> Session::SuccessfulGraphSort;
PBD::Signal2<void,std::string,std::string> Session::VersionMismatch;
PBD::Signal0<void> Session::EditorMixerChanged;
const framecnt_t Session::bounce_chunk_size = 8192;
static void clean_up_session_event (SessionEvent* ev) { delete ev; }

2
libs/surfaces/control_protocol/control_protocol.cc
View File

@ -371,6 +371,4 @@ ControlProtocol::stripable_selection_changed (StripableNotificationListPtr sp)
_first_selected_stripable = boost::weak_ptr<Stripable>();
}
}
cerr << "CP: selection now " << _last_selected.size() << endl;
}

6
libs/surfaces/osc/osc.cc
View File

@ -249,8 +249,8 @@ OSC::start ()
periodic_connection = periodic_timeout->connect (sigc::mem_fun (*this, &OSC::periodic));
periodic_timeout->attach (main_loop()->get_context());
// catch current editor mixer changes for GUI_select mode
session->EditorMixerChanged.connect (session_connections, MISSING_INVALIDATOR, boost::bind (&OSC::gui_selection_changed, this), this);
// catch changes to selection for GUI_select mode
StripableSelectionChanged.connect (session_connections, MISSING_INVALIDATOR, boost::bind (&OSC::gui_selection_changed, this), this);
// catch track reordering
// receive routes added
@ -2081,7 +2081,7 @@ OSC::strip_gui_select (int ssid, int yn, lo_message msg)
sur->expand_enable = false;
boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
if (s) {
session->set_stripable_selection (s);
SetStripableSelection (s);
} else {
route_send_fail ("select", ssid, 0, lo_message_get_source (msg));
}