Enums are not Classes in C++98

diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc
index 61e1828450e223b877eb0903573e7f28bcd00dec..f6c89005b76bb4651bda18d098e427aa7bdf0e4b 100644 (file)
--- a/libs/surfaces/osc/osc.cc
+++ b/libs/surfaces/osc/osc.cc
@@ -2215,19 +2215,19 @@ OSC::set_automation (const char *path, size_t len, lo_arg **argv, int argc, lo_m
                        if (strp->gain_control ()) {
                                switch (aut) {
                                        case 0:
-                                               strp->gain_control()->set_automation_state (ARDOUR::AutoState::Off);
+                                               strp->gain_control()->set_automation_state (ARDOUR::Off);
                                                ret = 0;
                                                break;
                                        case 1:
-                                               strp->gain_control()->set_automation_state (ARDOUR::AutoState::Play);
+                                               strp->gain_control()->set_automation_state (ARDOUR::Play);
                                                ret = 0;
                                                break;
                                        case 2:
-                                               strp->gain_control()->set_automation_state (ARDOUR::AutoState::Write);
+                                               strp->gain_control()->set_automation_state (ARDOUR::Write);
                                                ret = 0;
                                                break;
                                        case 3:
-                                               strp->gain_control()->set_automation_state (ARDOUR::AutoState::Touch);
+                                               strp->gain_control()->set_automation_state (ARDOUR::Touch);
                                                ret = 0;
                                                break;
                                        default:

diff --git a/libs/surfaces/osc/osc_route_observer.cc b/libs/surfaces/osc/osc_route_observer.cc
index 049098f0b153f28110a881f43e11552616fc8e64..d721c2dd60b6f62d8034d96adbe69fc7bae065e1 100644 (file)
--- a/libs/surfaces/osc/osc_route_observer.cc
+++ b/libs/surfaces/osc/osc_route_observer.cc
@@ -44,7 +44,7 @@ OSCRouteObserver::OSCRouteObserver (boost::shared_ptr<Stripable> s, lo_address a
        addr = lo_address_new (lo_address_get_hostname(a) , lo_address_get_port(a));
        gainmode = sur->gainmode;
        feedback = sur->feedback;
-       as = ARDOUR::AutoState::Off;
+       as = ARDOUR::Off;
 
        if (feedback[0]) { // buttons are separate feedback
                _strip->PropertyChanged.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::name_changed, this, boost::lambda::_1), OSC::instance());
@@ -223,7 +223,7 @@ OSCRouteObserver::tick ()
                }
        }
        if (feedback[1]) {
-               if (as != ARDOUR::AutoState::Off) {
+               if (as != ARDOUR::Off) {
                        if(_last_gain != _strip->gain_control()->get_value()) {
                                _last_gain = _strip->gain_control()->get_value();
                                if (gainmode) {

diff --git a/libs/surfaces/osc/osc_select_observer.cc b/libs/surfaces/osc/osc_select_observer.cc
index 2cc42569cc86c57ca0fc64bd4848d4e77ee486ea..edd3baab2f45c54c3a612e45572c106ee0ce6dcc 100644 (file)
--- a/libs/surfaces/osc/osc_select_observer.cc
+++ b/libs/surfaces/osc/osc_select_observer.cc
@@ -52,7 +52,7 @@ OSCSelectObserver::OSCSelectObserver (boost::shared_ptr<Stripable> s, lo_address
        ,_last_gain (0.0)
 {
        addr = lo_address_new (lo_address_get_hostname(a) , lo_address_get_port(a));
-       as = ARDOUR::AutoState::Off;
+       as = ARDOUR::Off;
 
        if (feedback[0]) { // buttons are separate feedback
                _strip->PropertyChanged.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::name_changed, this, boost::lambda::_1), OSC::instance());
@@ -372,7 +372,7 @@ OSCSelectObserver::tick ()
                }
        }
        if (feedback[1]) {
-               if (as != ARDOUR::AutoState::Off) {
+               if (as != ARDOUR::Off) {
                        if(_last_gain != _strip->gain_control()->get_value()) {
                                _last_gain = _strip->gain_control()->get_value();
                                if (gainmode) {