//
// 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$
#include <simgear/bucket/newbucket.hxx>
#include <simgear/misc/sg_path.hxx>
-#ifdef ENABLE_THREADS
+#if defined(ENABLE_THREADS)
# include <simgear/threads/SGThread.hxx>
# include <simgear/threads/SGQueue.hxx>
#else
# include <queue>
+ SG_USING_STD( queue );
#endif
+
// Forward reference.
class FGTileEntry;
*/
~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.
private:
-#ifdef ENABLE_THREADS
+#if defined(ENABLE_THREADS)
/**
* FIFO queue of tiles to load from data files.
*/
#endif
/**
- * Base name of directory containing tile data file.
+ * Base names of directories containing tile data files.
*/
- SGPath tile_path;
+ string_list tile_path;
-#ifdef ENABLE_THREADS
+#if defined(ENABLE_THREADS)
/**
* Maximum number of threads to create for loading tiles.
*/
* Lock and synchronize access to tile queue.
*/
SGMutex mutex;
- SGCondition frame_cond;
+ SGPthreadCond frame_cond;
/**
* Thread cleanup handler.