TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-28 15:53:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

some cleanup

Browse Source
This commit is contained in:
Cary Sandvig 2000-10-12 21:36:26 +00:00
parent 06f55154be
commit 7d7e84061a
3 changed files with 9 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,9 +30,7 @@ void AudioLoadMidi(AudioTraits::MusicClass** music,
*destroy = AudioDestroyMidi;
}
#else /* AUDIO_USE_MIKMOD */
#ifdef AUDIO_USE_WIN32
#elif defined(AUDIO_USE_WIN32)
#include "audio_win_traits.h"
@ -52,9 +50,7 @@ void AudioLoadMidi(AudioTraits::MusicClass** music,
*destroy = AudioDestroyMidi;
}
#else /* AUDIO_USE_WIN32 */
#ifdef AUDIO_USE_LINUX
#elif defined(AUDIO_USE_LINUX)
#include "audio_linux_traits.h"
@ -74,9 +70,7 @@ void AudioLoadMidi(AudioTraits::MusicClass** music,
*destroy = AudioDestroyMidi;
}
#else /* AUDIO_USE_LINUX */
#ifdef AUDIO_USE_NULL
#elif defined(AUDIO_USE_NULL)
// Null driver
#include "audio_null_traits.h"
@ -100,9 +94,6 @@ void AudioLoadMidi(AudioTraits::MusicClass** music,
#error "unknown driver type"
#endif /* AUDIO_USE_NULL */
#endif /* AUDIO_USE_LINUX */
#endif /* AUDIO_USE_WIN32 */
#endif /* AUDIO_USE_MIKMOD */
ConfigureFn(audio_load_midi) {
AudioPool::register_music_loader("midi", AudioLoadMidi);

15
panda/src/audiotraits/audio_load_st.cxx
View File

@ -397,9 +397,7 @@ void AudioLoadSt(AudioTraits::SampleClass** sample,
*destroy = AudioDestroySt;
}
#else /* AUDIO_USE_MIKMOD */
#ifdef AUDIO_USE_WIN32
#elif defined(AUDIO_USE_WIN32)
#include "audio_win_traits.h"
@ -429,9 +427,7 @@ void AudioLoadSt(AudioTraits::SampleClass** sample,
#endif /* HAVE_SOXST */
}
#else /* AUDIO_USE_WIN32 */
#ifdef AUDIO_USE_LINUX
#elif defined(AUDIO_USE_LINUX)
#include "audio_linux_traits.h"
@ -461,9 +457,7 @@ void AudioLoadSt(AudioTraits::SampleClass** sample,
#endif /* HAVE_SOXST */
}
#else /* AUDIO_USE_LINUX */
#ifdef AUDIO_USE_NULL
#elif defined(AUDIO_USE_NULL)
// Null driver
#include "audio_null_traits.h"
@ -487,9 +481,6 @@ void AudioLoadSt(AudioTraits::SampleClass** sample,
#error "unknown audio driver type"
#endif /* AUDIO_USE_NULL */
#endif /* AUDIO_USE_LINUX */
#endif /* AUDIO_USE_WIN32 */
#endif /* AUDIO_USE_MIKMOD */
ConfigureFn(audio_load_st) {
#ifdef HAVE_SOXST

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

@ -31,9 +31,7 @@ void AudioLoadWav(AudioTraits::SampleClass** sample,
*destroy = AudioDestroyWav;
}
#else /* AUDIO_USE_MIKMOD */
#ifdef AUDIO_USE_WIN32
#elif defined(AUDIO_USE_WIN32)
#include "audio_win_traits.h"
@ -53,9 +51,7 @@ void AudioLoadWav(AudioTraits::SampleClass** sample,
*destroy = AudioDestroyWav;
}
#else /* AUDIO_USE_WIN32 */
#ifdef AUDIO_USE_LINUX
#elif defined(AUDIO_USE_LINUX)
#include "audio_linux_traits.h"
@ -75,9 +71,7 @@ void AudioLoadWav(AudioTraits::SampleClass** sample,
*destroy = AudioDestroyWav;
}
#else /* AUDIO_USE_LINUX */
#ifdef AUDIO_USE_NULL
#elif defined(AUDIO_USE_NULL)
// Null driver
#include "audio_null_traits.h"
@ -101,9 +95,6 @@ void AudioLoadWav(AudioTraits::SampleClass** sample,
#error "unknown implementation driver"
#endif /* AUDIO_USE_NULL */
#endif /* AUDIO_USE_LINUX */
#endif /* AUDIO_USE_WIN32 */
#endif /* AUDIO_USE_MIKMOD */
ConfigureFn(audio_load_wav) {
AudioPool::register_sample_loader("wav", AudioLoadWav);