Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support liblo-0.32 #55

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support liblo-0.32 #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 30 additions & 30 deletions src/control_osc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ ControlOSC::osc_receiver()


int ControlOSC::_dummy_handler(const char *path, const char *types, lo_arg **argv, int argc,
void *data, void *user_data)
lo_message_ *data, void *user_data)
{
#ifdef DEBUG
cerr << "got path: " << path << endl;
Expand All @@ -522,30 +522,30 @@ int ControlOSC::_dummy_handler(const char *path, const char *types, lo_arg **arg


int ControlOSC::_quit_handler(const char *path, const char *types, lo_arg **argv, int argc,
void *data, void *user_data)
lo_message_ *data, void *user_data)
{
ControlOSC * osc = static_cast<ControlOSC*> (user_data);
return osc->quit_handler (path, types, argv, argc, data);

}

int ControlOSC::_ping_handler(const char *path, const char *types, lo_arg **argv, int argc,
void *data, void *user_data)
lo_message_ *data, void *user_data)
{
ControlOSC * osc = static_cast<ControlOSC*> (user_data);
return osc->ping_handler (path, types, argv, argc, data);

}

int ControlOSC::_global_set_handler(const char *path, const char *types, lo_arg **argv, int argc,
void *data, void *user_data)
lo_message_ *data, void *user_data)
{
ControlOSC * osc = static_cast<ControlOSC*> (user_data);
return osc->global_set_handler (path, types, argv, argc, data);

}
int ControlOSC::_global_get_handler(const char *path, const char *types, lo_arg **argv, int argc,
void *data, void *user_data)
lo_message_ *data, void *user_data)
{
ControlOSC * osc = static_cast<ControlOSC*> (user_data);
return osc->global_get_handler (path, types, argv, argc, data);
Expand All @@ -554,168 +554,168 @@ int ControlOSC::_global_get_handler(const char *path, const char *types, lo_arg


int ControlOSC::_updown_handler(const char *path, const char *types, lo_arg **argv, int argc,
void *data, void *user_data)
lo_message_ *data, void *user_data)
{
CommandInfo * cp = static_cast<CommandInfo*> (user_data);
return cp->osc->updown_handler (path, types, argv, argc, data, cp);
}

int ControlOSC::_set_handler(const char *path, const char *types, lo_arg **argv, int argc,
void *data, void *user_data)
lo_message_ *data, void *user_data)
{
CommandInfo * cp = static_cast<CommandInfo*> (user_data);
return cp->osc->set_handler (path, types, argv, argc, data, cp);
}

int ControlOSC::_get_handler(const char *path, const char *types, lo_arg **argv, int argc,
void *data, void *user_data)
lo_message_ *data, void *user_data)
{
CommandInfo * cp = static_cast<CommandInfo*> (user_data);
return cp->osc->get_handler (path, types, argv, argc, data, cp);
}

int ControlOSC::_set_prop_handler(const char *path, const char *types, lo_arg **argv, int argc,
void *data, void *user_data)
lo_message_ *data, void *user_data)
{
CommandInfo * cp = static_cast<CommandInfo*> (user_data);
return cp->osc->set_prop_handler (path, types, argv, argc, data, cp);
}

int ControlOSC::_get_prop_handler(const char *path, const char *types, lo_arg **argv, int argc,
void *data, void *user_data)
lo_message_ *data, void *user_data)
{
CommandInfo * cp = static_cast<CommandInfo*> (user_data);
return cp->osc->get_prop_handler (path, types, argv, argc, data, cp);
}

int ControlOSC::_register_update_handler(const char *path, const char *types, lo_arg **argv, int argc,
void *data, void *user_data)
lo_message_ *data, void *user_data)
{
CommandInfo * cp = static_cast<CommandInfo*> (user_data);
return cp->osc->register_update_handler (path, types, argv, argc, data, cp);
}

int ControlOSC::_unregister_update_handler(const char *path, const char *types, lo_arg **argv, int argc,
void *data, void *user_data)
lo_message_ *data, void *user_data)
{
CommandInfo * cp = static_cast<CommandInfo*> (user_data);
return cp->osc->unregister_update_handler (path, types, argv, argc, data, cp);
}

int ControlOSC::_register_auto_update_handler(const char *path, const char *types, lo_arg **argv, int argc,
void *data, void *user_data)
lo_message_ *data, void *user_data)
{
CommandInfo * cp = static_cast<CommandInfo*> (user_data);
return cp->osc->register_auto_update_handler (path, types, argv, argc, data, cp);
}

int ControlOSC::_unregister_auto_update_handler(const char *path, const char *types, lo_arg **argv, int argc,
void *data, void *user_data)
lo_message_ *data, void *user_data)
{
CommandInfo * cp = static_cast<CommandInfo*> (user_data);
return cp->osc->unregister_auto_update_handler (path, types, argv, argc, data, cp);
}

int ControlOSC::_loop_add_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data)
int ControlOSC::_loop_add_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data)
{
ControlOSC * osc = static_cast<ControlOSC*> (user_data);
return osc->loop_add_handler (path, types, argv, argc, data);
}

int ControlOSC::_loop_del_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data)
int ControlOSC::_loop_del_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data)
{
ControlOSC * osc = static_cast<ControlOSC*> (user_data);
return osc->loop_del_handler (path, types, argv, argc, data);
}

int ControlOSC::_load_session_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data)
int ControlOSC::_load_session_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data)
{
ControlOSC * osc = static_cast<ControlOSC*> (user_data);
return osc->load_session_handler (path, types, argv, argc, data);
}
int ControlOSC::_save_session_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data)
int ControlOSC::_save_session_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data)
{
ControlOSC * osc = static_cast<ControlOSC*> (user_data);
return osc->save_session_handler (path, types, argv, argc, data);
}

