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 b116cf1f8c7d3e26cd4d1c070b2a6f5572ee0367..1bf3800de6fcfafd252556b878795982d175d5fa 100644 (file)
--- a/simgear/io/sg_file.hxx
+++ b/simgear/io/sg_file.hxx
@@ -4,7 +4,7 @@
 
 // Written by Curtis Olson, started November 1999.
 //
-// Copyright (C) 1999  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 1999  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -18,7 +18,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -44,7 +44,7 @@
 
 #include "iochannel.hxx"
 
-SG_USING_STD(string);
+using std::string;
 
 
 /**
@@ -54,6 +54,11 @@ class SGFile : public SGIOChannel {
 
     string file_name;
     int fp;
+    bool eof_flag;
+    // Number of repetitions to play. -1 means loop infinitely.
+    const int repeat;
+    int iteration;              // number of current repetition,
+                                // starting at 0
 
 public:
 
@@ -63,8 +68,9 @@ public:
      * name. This file is not opened immediately, but instead will be
      * opened when the open() method is called.
      * @param file name of file to open
+     * @param repeat On eof restart at the beginning of the file
      */
-    SGFile( const string& file );
+    SGFile( const string& file, int repeat_ = 1 );
 
     /** Destructor */
     ~SGFile();
@@ -87,8 +93,11 @@ public:
     // close file
     bool close();
 
-    /** Return the name of the file being manipulated. */
+    /** @return the name of the file being manipulated. */
     inline string get_file_name() const { return file_name; }
+
+    /** @return true of eof conditions exists */
+    inline bool eof() const { return eof_flag; };
 };