From 1070050599abfa9eb87d3a66222e766b15d0c3f8 Mon Sep 17 00:00:00 2001 From: David Rose Date: Mon, 2 Jul 2001 21:47:22 +0000 Subject: [PATCH] changes to allow successful compilation on Linux --- panda/src/audio/audio_linux_traits.cxx | 4 ++-- panda/src/audio/audio_linux_traits.h | 4 ++-- panda/src/audio/audio_manager.cxx | 2 +- panda/src/audio/audio_sound.h | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/panda/src/audio/audio_linux_traits.cxx b/panda/src/audio/audio_linux_traits.cxx index f10bbb5f88..1265f8587c 100644 --- a/panda/src/audio/audio_linux_traits.cxx +++ b/panda/src/audio/audio_linux_traits.cxx @@ -344,7 +344,7 @@ LinuxSamplePlayer::~LinuxSamplePlayer() { void LinuxSamplePlayer::play_sound(AudioTraits::SoundClass*, AudioTraits::PlayingClass* playing, - float start_time) { + float start_time, int) { initialize(); LinuxSamplePlaying* lplaying = (LinuxSamplePlaying*)playing; if (!AudioManager::get_sfx_active()) @@ -390,7 +390,7 @@ LinuxMusicPlayer::~LinuxMusicPlayer() { } void LinuxMusicPlayer::play_sound(AudioTraits::SoundClass*, - AudioTraits::PlayingClass*, float) { + AudioTraits::PlayingClass*, float, int) { initialize(); } diff --git a/panda/src/audio/audio_linux_traits.h b/panda/src/audio/audio_linux_traits.h index 03b63b01bf..52b528a923 100644 --- a/panda/src/audio/audio_linux_traits.h +++ b/panda/src/audio/audio_linux_traits.h @@ -130,7 +130,7 @@ public: virtual ~LinuxSamplePlayer(); virtual void play_sound(AudioTraits::SoundClass*, - AudioTraits::PlayingClass*, float); + AudioTraits::PlayingClass*, float, int); virtual void stop_sound(AudioTraits::SoundClass*, AudioTraits::PlayingClass*); virtual void set_volume(AudioTraits::PlayingClass*, float); @@ -148,7 +148,7 @@ public: virtual ~LinuxMusicPlayer(); virtual void play_sound(AudioTraits::SoundClass*, - AudioTraits::PlayingClass*, float); + AudioTraits::PlayingClass*, float, int); virtual void stop_sound(AudioTraits::SoundClass*, AudioTraits::PlayingClass*); virtual void set_volume(AudioTraits::PlayingClass*, float); diff --git a/panda/src/audio/audio_manager.cxx b/panda/src/audio/audio_manager.cxx index 600d258ebd..29465458ca 100644 --- a/panda/src/audio/audio_manager.cxx +++ b/panda/src/audio/audio_manager.cxx @@ -155,7 +155,7 @@ ns_play(AudioSound* sound, float start_time, int loop) { } #ifndef AUDIO_USE_RAD_MSS //[ sound->get_player()->play_sound(sound->get_sound(), - sound->get_state(), start_time); + sound->get_state(), start_time, loop); ns_set_loop(sound, loop); sound->get_player()->adjust_volume(sound->get_state()); #else //][ diff --git a/panda/src/audio/audio_sound.h b/panda/src/audio/audio_sound.h index 6076e143bb..1578392864 100644 --- a/panda/src/audio/audio_sound.h +++ b/panda/src/audio/audio_sound.h @@ -46,11 +46,11 @@ PUBLISHED: void set_category(Category category) { _state->set_category( - static_cast(category) + (AudioTraits::PlayingClass::Category)(category) ); } Category get_category() const { - return static_cast(_state->get_category()); + return (Category)(_state->get_category()); } private: