properly clean up meter-pattern cache

[ardour.git] / libs / surfaces / control_protocol / control_protocol.cc

diff --git a/libs/surfaces/control_protocol/control_protocol.cc b/libs/surfaces/control_protocol/control_protocol.cc
index d660c10800fd7836d78c39d189671973d86847d3..6ac673925a52d347f7fe1700197e20135cc52dde 100644 (file)
--- a/libs/surfaces/control_protocol/control_protocol.cc
+++ b/libs/surfaces/control_protocol/control_protocol.cc
@@ -16,35 +16,63 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
-#include <ardour/session.h>
-#include <ardour/route.h>
-#include <ardour/audio_track.h>
-#include <ardour/meter.h>
-#include <control_protocol/control_protocol.h>
+#include "pbd/error.h"
+
+#include "ardour/session.h"
+#include "ardour/route.h"
+#include "ardour/audio_track.h"
+#include "ardour/meter.h"
+#include "ardour/amp.h"
+#include "control_protocol/control_protocol.h"
 
 using namespace ARDOUR;
 using namespace std;
-
-sigc::signal<void> ControlProtocol::ZoomToSession;
-sigc::signal<void> ControlProtocol::ZoomOut;
-sigc::signal<void> ControlProtocol::ZoomIn;
-sigc::signal<void> ControlProtocol::Enter;
-sigc::signal<void,float> ControlProtocol::ScrollTimeline;
+using namespace PBD;
+
+Signal0<void>       ControlProtocol::ZoomToSession;
+Signal0<void>       ControlProtocol::ZoomOut;
+Signal0<void>       ControlProtocol::ZoomIn;
+Signal0<void>       ControlProtocol::Enter;
+Signal0<void>       ControlProtocol::Undo;
+Signal0<void>       ControlProtocol::Redo;
+Signal1<void,float> ControlProtocol::ScrollTimeline;
+Signal1<void,uint32_t> ControlProtocol::GotoView;
+Signal0<void> ControlProtocol::CloseDialog;
+PBD::Signal0<void> ControlProtocol::VerticalZoomInAll;
+PBD::Signal0<void> ControlProtocol::VerticalZoomOutAll;
+PBD::Signal0<void> ControlProtocol::VerticalZoomInSelected;
+PBD::Signal0<void> ControlProtocol::VerticalZoomOutSelected;
+PBD::Signal1<void,RouteNotificationListPtr> ControlProtocol::TrackSelectionChanged;
+PBD::Signal1<void,uint32_t> ControlProtocol::AddRouteToSelection;
+PBD::Signal1<void,uint32_t> ControlProtocol::SetRouteSelection;
+PBD::Signal1<void,uint32_t> ControlProtocol::ToggleRouteSelection;
+PBD::Signal1<void,uint32_t> ControlProtocol::RemoveRouteFromSelection;
+PBD::Signal0<void>          ControlProtocol::ClearRouteSelection;
+PBD::Signal0<void>          ControlProtocol::StepTracksDown;
+PBD::Signal0<void>          ControlProtocol::StepTracksUp;
+
+const std::string ControlProtocol::state_node_name ("Protocol");
 
 ControlProtocol::ControlProtocol (Session& s, string str)
-       : BasicUI (s),
-         _name (str)
+       : BasicUI (s)
+       , _name (str)
+       , _active (false)
 {
-       _active = false;
 }
 
 ControlProtocol::~ControlProtocol ()
 {
 }
 
+int
+ControlProtocol::set_active (bool yn)
+{
+       _active = yn;
+       return 0;
+}
+
 void
 ControlProtocol::next_track (uint32_t initial_id)
 {
@@ -64,14 +92,14 @@ ControlProtocol::next_track (uint32_t initial_id)
                id++;
        }
 
-       while (id < limit) {
+       while (id <= limit) {
                if ((cr = session->route_by_remote_id (id)) != 0) {
                        break;
                }
                id++;
        }
 
-       if (id == limit) {
+       if (id >= limit) {
                id = 0;
                while (id != initial_id) {
                        if ((cr = session->route_by_remote_id (id)) != 0) {
@@ -87,9 +115,9 @@ ControlProtocol::next_track (uint32_t initial_id)
 void
 ControlProtocol::prev_track (uint32_t initial_id)
 {
-       uint32_t limit = session->nroutes() - 1;
+       uint32_t limit = session->nroutes();
        boost::shared_ptr<Route> cr = route_table[0];
-       uint32_t id;
+       int32_t id;
 
        if (cr) {
                id = cr->remote_control_id ();
@@ -98,7 +126,7 @@ ControlProtocol::prev_track (uint32_t initial_id)
        }
 
        if (id == 0) {
-               id = session->nroutes() - 1;
+               id = limit;
        } else {
                id--;
        }
@@ -111,12 +139,12 @@ ControlProtocol::prev_track (uint32_t initial_id)
        }
 
        if (id < 0) {
-               id = limit;
-               while (id > initial_id) {
-                       if ((cr = session->route_by_remote_id (id)) != 0) {
+               uint32_t i = limit;
+               while (i > initial_id) {
+                       if ((cr = session->route_by_remote_id (i)) != 0) {
                                break;
                        }
-                       id--;
+                       i--;
                }
        }
 
@@ -170,7 +198,7 @@ ControlProtocol::route_set_rec_enable (uint32_t table_index, bool yn)
        boost::shared_ptr<AudioTrack> at = boost::dynamic_pointer_cast<AudioTrack>(r);
 
        if (at) {
-               at->set_record_enable (yn, this);
+               at->set_record_enabled (yn, this);
        }
 }
 
@@ -206,7 +234,7 @@ ControlProtocol::route_get_gain (uint32_t table_index)
                return 0.0f;
        }
 
-       return r->gain ();
+       return r->amp()->gain ();
 }
 
 void
@@ -236,7 +264,7 @@ ControlProtocol::route_get_effective_gain (uint32_t table_index)
                return 0.0f;
        }
 
-       return r->effective_gain ();
+       return r->amp()->gain_control()->get_value();
 }
 
 
@@ -253,7 +281,7 @@ ControlProtocol::route_get_peak_input_power (uint32_t table_index, uint32_t whic
                return 0.0f;
        }
 
-       return r->peak_meter().peak_power (which_input);
+       return r->peak_meter().meter_level (which_input, MeterPeak);
 }
 
 
@@ -334,3 +362,31 @@ ControlProtocol:: route_get_name (uint32_t table_index)
        return r->name();
 }
 
+list<boost::shared_ptr<Bundle> >
+ControlProtocol::bundles ()
+{
+       return list<boost::shared_ptr<Bundle> > ();
+}
+
+XMLNode&
+ControlProtocol::get_state ()
+{
+       XMLNode* node = new XMLNode (state_node_name);
+
+       node->add_property ("name", _name);
+       node->add_property ("feedback", get_feedback() ? "yes" : "no");
+
+       return *node;
+}
+
+int
+ControlProtocol::set_state (XMLNode const & node, int /* version */)
+{
+       const XMLProperty* prop;
+
+       if ((prop = node.property ("feedback")) != 0) {
+               set_feedback (string_is_affirmative (prop->value()));
+       }
+
+       return 0;
+}