From 645ef8036a3e71907a393abe87d2654ecbe473e0 Mon Sep 17 00:00:00 2001
From: ThorstenB <brehmt@gmail.com>
Date: Fri, 25 Feb 2011 21:10:42 +0100
Subject: [PATCH] TCAS clean-up. Change default voice samples.

---
 src/Instrumentation/tcas.cxx |  2 +-
 src/Instrumentation/tcas.hxx | 29 -----------------------------
 2 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/src/Instrumentation/tcas.cxx b/src/Instrumentation/tcas.cxx
index 47242fe5f..dbab3164d 100644
--- 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 6672eb83f..2288a7dbe 100644
--- 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 ///////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////