Ensure individual log-level setting works.

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

diff --git a/simgear/io/sg_file.hxx b/simgear/io/sg_file.hxx
index 9f91af347b9b75dc89df65e373a6d3e9b5964719..7d84286389778812efdd72b49dfd9022eb223723 100644 (file)
--- a/simgear/io/sg_file.hxx
+++ b/simgear/io/sg_file.hxx
@@ -26,35 +26,25 @@
 #ifndef _SG_FILE_HXX
 #define _SG_FILE_HXX
 
-
-#ifndef __cplusplus
-# error This library requires C++
-#endif
-
 #include <simgear/compiler.h>
 
 #include <string>
 
-#include <sys/types.h>         // for open(), read(), write(), close()
-#include <sys/stat.h>          // for open(), read(), write(), close()
-#include <fcntl.h>             // for open(), read(), write(), close()
-#if !defined( _MSC_VER )
-#  include <unistd.h>          // for open(), read(), write(), close()
-#endif
-
 #include "iochannel.hxx"
 
-SG_USING_STD(string);
-
 
 /**
  * A file I/O class based on SGIOChannel.
  */
 class SGFile : public SGIOChannel {
 
-    string file_name;
+    std::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:
 
@@ -64,8 +54,14 @@ 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 std::string& file, int repeat_ = 1 );
+
+    /**
+     * Create an SGFile from an existing, open file-descriptor
      */
-    SGFile( const string& file );
+    SGFile( int existingFd );
 
     /** Destructor */
     ~SGFile();
@@ -89,10 +85,10 @@ public:
     bool close();
 
     /** @return the name of the file being manipulated. */
-    inline string get_file_name() const { return file_name; }
+    inline std::string get_file_name() const { return file_name; }
 
     /** @return true of eof conditions exists */
-    inline bool eof() const { return eof_flag; };
+    virtual bool eof() const { return eof_flag; };
 };