Changeset 10266

Timestamp:

05/25/09 14:04:29 (4 years ago)

Author:

robert

Message:

Changed Status enums to ActionStatus? and TimelineStatus? to avoid X11 problems

Files:

• OpenSceneGraph/trunk/include/osgAnimation/Timeline (modified) (5 diffs)

OpenSceneGraph/trunk/include/osgAnimation/Timeline

@@ -153 +153 @@
         unsigned int _loop;
 
-        enum Status
+        enum ActionStatus
         {
             Play,
@@ -159 +159 @@
         };
         
-        Status _state;
+        ActionStatus _state;
     };
 
@@ -172 +172 @@
         Timeline(const Timeline& nc,const osg::CopyOp& op = osg::CopyOp::SHALLOW_COPY);
 
-        enum Status
+        enum TimelineStatus
         {
             Play,
@@ -178 +178 @@
         };
 
-        Status getStatus() const { return _state; }
+        TimelineStatus getStatus() const { return _state; }
 
         typedef std::pair<unsigned int, osg::ref_ptr<Action> > FrameAction;
@@ -327 +327 @@
         bool _initFirstFrame;
 
-        Status _state;
+        TimelineStatus _state;
 
         // to manage pending operation