From ae58253ec6fc4b9f707953ffe5338633b060f6b1 Mon Sep 17 00:00:00 2001 From: cxgeorge <> Date: Fri, 4 Oct 2002 00:22:15 +0000 Subject: [PATCH] remove empty file --- panda/src/audio/Sources.pp | 5 ++--- panda/src/audio/audioManager.I | 18 ------------------ panda/src/audio/audioManager.h | 7 ++++--- 3 files changed, 6 insertions(+), 24 deletions(-) delete mode 100644 panda/src/audio/audioManager.I diff --git a/panda/src/audio/Sources.pp b/panda/src/audio/Sources.pp index c83ebad5c2..09456a5033 100644 --- a/panda/src/audio/Sources.pp +++ b/panda/src/audio/Sources.pp @@ -8,7 +8,7 @@ #define COMBINED_SOURCES $[TARGET]_composite1.cxx #define SOURCES \ - config_audio.h audioManager.I audioManager.h \ + config_audio.h audioManager.h \ audioSound.h nullAudioManager.h nullAudioSound.h #define INCLUDED_SOURCES \ @@ -18,7 +18,7 @@ #define INSTALL_HEADERS \ config_audio.h \ audio.h \ - audioManager.h audioManager.I \ + audioManager.h \ audioSound.h \ nullAudioManager.h \ nullAudioSound.h \ @@ -37,4 +37,3 @@ test_audio.cxx #end test_bin_target - diff --git a/panda/src/audio/audioManager.I b/panda/src/audio/audioManager.I deleted file mode 100644 index fa0bb48612..0000000000 --- a/panda/src/audio/audioManager.I +++ /dev/null @@ -1,18 +0,0 @@ -// Filename: audioManager.I -// Created by: skyler (June 6, 2001) -// Prior system by: cary -// -//////////////////////////////////////////////////////////////////// -// -// PANDA 3D SOFTWARE -// Copyright (c) 2001, Disney Enterprises, Inc. All rights reserved -// -// All use of this software is subject to the terms of the Panda 3d -// Software license. You should have received a copy of this license -// along with this source code; you will also find a current copy of -// the license at http://www.panda3d.org/license.txt . -// -// To contact the maintainers of this program write to -// panda3d@yahoogroups.com . -// -//////////////////////////////////////////////////////////////////// diff --git a/panda/src/audio/audioManager.h b/panda/src/audio/audioManager.h index d655f3b219..50059e7795 100644 --- a/panda/src/audio/audioManager.h +++ b/panda/src/audio/audioManager.h @@ -35,7 +35,10 @@ PUBLISHED: // ... // my_sound = MySoundEffects.get_sound("neatSfx.mp3"); // my_music = MyMusicManager.get_sound("introTheme.mid"); - static PT(AudioManager) create_AudioManager(); + + // bOneAtATime: if true, turn off any currently-playing sounds before playing + // a new one (useful for midi songs) +static PT(AudioManager) create_AudioManager(/*bool bOneAtATime*/); virtual ~AudioManager() {} virtual bool is_valid() = 0; @@ -84,6 +87,4 @@ protected: } }; -#include "audioManager.I" - #endif /* __AUDIO_MANAGER_H__ */