TCAS clean-up.

Change default voice samples.

diff --git a/src/Instrumentation/tcas.cxx b/src/Instrumentation/tcas.cxx
index 47242fe5f9f598e2c896128eaece7619768b3b03..dbab3164ddf9c97ed504a9c053539f10ef9bf505 100644 (file)
--- a/src/Instrumentation/tcas.cxx
+++ b/src/Instrumentation/tcas.cxx
@@ -238,7 +238,7 @@ void TCAS::Annunciator::clear(void)
 void
 TCAS::Annunciator::bind(SGPropertyNode* node)
 {
-    voicePlayer.bind(node, "Sounds/tcas/");
+    voicePlayer.bind(node, "Sounds/tcas/female/");
 }
 
 void

diff --git a/src/Instrumentation/tcas.hxx b/src/Instrumentation/tcas.hxx
index 6672eb83f2edb6f4f3fb2d383ed4e196b4fbe188..2288a7dbeb438b2f2c5ca031a64a1280ce90ad02 100644 (file)
--- a/src/Instrumentation/tcas.hxx
+++ b/src/Instrumentation/tcas.hxx
@@ -147,35 +147,6 @@ class TCAS : public SGSubsystem
         float  verticalFps;
     } LocalInfo; /*< info structure for local aircraft */
 
-//    /////////////////////////////////////////////////////////////////////////////
-//    // TCAS::Timer //////////////////////////////////////////////////////////////
-//    /////////////////////////////////////////////////////////////////////////////
-//
-//    class Timer
-//    {
-//        double start_time;
-//
-//    public:
-//        bool   running;
-//
-//        inline Timer ()
-//          : running(false) {}
-//
-//        inline void start () { running = true; start_time = globals->get_sim_time_sec(); }
-//        inline void stop ()  { running = false; }
-//        inline double elapsed () const { assert(running); return globals->get_sim_time_sec() - start_time; }
-//        inline double start_or_elapsed ()
-//        {
-//            if (running)
-//                return elapsed();
-//            else
-//            {
-//                start();
-//                return 0;
-//            }
-//        }
-//    };
-
     /////////////////////////////////////////////////////////////////////////////
     // TCAS::PropertiesHandler ///////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////