Преглед изворни кода

accidentally removed miles variables

David Rose пре 19 година
родитељ
комит
6ee39ae6e9
2 измењених фајлова са 27 додато и 1 уклоњено
  1. 20 1
      panda/src/audio/config_audio.cxx
  2. 7 0
      panda/src/audio/config_audio.h

+ 20 - 1
panda/src/audio/config_audio.cxx

@@ -24,9 +24,19 @@
 Configure(config_audio);
 Configure(config_audio);
 NotifyCategoryDef(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
 ConfigVariableString audio_library_name
 ("audio-library-name", "miles_audio");
 ("audio-library-name", "miles_audio");
 
 
+ConfigVariableDouble audio_volume 
+("audio-volume", 1.0f);
+
 // Config variables for Fmod:
 // Config variables for Fmod:
 
 
 //I should note this somewhere.  The actual number of sound one could
 //I should note this somewhere.  The actual number of sound one could
@@ -54,7 +64,16 @@ ConfigVariableBool audio_software_midi
 
 
 ConfigVariableFilename audio_dls_file
 ConfigVariableFilename audio_dls_file
 ("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 
 ConfigVariableInt audio_output_rate 
 ("audio-output-rate", 22050);
 ("audio-output-rate", 22050);
  
  

+ 7 - 0
panda/src/audio/config_audio.h

@@ -33,6 +33,10 @@
 
 
 NotifyCategoryDecl(audio, EXPCL_PANDA, EXPTP_PANDA);
 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.
 //We Need This one.
 extern EXPCL_PANDA ConfigVariableString audio_library_name;
 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 ConfigVariableBool audio_software_midi;
 extern EXPCL_PANDA ConfigVariableFilename audio_dls_file;
 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_rate;
 extern EXPCL_PANDA ConfigVariableInt audio_output_bits;
 extern EXPCL_PANDA ConfigVariableInt audio_output_bits;
 extern EXPCL_PANDA ConfigVariableInt audio_output_channels;
 extern EXPCL_PANDA ConfigVariableInt audio_output_channels;