int ControlOSC::_register_config_handler(const char *path, const char *types, lo_arg **argv, int argc,
void *data, void *user_data)
lo_message_ *data, void *user_data)
{
ControlOSC * osc = static_cast<ControlOSC*> (user_data);
return osc->register_config_handler (path, types, argv, argc, data);
}

int ControlOSC::_unregister_config_handler(const char *path, const char *types, lo_arg **argv, int argc,
void *data, void *user_data)
lo_message_ *data, void *user_data)
{
ControlOSC * osc = static_cast<ControlOSC*> (user_data);
return osc->unregister_config_handler (path, types, argv, argc, data);
}

int ControlOSC::_loadloop_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data)
int ControlOSC::_loadloop_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data)
{
CommandInfo * cp = static_cast<CommandInfo*> (user_data);
return cp->osc->loadloop_handler (path, types, argv, argc, data, cp);
}

int ControlOSC::_saveloop_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data)
int ControlOSC::_saveloop_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data)
{
CommandInfo * cp = static_cast<CommandInfo*> (user_data);
return cp->osc->saveloop_handler (path, types, argv, argc, data, cp);
}

int ControlOSC::_global_register_update_handler(const char *path, const char *types, lo_arg **argv, int argc,
void *data, void *user_data)
lo_message_ *data, void *user_data)
{
ControlOSC * osc = static_cast<ControlOSC*> (user_data);
return osc->global_register_update_handler (path, types, argv, argc, data);
}

int ControlOSC::_global_unregister_update_handler(const char *path, const char *types, lo_arg **argv, int argc,
void *data, void *user_data)
lo_message_ *data, void *user_data)
{
ControlOSC * osc = static_cast<ControlOSC*> (user_data);
return osc->global_unregister_update_handler (path, types, argv, argc, data);
}

int ControlOSC::_global_register_auto_update_handler(const char *path, const char *types, lo_arg **argv, int argc,
void *data, void *user_data)
lo_message_ *data, void *user_data)
{
ControlOSC * osc = static_cast<ControlOSC*> (user_data);
return osc->global_register_auto_update_handler (path, types, argv, argc, data);
}

int ControlOSC::_global_unregister_auto_update_handler(const char *path, const char *types, lo_arg **argv, int argc,
void *data, void *user_data)
lo_message_ *data, void *user_data)
{
ControlOSC * osc = static_cast<ControlOSC*> (user_data);
return osc->global_unregister_auto_update_handler (path, types, argv, argc, data);
}


int ControlOSC::_midi_start_handler(const char *path, const char *types, lo_arg **argv, int argc,
void *data, void *user_data)
lo_message_ *data, void *user_data)
{
ControlOSC * osc = static_cast<ControlOSC*> (user_data);
return osc->midi_start_handler (path, types, argv, argc, data);
}

int ControlOSC::_midi_stop_handler(const char *path, const char *types, lo_arg **argv, int argc,
void *data, void *user_data)
lo_message_ *data, void *user_data)
{
ControlOSC * osc = static_cast<ControlOSC*> (user_data);
return osc->midi_stop_handler (path, types, argv, argc, data);
}

int ControlOSC::_midi_tick_handler(const char *path, const char *types, lo_arg **argv, int argc,
void *data, void *user_data)
lo_message_ *data, void *user_data)
{
ControlOSC * osc = static_cast<ControlOSC*> (user_data);
return osc->midi_tick_handler (path, types, argv, argc, data);
}

int ControlOSC::_midi_binding_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data)
int ControlOSC::_midi_binding_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data)
{
MidiBindCommand * cp = static_cast<MidiBindCommand*> (user_data);
return cp->osc->midi_binding_handler (path, types, argv, argc, data, cp);
Expand Down
60 changes: 30 additions & 30 deletions src/control_osc.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,39 +118,39 @@ class ControlOSC
lo_address find_or_cache_addr(std::string returl);


static int _quit_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
static int _global_set_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
static int _global_get_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
static int _updown_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
static int _set_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
static int _get_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
static int _set_prop_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
static int _get_prop_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
static int _dummy_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
static int _register_update_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
static int _unregister_update_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
static int _register_auto_update_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
static int _unregister_auto_update_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
static int _ping_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
static int _loop_add_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
static int _loop_del_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
static int _load_session_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
static int _save_session_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
static int _register_config_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
static int _unregister_config_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
static int _loadloop_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
static int _saveloop_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
static int _global_register_update_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
static int _global_unregister_update_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
static int _global_register_auto_update_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
static int _global_unregister_auto_update_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
static int _quit_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
static int _global_set_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
static int _global_get_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
static int _updown_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
static int _set_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
static int _get_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
static int _set_prop_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
static int _get_prop_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
static int _dummy_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
static int _register_update_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
static int _unregister_update_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
static int _register_auto_update_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
static int _unregister_auto_update_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
static int _ping_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
static int _loop_add_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
static int _loop_del_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
static int _load_session_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
static int _save_session_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
static int _register_config_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
static int _unregister_config_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
static int _loadloop_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
static int _saveloop_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
static int _global_register_update_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
static int _global_unregister_update_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
static int _global_register_auto_update_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
static int _global_unregister_auto_update_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);


static int _midi_start_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
static int _midi_stop_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
static int _midi_tick_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
static int _midi_start_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
static int _midi_stop_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);
static int _midi_tick_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);

static int _midi_binding_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
static int _midi_binding_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message_ *data, void *user_data);


bool init_osc_thread();
Expand Down
Loading