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.

diff --git a/acconfig.h b/acconfig.h
index 94ae557f8d7b7a1ddf2dd741c4d48a7fc03c1941..cf7c32d078e96a80f1ecff7e2beee69b642a65e2 100644 (file)
--- 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 aad28e558b1c40a5dfd257f78a78f87126df4bdb..9a272d9c2fd572e1332a41f21201409cd14e2dbd 100644 (file)
--- 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 a1caaf6ffb6356b6444b1accf586cd5af34ca384..3bf3ea0e84aa8774210b15de55ffa9b3bcac7f86 100644 (file)
--- 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;
     }