Changeset 11005 for code/branches/cpp11_v2/src/orxonox/sound/BaseSound.h

Timestamp:

Dec 30, 2015, 10:31:43 PM (8 years ago)

Author:

landauf

Message:

using strongly typed enum in various classes in orxonox-library

File:

• code/branches/cpp11_v2/src/orxonox/sound/BaseSound.h (modified) (3 diffs)

code/branches/cpp11_v2/src/orxonox/sound/BaseSound.h

@@ -54 +54 @@
         virtual void pause() { this->doPause(); }
 
-        bool isPlaying() const { return this->state_ == Playing; }
-        bool isPaused()  const { return this->state_ == Paused; }
-        bool isStopped() const { return this->state_ == Stopped; }
+        bool isPlaying() const { return this->state_ == State::Playing; }
+        bool isPaused()  const { return this->state_ == State::Paused; }
+        bool isStopped() const { return this->state_ == State::Stopped; }
 
         virtual void setSource(const std::string& source);
@@ -76 +76 @@
 
     protected:
-        enum State
+        enum class State
         {
             Stopped,
@@ -111 +111 @@
         float           volume_;
         bool            bLooping_;
-        uint8_t         state_;       // This Variable is actually of type State
+        State           state_;       // This Variable is actually of type State
         float           pitch_;