From ab347eb34c380424a7b1134fb56829b0f7f585a8 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 12 Jun 2007 14:43:26 +0000
Subject: [PATCH] Changed _data to _movieData to avoid possible confusion

---
 .../quicktime/QuicktimeImageStream.cpp        | 39 ++++++++++---------
 .../quicktime/QuicktimeImageStream.h          |  4 +-
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/osgPlugins/quicktime/QuicktimeImageStream.cpp b/src/osgPlugins/quicktime/QuicktimeImageStream.cpp
index a099687fe..25578a0c7 100644
--- a/src/osgPlugins/quicktime/QuicktimeImageStream.cpp
+++ b/src/osgPlugins/quicktime/QuicktimeImageStream.cpp
@@ -43,7 +43,7 @@ int QuicktimeImageStream::_qtInstanceCount = 0;
 QuicktimeImageStream::QuicktimeImageStream(std::string fileName) : ImageStream()
 {
     _len = 0;
-    _data = new MovieData();
+    _movieData = new MovieData();
 
     for (int i = 0; i < NUM_CMD_INDEX; i++)
       _cmd[i] = THREAD_IDLE;
@@ -69,7 +69,7 @@ QuicktimeImageStream::~QuicktimeImageStream()
 
    
    // clean up quicktime movies.
-   delete _data;
+   delete _movieData;
    
 }
 
@@ -106,9 +106,9 @@ void QuicktimeImageStream::load(std::string fileName)
 {
    osg::notify(osg::DEBUG_INFO) << "QT-ImageStream: loading quicktime movie from " << fileName << std::endl;
 
-   _data->load(this, fileName);
+   _movieData->load(this, fileName);
 
-   _len = _data->getMovieDuration();
+   _len = _movieData->getMovieDuration();
    _current = 0;
 }
 
@@ -139,7 +139,7 @@ void QuicktimeImageStream::run()
 
 
       ThreadCommand cmd = getCmd();
-      osg::notify(osg::DEBUG_INFO) << "movietime: " << _data->getMovieTime() << " rate: " << _data->getMovieRate() << " state " << cmd << " playing: " << playing << " done " << done << "  " << _wrIndex << "/" << _rdIndex << std::endl;        
+      osg::notify(osg::DEBUG_INFO) << "movietime: " << _movieData->getMovieTime() << " rate: " << _movieData->getMovieRate() << " state " << cmd << " playing: " << playing << " done " << done << "  " << _wrIndex << "/" << _rdIndex << std::endl;        
       // Handle commands               
       {
          if (cmd != THREAD_IDLE) {
@@ -147,43 +147,43 @@ void QuicktimeImageStream::run()
             switch (cmd) {
                     case THREAD_START: // Start or continue stream
                        applyLoopingMode();    
-                       _data->setMovieRate(1.0f);
+                       _movieData->setMovieRate(1.0f);
 
                        playing = true;
                        break;
 
                     case THREAD_STOP:
-                       _data->setMovieRate(0);
+                       _movieData->setMovieRate(0);
                        osg::notify(osg::INFO) << "QT-ImageStream: stop at "<< std::endl;
                        playing = false;
                        break;
 
                     case THREAD_REWIND:
-                       SetMovieRate(_data->getMovie(),0);
-                       GoToBeginningOfMovie(_data->getMovie());
+                       SetMovieRate(_movieData->getMovie(),0);
+                       GoToBeginningOfMovie(_movieData->getMovie());
                        break;
 
                     case THREAD_FORWARD:
-                       SetMovieRate(_data->getMovie(),0);
-                       GoToEndOfMovie(_data->getMovie());
+                       SetMovieRate(_movieData->getMovie(),0);
+                       GoToEndOfMovie(_movieData->getMovie());
                        break;
 
                     case THREAD_SEEK:
-                       _data->setMovieTime(_currentRate);
+                       _movieData->setMovieTime(_currentRate);
                        playing = true;
                        break;
 
                     case THREAD_SETRATE:
-                       _data->setMovieRate(_currentRate);
+                       _movieData->setMovieRate(_currentRate);
                        playing = (_currentRate != 0.0f);
                        break;
 
                     case THREAD_CLOSE:
-                       _data->setMovieRate(0);
+                       _movieData->setMovieRate(0);
                        break;
 
                     case THREAD_QUIT: // TODO
-                       _data->setMovieRate(0);
+                       _movieData->setMovieRate(0);
                        osg::notify(osg::INFO) << "QT-ImageStream: quit" << std::endl;
                        //playing = false;
                        done = true;
@@ -194,8 +194,8 @@ void QuicktimeImageStream::run()
             }
          }
 
-         MoviesTask(_data->getMovie(),0);
-         _current = _data->getMovieTime();
+         MoviesTask(_movieData->getMovie(),0);
+         _current = _movieData->getMovieTime();
       }
 
 
@@ -221,7 +221,8 @@ void QuicktimeImageStream::run()
 }
 
 
-void QuicktimeImageStream::applyLoopingMode() {
+void QuicktimeImageStream::applyLoopingMode()
+{
     osg::notify(osg::INFO) << "applying loop mode " << getLoopingMode() << std::endl;
-    _data->setLooping(getLoopingMode() == osg::ImageStream::LOOPING);
+    _movieData->setLooping(getLoopingMode() == osg::ImageStream::LOOPING);
 }
diff --git a/src/osgPlugins/quicktime/QuicktimeImageStream.h b/src/osgPlugins/quicktime/QuicktimeImageStream.h
index c4027b943..a1a0fde77 100644
--- a/src/osgPlugins/quicktime/QuicktimeImageStream.h
+++ b/src/osgPlugins/quicktime/QuicktimeImageStream.h
@@ -101,7 +101,7 @@ public:
    inline float getCurrentTime() const { return _current; }
 
    /// @return the current moviedata-object
-   MovieData* getMovieData() { return _data; }
+   MovieData* getMovieData() { return _movieData; }
 
    /// loads a movie from fileName
    void load(std::string fileName);
@@ -144,7 +144,7 @@ private:
    float _current;
    float _currentRate;
 
-   MovieData* _data;
+   MovieData* _movieData;
 
    enum ThreadCommand {
       THREAD_IDLE = 0,