From 1fd3d5aa485e2a1b3b2d566daad257b43fccc7fd Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Fri, 11 Jan 2002 22:16:05 +0000
Subject: [PATCH] Removed old remnants of plib-1.2.x support.  We haven't
 officially supported this older version of plib in some time, but there were
 bits of code remaining that was (or could potentially) cause confusion.

---
 acconfig.h             |  3 ---
 src/Objects/newmat.cxx |  4 ----
 src/Sound/soundmgr.cxx | 17 -----------------
 3 files changed, 24 deletions(-)

diff --git a/acconfig.h b/acconfig.h
index 94ae557f8..cf7c32d07 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -54,9 +54,6 @@
 /* Define to enable plib joystick support (recommended) */
 #undef ENABLE_PLIB_JOYSTICK
    
-/* Define to enable plib joystick support (recommended) */
-#undef PLIB_1_2_X
-   
 /* Define to eliminate all trace of debugging messages such as for a 
    release build */
 #undef FG_NDEBUG
diff --git a/src/Objects/newmat.cxx b/src/Objects/newmat.cxx
index aad28e558..9a272d9c2 100644
--- a/src/Objects/newmat.cxx
+++ b/src/Objects/newmat.cxx
@@ -172,11 +172,7 @@ FGNewMat::load_texture ()
     return false;
   } else {
     SG_LOG( SG_GENERAL, SG_INFO, "Loading deferred texture " << texture_path );
-#ifdef PLIB_1_2_X
-    textured->setTexture((char *)texture_path.c_str(), wrapu, wrapv );
-#else
     textured->setTexture((char *)texture_path.c_str(), wrapu, wrapv, mipmap );
-#endif
     texture_loaded = true;
     return true;
   }
diff --git a/src/Sound/soundmgr.cxx b/src/Sound/soundmgr.cxx
index a1caaf6ff..3bf3ea0e8 100644
--- a/src/Sound/soundmgr.cxx
+++ b/src/Sound/soundmgr.cxx
@@ -172,22 +172,6 @@ bool FGSoundMgr::remove( const string& refname ) {
 					NULL,
 					SL_VOLUME_ENVELOPE );
 
-#if defined ( PLIB_1_2_X )
-	// if PLIB_1_2_X, we can't reliably remove sounds
-	// that are currently being played. :-( So, let's just not
-	// remove them and return false.  The effects of this are that
-	// the sound sample will continue to finish playing (or
-	// continue to loop forever.)  And the sound sample will
-	// remain registered in the plib audio system.  This is a
-	// memory leak, and eventually this could cause us to max out
-	// the total number of allowed sound samples in plib, but what
-	// are you going to do?  Hopefully the plib team will do a new
-	// stable relase with these problems fixed.
-
-	// cout << "plib broken audio, skipping actual remove" << endl;
-
-	return false;
-#else
 	// must call audio_sched->update() after stopping the sound
 	// but before deleting it.
 	audio_sched -> update();
@@ -198,7 +182,6 @@ bool FGSoundMgr::remove( const string& refname ) {
         sounds.erase( it );
 
 	return true;
-#endif
    } else {
 	return false;
     }
-- 
2.39.5