From e9f791b835ac68e95268c4373cedfe1cdc65237c Mon Sep 17 00:00:00 2001
From: Cary Sandvig <frang@users.sourceforge.net>
Date: Wed, 11 Oct 2000 00:02:29 +0000
Subject: [PATCH] make compilers happy

---
 panda/src/audio/audio_null_traits.cxx     | 6 ++++++
 panda/src/audio/audio_null_traits.h       | 2 ++
 panda/src/audiotraits/audio_load_midi.cxx | 4 ++--
 panda/src/audiotraits/audio_load_wav.cxx  | 4 ++--
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/panda/src/audio/audio_null_traits.cxx b/panda/src/audio/audio_null_traits.cxx
index 527d5e694b..6060f45044 100644
--- a/panda/src/audio/audio_null_traits.cxx
+++ b/panda/src/audio/audio_null_traits.cxx
@@ -51,6 +51,12 @@ AudioTraits::MusicClass::MusicStatus NullMusic::status(void) {
 NullPlaying::~NullPlaying(void) {
 }
 
+AudioTraits::PlayingClass::PlayingStatus NullPlaying::status(void) {
+  if (audio_cat->is_debug())
+    audio_cat->debug() << "in playing status in Null audio driver" << endl;
+  return BAD;
+}
+
 NullPlayer::~NullPlayer(void) {
 }
 
diff --git a/panda/src/audio/audio_null_traits.h b/panda/src/audio/audio_null_traits.h
index d6e9156f19..f1656fe964 100644
--- a/panda/src/audio/audio_null_traits.h
+++ b/panda/src/audio/audio_null_traits.h
@@ -34,6 +34,8 @@ class EXPCL_PANDA NullPlaying : public AudioTraits::PlayingClass {
 public:
   INLINE NullPlaying(void);
   virtual ~NullPlaying(void);
+
+  virtual AudioTraits::PlayingClass::PlayingStatus status(void);
 };
 
 class EXPCL_PANDA NullPlayer : public AudioTraits::PlayerClass {
diff --git a/panda/src/audiotraits/audio_load_midi.cxx b/panda/src/audiotraits/audio_load_midi.cxx
index 6a741cfaa9..e358fd0e6c 100644
--- a/panda/src/audiotraits/audio_load_midi.cxx
+++ b/panda/src/audiotraits/audio_load_midi.cxx
@@ -25,7 +25,7 @@ void AudioLoadMidi(AudioTraits::MusicClass** music,
   *music = MikModMidi::load_midi(filename);
   if (*music == (AudioTraits::MusicClass*)0L)
     return;
-  *state = *music->get_state();
+  *state = ((MikModMidi*)(*music))->get_state();
   *player = MikModMidiPlayer::get_instance();
   *destroy = AudioDestroyMidi;
 }
@@ -47,7 +47,7 @@ void AudioLoadMidi(AudioTraits::MusicClass** music,
   *music = WinMusic::load_midi(filename);
   if (*music == (AudioTraits::MusicClass*)0L)
     return;
-  *state = *music->get_state();
+  *state = ((WinMusic*)(*music))->get_state();
   *player = WinPlayer::get_instance();
   *destroy = AudioDestroyMidi;
 }
diff --git a/panda/src/audiotraits/audio_load_wav.cxx b/panda/src/audiotraits/audio_load_wav.cxx
index 7dba572e7f..d005bf83c7 100644
--- a/panda/src/audiotraits/audio_load_wav.cxx
+++ b/panda/src/audiotraits/audio_load_wav.cxx
@@ -26,7 +26,7 @@ void AudioLoadWav(AudioTraits::SampleClass** sample,
   *sample = MikModSample::load_wav(filename);
   if (*sample == (AudioTraits::SampleClass*)0L)
     return;
-  *state = *sample->get_state();
+  *state = ((MikModSample*)(*sample))->get_state();
   *player = MikModSamplePlayer::get_instance();
   *destroy = AudioDestroyWav;
 }
@@ -48,7 +48,7 @@ void AudioLoadWav(AudioTraits::SampleClass** sample,
   *sample = WinSample::load_wav(filename);
   if (*sample == (AudioTraits::SampleClass*)0L)
     return;
-  *state = *sample->get_state();
+  *state = ((WinSample*)(*sample))->get_state();
   *player = WinPlayer::get_instance();
   *destroy = AudioDestroyWav;
 }