#include <float.h>
#include <sys/time.h>
#include <errno.h>
-#include <poll.h>
#include <boost/shared_array.hpp>
, _gui (0)
, _zoom_mode (false)
, _scrub_mode (false)
- , _flip_mode (false)
+ , _flip_mode (Normal)
, _view_mode (Mixer)
, _current_selected_track (-1)
, _modifier_state (0)
for (Surfaces::const_iterator si = surfaces.begin(); si != surfaces.end(); ++si) {
(*si)->say_hello ();
}
+
+ if (_device_info.no_handshake()) {
+ for (Surfaces::const_iterator si = surfaces.begin(); si != surfaces.end(); ++si) {
+ (*si)->turn_it_on ();
+ }
+ }
}
// go to the previous track.
continue;
}
- if (route->is_hidden() || route->is_master() || route->is_monitor()) {
+ if (route->is_auditioner() || route->is_master() || route->is_monitor()) {
continue;
}
BaseUI::run ();
- create_surfaces ();
+ if (create_surfaces ()) {
+ return -1;
+ }
connect_session_signals ();
_active = true;
update_surfaces ();
now_usecs = (now.tv_sec * 1000000) + now.tv_usec;
- for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
- (*s)->periodic (now_usecs);
+ {
+ Glib::Threads::Mutex::Lock lm (surfaces_lock);
+
+ for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
+ (*s)->periodic (now_usecs);
+ }
}
update_timecode_display ();
void
MackieControlProtocol::update_global_button (int id, LedState ls)
{
+ Glib::Threads::Mutex::Lock lm (surfaces_lock);
+
if (!_device_info.has_global_controls()) {
return;
}
void
MackieControlProtocol::update_global_led (int id, LedState ls)
{
+ Glib::Threads::Mutex::Lock lm (surfaces_lock);
+
if (!_device_info.has_global_controls()) {
return;
}
void
MackieControlProtocol::initialize()
{
- if (surfaces.empty()) {
- return;
- }
-
- if (!surfaces.front()->active ()) {
- return;
+ {
+ Glib::Threads::Mutex::Lock lm (surfaces_lock);
+
+ if (surfaces.empty()) {
+ return;
+ }
+
+ if (!surfaces.front()->active ()) {
+ return;
+ }
+
+ // sometimes the jog wheel is a pot
+ if (_device_info.has_jog_wheel()) {
+ surfaces.front()->blank_jog_ring ();
+ }
}
- // sometimes the jog wheel is a pot
- if (_device_info.has_jog_wheel()) {
- surfaces.front()->blank_jog_ring ();
- }
-
// update global buttons and displays
notify_record_state_changed();
_device_profile = d->second;
}
-void
+int
MackieControlProtocol::set_device (const string& device_name, bool allow_activation)
{
map<string,DeviceInfo>::iterator d = DeviceInfo::device_info.find (device_name);
+ DEBUG_TRACE (DEBUG::MackieControl, string_compose ("new device chosen %1, activation allowed ? %2\n",
+ device_name, allow_activation));
+
if (d == DeviceInfo::device_info.end()) {
- return;
+ return -1;
}
if (_active) {
clear_ports ();
- surfaces.clear ();
+ clear_surfaces ();
}
_device_info = d->second;
set_active (true);
} else {
if (_active) {
- create_surfaces ();
+ if (create_surfaces ()) {
+ return -1;
+ }
switch_banks (0, true);
}
}
+ return 0;
}
-void
+int
MackieControlProtocol::create_surfaces ()
{
string device_name;
for (uint32_t n = 0; n < 1 + _device_info.extenders(); ++n) {
- boost::shared_ptr<Surface> surface (new Surface (*this, device_name, n, stype));
- surfaces.push_back (surface);
+ boost::shared_ptr<Surface> surface;
+
+ try {
+ surface.reset (new Surface (*this, device_name, n, stype));
+ } catch (...) {
+ return -1;
+ }
+
+ {
+ Glib::Threads::Mutex::Lock lm (surfaces_lock);
+ surfaces.push_back (surface);
+ }
/* next device will be an extender */
g_source_ref (psrc->gobj());
}
}
+
+ return 0;
}
void
route_connections.drop_connections ();
periodic_connection.disconnect ();
- surfaces.clear ();
+ clear_surfaces();
}
XMLNode&
void
MackieControlProtocol::update_timecode_display()
{
+ Glib::Threads::Mutex::Lock lm (surfaces_lock);
+
if (surfaces.empty()) {
return;
}
void
MackieControlProtocol::notify_solo_active_changed (bool active)
{
- boost::shared_ptr<Surface> surface = surfaces.front();
+ boost::shared_ptr<Surface> surface;
+
+ {
+ Glib::Threads::Mutex::Lock lm (surfaces_lock);
+ surface = surfaces.front ();
+ }
map<int,Control*>::iterator x = surface->controls_by_device_independent_id.find (Led::RudeSolo);
if (x != surface->controls_by_device_independent_id.end()) {
void
MackieControlProtocol::notify_metering_state_changed()
{
+ Glib::Threads::Mutex::Lock lm (surfaces_lock);
+
for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
(*s)->notify_metering_state_changed ();
}
if (!_device_info.has_global_controls()) {
return;
}
- boost::shared_ptr<Surface> surface = surfaces.front();
+ boost::shared_ptr<Surface> surface;
+
+ {
+ Glib::Threads::Mutex::Lock lm (surfaces_lock);
+ surface = surfaces.front();
+ }
+
/* rec is a tristate */
map<int,Control*>::iterator x = surface->controls_by_device_independent_id.find (Button::Record);
*/
if (!_device_info.uses_ipmidi()) {
+#ifndef PLATFORM_WINDOWS
CrossThreadChannel::drain (port->selectable());
+#endif
}
DEBUG_TRACE (DEBUG::MackieControl, string_compose ("data available on %1\n", port->name()));
- framepos_t now = session->engine().frame_time();
+ framepos_t now = session->engine().sample_time();
port->parse (now);
}
void
MackieControlProtocol::set_view_mode (ViewMode m)
{
+ Glib::Threads::Mutex::Lock lm (surfaces_lock);
+
_view_mode = m;
for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
}
void
-MackieControlProtocol::set_flip_mode (bool yn)
+MackieControlProtocol::set_flip_mode (FlipMode fm)
{
- _flip_mode = yn;
+ Glib::Threads::Mutex::Lock lm (surfaces_lock);
+
+ _flip_mode = fm;
for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
(*s)->update_flip_mode_display ();
return;
}
+ Glib::Threads::Mutex::Lock lm (surfaces_lock);
+
for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
if ((*s)->number() == surface) {
Strip* strip = (*s)->nth_strip (strip_number);
void
MackieControlProtocol::_gui_track_selection_changed (ARDOUR::RouteNotificationList* rl, bool save_list)
{
-
/* We need to keep a list of the most recently selected routes around,
but we are not allowed to keep shared_ptr<Route> unless we want to
handle the complexities of route deletion. So instead, the GUI sends
}
}
- for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
- (*s)->gui_selection_changed (srl);
+ {
+ Glib::Threads::Mutex::Lock lm (surfaces_lock);
+
+ for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
+ (*s)->gui_selection_changed (srl);
+ }
}
if (save_list) {
void
MackieControlProtocol::remove_down_select_button (int surface, int strip)
{
- DownButtonList::iterator x = find (_down_select_buttons.begin(), _down_select_buttons.end(), (surface<<8)|(strip&0xf));
+ DownButtonList::iterator x = find (_down_select_buttons.begin(), _down_select_buttons.end(), (uint32_t) (surface<<8)|(strip&0xf));
DEBUG_TRACE (DEBUG::MackieControl, string_compose ("removing surface %1 strip %2 from down select buttons\n", surface, strip));
if (x != _down_select_buttons.end()) {
_down_select_buttons.erase (x);
DEBUG_TRACE (DEBUG::MackieControl, string_compose ("PRR %5 in list %1.%2 - %3.%4\n", first_surface, first_strip, last_surface, last_strip,
down.size()));
+ Glib::Threads::Mutex::Lock lm (surfaces_lock);
+
for (Surfaces::const_iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
if ((*s)->number() >= first_surface && (*s)->number() <= last_surface) {
}
}
-void
+int
MackieControlProtocol::ipmidi_restart ()
{
clear_ports ();
- surfaces.clear ();
- create_surfaces ();
+ clear_surfaces ();
+ if (create_surfaces ()) {
+ return -1;
+ }
switch_banks (_current_initial_bank, true);
needs_ipmidi_restart = false;
+ return 0;
+}
+
+void
+MackieControlProtocol::clear_surfaces ()
+{
+ Glib::Threads::Mutex::Lock lm (surfaces_lock);
+ surfaces.clear ();
}