ardour/livetrax
13
0
Fork 0
Code

OSC: allow setting of marker name

Browse Source
This commit is contained in:
Len Ovens 2018-02-18 09:15:35 -08:00
parent 08632d623e
commit a9d041c62e
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2932,13 +2932,24 @@ OSC::set_marker (const char* types, lo_arg **argv, int argc, lo_message msg)
switch (types[0]) {
case 's':
for (Locations::LocationList::const_iterator l = ll.begin(); l != ll.end(); ++l) {
if ((*l)->is_mark ()) {
if (strcmp (&argv[0]->s, (*l)->name().c_str()) == 0) {
session->request_locate ((*l)->start (), false);
return 0;
{
Location *cur_mark = 0;
for (Locations::LocationList::const_iterator l = ll.begin(); l != ll.end(); ++l) {
if ((*l)->is_mark ()) {
if (strcmp (&argv[0]->s, (*l)->name().c_str()) == 0) {
session->request_locate ((*l)->start (), false);
return 0;
} else if ((*l)->start () == session->transport_sample()) {
cur_mark = (*l);
}
}
}
if (cur_mark) {
cur_mark->set_name (&argv[0]->s);
return 0;
}
PBD::warning << string_compose ("Marker: \"%1\" - does not exist", &argv[0]->s) << endmsg;
return -1;
}
break;
case 'i':
@ -2979,7 +2990,6 @@ OSC::group_list (lo_message msg)
int
OSC::send_group_list (lo_address addr)
{
//std::list<RouteGroup*> const & route_groups () const {
lo_message reply;
reply = lo_message_new ();