Moved some of the low level scene graph construction code over to simgear.

[flightgear.git] / src / Scenery / FGTileLoader.hxx

diff --git a/src/Scenery/FGTileLoader.hxx b/src/Scenery/FGTileLoader.hxx
index 258232a52bc516dfcd71dbd4e81c20090c7bcd6c..5d7d984928c7a9483571ce428d3f5ba4ab1fc450 100644 (file)
--- a/src/Scenery/FGTileLoader.hxx
+++ b/src/Scenery/FGTileLoader.hxx
@@ -32,8 +32,10 @@
 #  include <simgear/threads/SGQueue.hxx>
 #else
 #  include <queue>
+   SG_USING_STD( queue );
 #endif
 
+
 // Forward reference.
 class FGTileEntry;
 
@@ -54,17 +56,28 @@ public:
      */
     ~FGTileLoader();
 
+#if 0 // we don't ever want to do this I don't think
+    /**
+     * Flush anything in pending load queue without doing the work
+     * Leave the free queue intact since that's are only record of
+     * things we need to remove.
+     */
+    void reinit();
+#endif
+    
     /**
      * Add a tile to the end of the load queue.
      * @param tile The tile to be loaded from disk.
      */
     void add( FGTileEntry* tile );
 
+#ifdef WISH_PLIB_WAS_THREADED // but it isn't
     /**
      * Remove a tile from memory.
      * @param tile The tile to be removed from memory.
      */
     void remove( FGTileEntry* tile );
+#endif
 
     /**
      * The tile loader thread will only load one tile per call to the
@@ -89,10 +102,10 @@ private:
      * FIFO queue of tiles to load from data files.
      */
     SGBlockingQueue< FGTileEntry * > tile_load_queue;
-    SGBlockingQueue< FGTileEntry * > tile_free_queue;
+    // SGBlockingQueue< FGTileEntry * > tile_free_queue;
 #else
     queue< FGTileEntry * > tile_load_queue;
-    queue< FGTileEntry * > tile_free_queue;
+    // queue< FGTileEntry * > tile_free_queue;
 #endif
 
     /**
@@ -142,7 +155,7 @@ private:
      * Lock and synchronize access to tile queue.
      */
     SGMutex mutex;
-    SGCondition frame_cond;
+    SGPthreadCond frame_cond;
 
     /**
      * Thread cleanup handler.