ardour/livetrax
13
0
Fork 0
Code

OSC: remove debug output.

Browse Source
This commit is contained in:
Len Ovens 2017-05-04 22:01:07 -07:00
parent 69f61936ff
commit 379ad3357d
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -878,7 +878,6 @@ OSC::catchall (const char *path, const char* types, lo_arg **argv, int argc, lo_
std::string action_path = path; std::string action_path = path;
access_action (action_path.substr(15)); access_action (action_path.substr(15));
std::cout << "access_action path = " << action_path.substr(15) << "\n";
} }
ret = 0; ret = 0;
@ -4076,8 +4075,6 @@ OSC::cue_parse (const char *path, const char* types, lo_arg **argv, int argc, lo
int int
OSC::cue_set (uint32_t aux, lo_message msg) OSC::cue_set (uint32_t aux, lo_message msg)
{ {
std::cout << "cue set\n";
return _cue_set (aux, get_address (msg)); return _cue_set (aux, get_address (msg));
} }
@ -4127,7 +4124,6 @@ OSC::_cue_set (uint32_t aux, lo_address addr)
for (uint32_t n = 0; n < s->nstrips; ++n) { for (uint32_t n = 0; n < s->nstrips; ++n) {
boost::shared_ptr<Stripable> stp = s->strips[n]; boost::shared_ptr<Stripable> stp = s->strips[n];
if (stp) { if (stp) {
std::cout << "Aux: " << stp->name() << " number: " << n+1 << " requested: " << aux << "\n";
text_message (string_compose ("/cue/name/%1", n+1), stp->name(), addr); text_message (string_compose ("/cue/name/%1", n+1), stp->name(), addr);
if (aux == n+1) { if (aux == n+1) {
// aux must be at least one // aux must be at least one
@ -4137,7 +4133,6 @@ OSC::_cue_set (uint32_t aux, lo_address addr)
// make a list of stripables with sends that go to this bus // make a list of stripables with sends that go to this bus
s->sends = cue_get_sorted_stripables(stp, aux, addr); s->sends = cue_get_sorted_stripables(stp, aux, addr);
// start cue observer // start cue observer
std::cout << "starting cue obsever\n";
OSCCueObserver* co = new OSCCueObserver (stp, s->sends, addr); OSCCueObserver* co = new OSCCueObserver (stp, s->sends, addr);
cue_observers.push_back (co); cue_observers.push_back (co);
} }
@ -4153,13 +4148,10 @@ OSC::cue_next (lo_message msg)
{ {
OSCSurface *s = get_surface(get_address (msg)); OSCSurface *s = get_surface(get_address (msg));
std::cout << "cue next\n";
if (!s->cue) { if (!s->cue) {
std::cout << "cue next init\n";
cue_set (1, msg); cue_set (1, msg);
return 0; return 0;
} }
std::cout << "cue next no init\n";
if (s->aux < s->nstrips) { if (s->aux < s->nstrips) {
cue_set (s->aux + 1, msg); cue_set (s->aux + 1, msg);
} else { } else {

3
libs/surfaces/osc/osc_cue_observer.cc
View File

@ -38,7 +38,6 @@ OSCCueObserver::OSCCueObserver (boost::shared_ptr<Stripable> s, std::vector<boos
, _strip (s) , _strip (s)
, tick_enable (false) , tick_enable (false)
{ {
std::cout << "entered observer\n";
addr = lo_address_new (lo_address_get_hostname(a) , lo_address_get_port(a)); addr = lo_address_new (lo_address_get_hostname(a) , lo_address_get_port(a));
_strip->PropertyChanged.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCCueObserver::name_changed, this, boost::lambda::_1, 0), OSC::instance()); _strip->PropertyChanged.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCCueObserver::name_changed, this, boost::lambda::_1, 0), OSC::instance());
@ -48,12 +47,10 @@ OSCCueObserver::OSCCueObserver (boost::shared_ptr<Stripable> s, std::vector<boos
send_change_message ("/cue/mute", 0, _strip->mute_control()); send_change_message ("/cue/mute", 0, _strip->mute_control());
gain_timeout.push_back (0); gain_timeout.push_back (0);
std::cout << "observer past gain timeout for aux\n";
_strip->gain_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCCueObserver::send_gain_message, this, 0, _strip->gain_control()), OSC::instance()); _strip->gain_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCCueObserver::send_gain_message, this, 0, _strip->gain_control()), OSC::instance());
send_gain_message (0, _strip->gain_control()); send_gain_message (0, _strip->gain_control());
send_init (); send_init ();
std::cout << "observer past send init\n";
tick_enable = true; tick_enable = true;
tick (); tick ();