Make the view-manager and sound-manager independent.

[flightgear.git] / src / Sound / voiceplayer.cxx

diff --git a/src/Sound/voiceplayer.cxx b/src/Sound/voiceplayer.cxx
index 1a839cf3a3dac41ef1692ab27095544a79643aa0..d6037106c2797e528d4b0eefe7810086fcb1727e 100644 (file)
--- a/src/Sound/voiceplayer.cxx
+++ b/src/Sound/voiceplayer.cxx
@@ -16,7 +16,7 @@
 //
 // 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 St, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -42,12 +42,6 @@
 
 using std::string;
 
-#if defined( HAVE_VERSION_H ) && HAVE_VERSION_H
-#  include <Include/version.h>
-#else
-#  include <Include/no_version.h>
-#endif
-
 #include "voiceplayer.hxx"
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -220,7 +214,7 @@ FGVoicePlayer::get_sample (const char *name)
         }
         catch (const sg_exception &e)
         {
-            SG_LOG(SG_INSTR, SG_ALERT, "Error loading sound sample \"" + filename + "\": " + e.getFormattedMessage());
+            SG_LOG(SG_SOUND, SG_ALERT, "Error loading sound sample \"" + filename + "\": " + e.getFormattedMessage());
             exit(1);
         }