RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

changes to allow successful compilation on Linux

This commit is contained in:
David Rose 2001-07-02 21:47:22 +00:00
parent 62beff14de
commit 1070050599
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/audio/audio_linux_traits.cxx
View File

@ -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();
}

4
panda/src/audio/audio_linux_traits.h
View File

@ -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);

2
panda/src/audio/audio_manager.cxx
View File

@ -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 //][

4
panda/src/audio/audio_sound.h
View File

@ -46,11 +46,11 @@ PUBLISHED:
void set_category(Category category) {
_state->set_category(
static_cast<AudioTraits::PlayingClass::Category>(category)
(AudioTraits::PlayingClass::Category)(category)
);
}
Category get_category() const {
return static_cast<Category>(_state->get_category());
return (Category)(_state->get_category());
}
private: