TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

make compilers happy

Browse Source
This commit is contained in:
Cary Sandvig 2000-10-11 00:02:29 +00:00
parent 26650d16eb
commit e9f791b835
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
panda/src/audio/audio_null_traits.cxx
View File

@ -51,6 +51,12 @@ AudioTraits::MusicClass::MusicStatus NullMusic::status(void) {
NullPlaying::~NullPlaying(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) { NullPlayer::~NullPlayer(void) {
} }

2
panda/src/audio/audio_null_traits.h
View File

@ -34,6 +34,8 @@ class EXPCL_PANDA NullPlaying : public AudioTraits::PlayingClass {
public: public:
INLINE NullPlaying(void); INLINE NullPlaying(void);
virtual ~NullPlaying(void); virtual ~NullPlaying(void);
virtual AudioTraits::PlayingClass::PlayingStatus status(void);
}; };
class EXPCL_PANDA NullPlayer : public AudioTraits::PlayerClass { class EXPCL_PANDA NullPlayer : public AudioTraits::PlayerClass {

4
panda/src/audiotraits/audio_load_midi.cxx
View File

@ -25,7 +25,7 @@ void AudioLoadMidi(AudioTraits::MusicClass** music,
*music = MikModMidi::load_midi(filename); *music = MikModMidi::load_midi(filename);
if (*music == (AudioTraits::MusicClass*)0L) if (*music == (AudioTraits::MusicClass*)0L)
return; return;
*state = *music->get_state(); *state = ((MikModMidi*)(*music))->get_state();
*player = MikModMidiPlayer::get_instance(); *player = MikModMidiPlayer::get_instance();
*destroy = AudioDestroyMidi; *destroy = AudioDestroyMidi;
} }
@ -47,7 +47,7 @@ void AudioLoadMidi(AudioTraits::MusicClass** music,
*music = WinMusic::load_midi(filename); *music = WinMusic::load_midi(filename);
if (*music == (AudioTraits::MusicClass*)0L) if (*music == (AudioTraits::MusicClass*)0L)
return; return;
*state = *music->get_state(); *state = ((WinMusic*)(*music))->get_state();
*player = WinPlayer::get_instance(); *player = WinPlayer::get_instance();
*destroy = AudioDestroyMidi; *destroy = AudioDestroyMidi;
} }

4
panda/src/audiotraits/audio_load_wav.cxx
View File

@ -26,7 +26,7 @@ void AudioLoadWav(AudioTraits::SampleClass** sample,
*sample = MikModSample::load_wav(filename); *sample = MikModSample::load_wav(filename);
if (*sample == (AudioTraits::SampleClass*)0L) if (*sample == (AudioTraits::SampleClass*)0L)
return; return;
*state = *sample->get_state(); *state = ((MikModSample*)(*sample))->get_state();
*player = MikModSamplePlayer::get_instance(); *player = MikModSamplePlayer::get_instance();
*destroy = AudioDestroyWav; *destroy = AudioDestroyWav;
} }
@ -48,7 +48,7 @@ void AudioLoadWav(AudioTraits::SampleClass** sample,
*sample = WinSample::load_wav(filename); *sample = WinSample::load_wav(filename);
if (*sample == (AudioTraits::SampleClass*)0L) if (*sample == (AudioTraits::SampleClass*)0L)
return; return;
*state = *sample->get_state(); *state = ((WinSample*)(*sample))->get_state();
*player = WinPlayer::get_instance(); *player = WinPlayer::get_instance();
*destroy = AudioDestroyWav; *destroy = AudioDestroyWav;
} }