diff options
Diffstat (limited to 'libs/surfaces')
| -rw-r--r-- | libs/surfaces/control_protocol/SConscript | 3 | ||||
| -rw-r--r-- | libs/surfaces/control_protocol/basic_ui.cc | 13 | ||||
| -rw-r--r-- | libs/surfaces/control_protocol/control_protocol/basic_ui.h | 2 | ||||
| -rw-r--r-- | libs/surfaces/frontier/tranzport/SConscript | 2 | ||||
| -rw-r--r-- | libs/surfaces/generic_midi/SConscript | 2 | ||||
| -rw-r--r-- | libs/surfaces/mackie/SConscript | 2 | ||||
| -rw-r--r-- | libs/surfaces/powermate/SConscript | 2 | ||||
| -rw-r--r-- | libs/surfaces/powermate/powermate.cc | 6 | ||||
| -rw-r--r-- | libs/surfaces/tranzport/SConscript | 2 | ||||
| -rw-r--r-- | libs/surfaces/tranzport/screen.cc | 1 |
10 files changed, 25 insertions, 10 deletions
diff --git a/libs/surfaces/control_protocol/SConscript b/libs/surfaces/control_protocol/SConscript index fcc11dbae3..22cb1f4961 100644 --- a/libs/surfaces/control_protocol/SConscript +++ b/libs/surfaces/control_protocol/SConscript @@ -6,7 +6,7 @@ import glob Import('env final_prefix install_prefix final_config_prefix libraries i18n') -cp = env.Copy() +cp = env.Clone() # # this defines the version number of libardour_cp @@ -38,7 +38,6 @@ cp.Merge ([ libraries['pbd'], libraries['midi++2'], libraries['xml'], - libraries['usb'], libraries['glib2'], libraries['glibmm2'] ]) diff --git a/libs/surfaces/control_protocol/basic_ui.cc b/libs/surfaces/control_protocol/basic_ui.cc index 44445192be..71d5794805 100644 --- a/libs/surfaces/control_protocol/basic_ui.cc +++ b/libs/surfaces/control_protocol/basic_ui.cc @@ -30,6 +30,8 @@ using namespace ARDOUR; using ARDOUR::nframes_t; +sigc::signal<void,std::string,std::string> BasicUI::AccessAction; + BasicUI::BasicUI (Session& s) : session (&s) { @@ -51,6 +53,17 @@ BasicUI::register_thread (std::string name) PBD::ThreadCreated (pthread_self(), name); } + +void +BasicUI::access_action ( std::string action_path ) +{ + int split_at = action_path.find( "/" ); + std::string group = action_path.substr( 0, split_at ); + std::string item = action_path.substr( split_at + 1 ); + + AccessAction( group, item ); +} + void BasicUI::loop_toggle () { diff --git a/libs/surfaces/control_protocol/control_protocol/basic_ui.h b/libs/surfaces/control_protocol/control_protocol/basic_ui.h index 7bc6b25c32..c8b5a2a0b6 100644 --- a/libs/surfaces/control_protocol/control_protocol/basic_ui.h +++ b/libs/surfaces/control_protocol/control_protocol/basic_ui.h @@ -42,6 +42,8 @@ class BasicUI { /* transport control */ void loop_toggle (); + void access_action ( std::string action_path ); + static sigc::signal<void,std::string,std::string> AccessAction; void goto_start (); void goto_end (); void rewind (); diff --git a/libs/surfaces/frontier/tranzport/SConscript b/libs/surfaces/frontier/tranzport/SConscript index 099e35de52..0f05e379cc 100644 --- a/libs/surfaces/frontier/tranzport/SConscript +++ b/libs/surfaces/frontier/tranzport/SConscript @@ -6,7 +6,7 @@ import glob Import('env final_prefix install_prefix final_config_prefix libraries i18n') -tranzport = env.Copy() +tranzport = env.Clone() # # this defines the version number of libardour_tranzport diff --git a/libs/surfaces/generic_midi/SConscript b/libs/surfaces/generic_midi/SConscript index 051a61f148..833f06923a 100644 --- a/libs/surfaces/generic_midi/SConscript +++ b/libs/surfaces/generic_midi/SConscript @@ -6,7 +6,7 @@ import glob Import('env final_prefix install_prefix final_config_prefix libraries i18n') -genericmidi = env.Copy() +genericmidi = env.Clone() # # this defines the version number of libardour_genericmidi diff --git a/libs/surfaces/mackie/SConscript b/libs/surfaces/mackie/SConscript index 4882658920..45ce63d3cd 100644 --- a/libs/surfaces/mackie/SConscript +++ b/libs/surfaces/mackie/SConscript @@ -6,7 +6,7 @@ import glob Import('env final_prefix install_prefix final_config_prefix libraries i18n') -mackie = env.Copy() +mackie = env.Clone() # # this defines the version number of libardour_mackie diff --git a/libs/surfaces/powermate/SConscript b/libs/surfaces/powermate/SConscript index 504edc6031..26ecc511eb 100644 --- a/libs/surfaces/powermate/SConscript +++ b/libs/surfaces/powermate/SConscript @@ -6,7 +6,7 @@ import glob Import('env final_prefix install_prefix final_config_prefix libraries i18n') -powermate = env.Copy() +powermate = env.Clone() # # this defines the version number of powermate diff --git a/libs/surfaces/powermate/powermate.cc b/libs/surfaces/powermate/powermate.cc index 8b3051af20..6f3cf15456 100644 --- a/libs/surfaces/powermate/powermate.cc +++ b/libs/surfaces/powermate/powermate.cc @@ -6,9 +6,9 @@ #include <linux/input.h> -#include <string.h> -#include <errno.h> -#include <stdio.h> +#include <cstring> +#include <cerrno> +#include <cstdio> #include <unistd.h> #include <fcntl.h> diff --git a/libs/surfaces/tranzport/SConscript b/libs/surfaces/tranzport/SConscript index 5e14be31d3..fddd66c95d 100644 --- a/libs/surfaces/tranzport/SConscript +++ b/libs/surfaces/tranzport/SConscript @@ -6,7 +6,7 @@ import glob Import('env final_prefix install_prefix final_config_prefix libraries i18n') -tranzport = env.Copy() +tranzport = env.Clone() # # this defines the version number of libardour_tranzport diff --git a/libs/surfaces/tranzport/screen.cc b/libs/surfaces/tranzport/screen.cc index ab19358868..74d6c7d528 100644 --- a/libs/surfaces/tranzport/screen.cc +++ b/libs/surfaces/tranzport/screen.cc @@ -18,6 +18,7 @@ * * */ +#include <cstring> #include <tranzport_control_protocol.h> #include <cstring> |