Merge branch 'timoore/effects-anim-rebase' into next

[simgear.git] / simgear / io / sg_file.hxx

diff --git a/simgear/io/sg_file.hxx b/simgear/io/sg_file.hxx
index 2eb87d42215f62284a6c8395bbb164251b9e1cc5..1bf3800de6fcfafd252556b878795982d175d5fa 100644 (file)
--- a/simgear/io/sg_file.hxx
+++ b/simgear/io/sg_file.hxx
@@ -44,7 +44,7 @@
 
 #include "iochannel.hxx"
 
-SG_USING_STD(string);
+using std::string;
 
 
 /**
@@ -55,7 +55,10 @@ class SGFile : public SGIOChannel {
     string file_name;
     int fp;
     bool eof_flag;
-    bool repeat;
+    // Number of repetitions to play. -1 means loop infinitely.
+    const int repeat;
+    int iteration;              // number of current repetition,
+                                // starting at 0
 
 public:
 
@@ -67,7 +70,7 @@ public:
      * @param file name of file to open
      * @param repeat On eof restart at the beginning of the file
      */
-    SGFile( const string& file, bool repeat_ = false );
+    SGFile( const string& file, int repeat_ = 1 );
 
     /** Destructor */
     ~SGFile();