diff --git a/panda/src/audio/config_audio.cxx b/panda/src/audio/config_audio.cxx index ddd06e5d6a..c24b883bfd 100644 --- a/panda/src/audio/config_audio.cxx +++ b/panda/src/audio/config_audio.cxx @@ -24,9 +24,19 @@ Configure(config_audio); NotifyCategoryDef(audio, ""); +ConfigVariableBool audio_active +("audio-active", true); + +ConfigVariableInt audio_cache_limit +("audio-cache-limit", 15, + PRC_DESC("The number of sounds in the cache.")); + ConfigVariableString audio_library_name ("audio-library-name", "miles_audio"); +ConfigVariableDouble audio_volume +("audio-volume", 1.0f); + // Config variables for Fmod: //I should note this somewhere. The actual number of sound one could @@ -54,7 +64,16 @@ ConfigVariableBool audio_software_midi ConfigVariableFilename audio_dls_file ("audio-dls-file", ""); - + +ConfigVariableBool audio_play_midi +("audio-play-midi", true); + +ConfigVariableBool audio_play_wave +("audio-play-wave", true); + +ConfigVariableBool audio_play_mp3 +("audio-play-mp3", true); + ConfigVariableInt audio_output_rate ("audio-output-rate", 22050); diff --git a/panda/src/audio/config_audio.h b/panda/src/audio/config_audio.h index f62901412d..7326887b86 100644 --- a/panda/src/audio/config_audio.h +++ b/panda/src/audio/config_audio.h @@ -33,6 +33,10 @@ NotifyCategoryDecl(audio, EXPCL_PANDA, EXPTP_PANDA); +extern EXPCL_PANDA ConfigVariableBool audio_active; +extern EXPCL_PANDA ConfigVariableInt audio_cache_limit; +extern EXPCL_PANDA ConfigVariableDouble audio_volume; + //We Need This one. extern EXPCL_PANDA ConfigVariableString audio_library_name; @@ -45,6 +49,9 @@ extern EXPCL_PANDA ConfigVariableBool fmod_use_surround_sound; extern EXPCL_PANDA ConfigVariableBool audio_software_midi; extern EXPCL_PANDA ConfigVariableFilename audio_dls_file; +extern EXPCL_PANDA ConfigVariableBool audio_play_midi; +extern EXPCL_PANDA ConfigVariableBool audio_play_wave; +extern EXPCL_PANDA ConfigVariableBool audio_play_mp3; extern EXPCL_PANDA ConfigVariableInt audio_output_rate; extern EXPCL_PANDA ConfigVariableInt audio_output_bits; extern EXPCL_PANDA ConfigVariableInt audio_output_channels;