diff options
Diffstat (limited to 'libs/surfaces')
-rw-r--r-- | libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc | 1 | ||||
-rw-r--r-- | libs/surfaces/generic_midi/generic_midi_control_protocol.cc | 2 | ||||
-rw-r--r-- | libs/surfaces/mackie/interface.cc | 4 | ||||
-rw-r--r-- | libs/surfaces/mackie/mackie_control_protocol.cc | 2 | ||||
-rw-r--r-- | libs/surfaces/mackie/mackie_control_protocol.h | 1 | ||||
-rw-r--r-- | libs/surfaces/mackie/mackie_control_protocol_poll.cc | 11 | ||||
-rw-r--r-- | libs/surfaces/mackie/mackie_jog_wheel.cc | 4 | ||||
-rw-r--r-- | libs/surfaces/mackie/mackie_port.cc | 2 | ||||
-rw-r--r-- | libs/surfaces/osc/interface.cc | 1 | ||||
-rw-r--r-- | libs/surfaces/osc/osc.h | 1 | ||||
-rw-r--r-- | libs/surfaces/tranzport/tranzport_common.h | 2 | ||||
-rw-r--r-- | libs/surfaces/tranzport/wheel_modes.cc | 1 |
12 files changed, 17 insertions, 15 deletions
diff --git a/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc b/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc index e002775d56..2338e7c090 100644 --- a/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc +++ b/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc @@ -56,7 +56,6 @@ #include "ardour/route.h" #include "ardour/audio_track.h" -#include "ardour/session.h" #include "ardour/tempo.h" #include "ardour/location.h" #include "ardour/dB.h" diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc index 9cd5f8a934..86bf90ee3f 100644 --- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc +++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc @@ -28,8 +28,8 @@ #include "midi++/port.h" #include "midi++/manager.h" -#include "ardour/route.h" #include "ardour/session.h" +#include "ardour/route.h" #include "generic_midi_control_protocol.h" #include "midicontrollable.h" diff --git a/libs/surfaces/mackie/interface.cc b/libs/surfaces/mackie/interface.cc index 60f5752a58..067941484c 100644 --- a/libs/surfaces/mackie/interface.cc +++ b/libs/surfaces/mackie/interface.cc @@ -18,7 +18,9 @@ #include "control_protocol/control_protocol.h" #include "mackie_control_protocol.h" -#include <pbd/error.h> +#include "ardour/rc_configuration.h" + +#include "pbd/error.h" #include <stdexcept> diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc index aba0cd565a..d93bf78d33 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.cc +++ b/libs/surfaces/mackie/mackie_control_protocol.cc @@ -40,8 +40,8 @@ #include "pbd/memento_command.h" #include "pbd/convert.h" -#include "ardour/route.h" #include "ardour/session.h" +#include "ardour/route.h" #include "ardour/location.h" #include "ardour/dB.h" #include "ardour/panner.h" diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h index 1a6412667a..d220213d2d 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.h +++ b/libs/surfaces/mackie/mackie_control_protocol.h @@ -26,7 +26,6 @@ #include <glibmm/thread.h> #include "ardour/types.h" -#include "ardour/session.h" #include "midi++/types.h" #include "control_protocol/control_protocol.h" diff --git a/libs/surfaces/mackie/mackie_control_protocol_poll.cc b/libs/surfaces/mackie/mackie_control_protocol_poll.cc index d3401c7904..867a7d784a 100644 --- a/libs/surfaces/mackie/mackie_control_protocol_poll.cc +++ b/libs/surfaces/mackie/mackie_control_protocol_poll.cc @@ -3,18 +3,19 @@ #include "midi_byte_array.h" #include "surface_port.h" -#include <pbd/pthread_utils.h> -#include <pbd/error.h> +#include "pbd/pthread_utils.h" +#include "pbd/error.h" -#include <midi++/types.h> -#include <midi++/port.h> -#include <midi++/manager.h> +#include "midi++/types.h" +#include "midi++/port.h" +#include "midi++/manager.h" #include "i18n.h" #include <unistd.h> #include <fcntl.h> #include <poll.h> #include <errno.h> +#include <string.h> #include <iostream> #include <string> diff --git a/libs/surfaces/mackie/mackie_jog_wheel.cc b/libs/surfaces/mackie/mackie_jog_wheel.cc index 3cd9664fb1..8b01d7c89d 100644 --- a/libs/surfaces/mackie/mackie_jog_wheel.cc +++ b/libs/surfaces/mackie/mackie_jog_wheel.cc @@ -1,5 +1,7 @@ #include <cmath> +#include <ardour/session.h> + #include "mackie_jog_wheel.h" #include "mackie_control_protocol.h" @@ -24,7 +26,7 @@ JogWheel::State JogWheel::jog_wheel_state() const { if ( !_jog_wheel_states.empty() ) return _jog_wheel_states.top(); - else + else return scroll; } diff --git a/libs/surfaces/mackie/mackie_port.cc b/libs/surfaces/mackie/mackie_port.cc index 85e05fd1b4..4413d3fc34 100644 --- a/libs/surfaces/mackie/mackie_port.cc +++ b/libs/surfaces/mackie/mackie_port.cc @@ -30,7 +30,7 @@ #include "midi++/types.h" #include "midi++/port.h" #include "sigc++/sigc++.h" -#include "ardour/configuration.h" +#include "ardour/rc_configuration.h" #include "i18n.h" diff --git a/libs/surfaces/osc/interface.cc b/libs/surfaces/osc/interface.cc index 1d313eeaa6..7b6b2e801f 100644 --- a/libs/surfaces/osc/interface.cc +++ b/libs/surfaces/osc/interface.cc @@ -17,6 +17,7 @@ * * */ +#include "ardour/rc_configuration.h" #include "control_protocol/control_protocol.h" #include "osc.h" diff --git a/libs/surfaces/osc/osc.h b/libs/surfaces/osc/osc.h index 6cc0598520..63433e7059 100644 --- a/libs/surfaces/osc/osc.h +++ b/libs/surfaces/osc/osc.h @@ -32,7 +32,6 @@ #include <sigc++/sigc++.h> #include "ardour/types.h" -#include "ardour/session.h" #include "control_protocol/control_protocol.h" class OSCControllable; diff --git a/libs/surfaces/tranzport/tranzport_common.h b/libs/surfaces/tranzport/tranzport_common.h index a7beb8f943..b3a2da513a 100644 --- a/libs/surfaces/tranzport/tranzport_common.h +++ b/libs/surfaces/tranzport/tranzport_common.h @@ -36,7 +36,7 @@ #include "ardour/route.h" #include "ardour/audio_track.h" -#include "ardour/session.h" +#include "ardour/rc_configuration.h" #include "ardour/tempo.h" #include "ardour/location.h" #include "ardour/dB.h" diff --git a/libs/surfaces/tranzport/wheel_modes.cc b/libs/surfaces/tranzport/wheel_modes.cc index 6a4e113222..a7861fc5ed 100644 --- a/libs/surfaces/tranzport/wheel_modes.cc +++ b/libs/surfaces/tranzport/wheel_modes.cc @@ -37,7 +37,6 @@ #include "ardour/route.h" #include "ardour/audio_track.h" -#include "ardour/session.h" #include "ardour/tempo.h" #include "ardour/location.h" #include "ardour/dB.h" |