Cleanup: use enum class.

diff --git a/src/lib/butler.cc b/src/lib/butler.cc
index 5a5cc4912f8296e004f97f84f3108f4525c4ab5d..6f7349b5f07bd2b7511f8eaf0aecda9e21a40e28 100644 (file)
--- a/src/lib/butler.cc
+++ b/src/lib/butler.cc
@@ -250,10 +250,10 @@ Butler::get_video (bool blocking, Error* e)
        auto setup_error = [this](Error* e, Error::Code fallback) {
                if (e) {
                        if (_died) {
-                               e->code = Error::DIED;
+                               e->code = Error::Code::DIED;
                                e->message = _died_message;
                        } else if (_finished) {
-                               e->code = Error::FINISHED;
+                               e->code = Error::Code::FINISHED;
                        } else {
                                e->code = fallback;
                        }
@@ -261,7 +261,7 @@ Butler::get_video (bool blocking, Error* e)
        };
 
        if (_video.empty() && (_finished || _died || (_suspended && !blocking))) {
-               setup_error (e, Error::AGAIN);
+               setup_error (e, Error::Code::AGAIN);
                return make_pair(shared_ptr<PlayerVideo>(), DCPTime());
        }
 
@@ -271,7 +271,7 @@ Butler::get_video (bool blocking, Error* e)
        }
 
        if (_video.empty()) {
-               setup_error (e, Error::NONE);
+               setup_error (e, Error::Code::NONE);
                return make_pair(shared_ptr<PlayerVideo>(), DCPTime());
        }
 
@@ -467,13 +467,13 @@ Butler::Error::summary () const
 {
        switch (code)
        {
-               case Error::NONE:
+               case Error::Code::NONE:
                        return "No error registered";
-               case Error::AGAIN:
+               case Error::Code::AGAIN:
                        return "Butler not ready";
-               case Error::DIED:
+               case Error::Code::DIED:
                        return String::compose("Butler died (%1)", message);
-               case Error::FINISHED:
+               case Error::Code::FINISHED:
                        return "Butler finished";
        }
 

diff --git a/src/lib/butler.h b/src/lib/butler.h
index cd3891754be508c51603b8b343e3069a3a95481a..498af8d86af821f9bd3c52db0d0d936b8171e40a 100644 (file)
--- a/src/lib/butler.h
+++ b/src/lib/butler.h
@@ -59,18 +59,14 @@ public:
 
        class Error {
        public:
-               enum Code{
+               enum class Code {
                        NONE,
                        AGAIN,
                        DIED,
                        FINISHED
                };
 
-               Error()
-                       : code (NONE)
-               {}
-
-               Code code;
+               Code code = Code::NONE;
                std::string message;
 
                std::string summary () const;

diff --git a/src/wx/video_view.cc b/src/wx/video_view.cc
index 1d10beb30b7bd74255ea2e63153c311e12b11bef..331095253127896dd0f824c9bef6c0d5a9d01997 100644 (file)
--- a/src/wx/video_view.cc
+++ b/src/wx/video_view.cc
@@ -76,11 +76,11 @@ VideoView::get_next_frame (bool non_blocking)
        do {
                Butler::Error e;
                auto pv = butler->get_video (!non_blocking, &e);
-               if (e.code == Butler::Error::DIED) {
+               if (e.code == Butler::Error::Code::DIED) {
                        LOG_ERROR ("Butler died with %1", e.summary());
                }
                if (!pv.first) {
-                       return e.code == Butler::Error::AGAIN ? AGAIN : FAIL;
+                       return e.code == Butler::Error::Code::AGAIN ? AGAIN : FAIL;
                }
                _player_video = pv;
        } while (