AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-14 10:05:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Enable music and sound by default

Browse Source
This commit is contained in:
UnknownShadow200 2021-10-01 11:42:59 +10:00
parent 51d4842c30
commit e88a6b5909
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Audio.c
View File

@ -39,16 +39,6 @@ static void ApplyVolume(cc_int16* samples, int count, int volume) {
} }
} }
static int GetVolume(const char* volKey, const char* boolKey) {
int volume = Options_GetInt(volKey, 0, 100, 0);
if (volume) return volume;
/* backwards compatibility */
volume = Options_GetBool(boolKey, false) ? 100 : 0;
Options_Set(boolKey, NULL);
return volume;
}
/* Common/Base methods */ /* Common/Base methods */
static void AudioWarn(cc_result res, const char* action) { static void AudioWarn(cc_result res, const char* action) {
Logger_Warn(res, action, Audio_DescribeError); Logger_Warn(res, action, Audio_DescribeError);
@ -1137,7 +1127,12 @@ static void Sounds_Stop(void) {
} }
static void Sounds_Init(void) { static void Sounds_Init(void) {
int volume = GetVolume(OPT_SOUND_VOLUME, OPT_USE_SOUND); #ifdef CC_BUILD_WEBAUDIO
int volume = Options_GetInt(OPT_SOUND_VOLUME, 0, 100, 0);
#else
int volume = Options_GetInt(OPT_SOUND_VOLUME, 0, 100, 100);
#endif
Audio_SetSounds(volume); Audio_SetSounds(volume);
Event_Register_(&UserEvents.BlockChanged, NULL, Audio_PlayBlockSound); Event_Register_(&UserEvents.BlockChanged, NULL, Audio_PlayBlockSound);
} }
@ -1354,7 +1349,7 @@ static void Music_Init(void) {
music_maxDelay = Options_GetInt(OPT_MAX_MUSIC_DELAY, 0, 3600, 420) * MILLIS_PER_SEC; music_maxDelay = Options_GetInt(OPT_MAX_MUSIC_DELAY, 0, 3600, 420) * MILLIS_PER_SEC;
music_waitable = Waitable_Create(); music_waitable = Waitable_Create();
volume = GetVolume(OPT_MUSIC_VOLUME, OPT_USE_MUSIC); volume = Options_GetInt(OPT_MUSIC_VOLUME, 0, 100, 100);
Audio_SetMusic(volume); Audio_SetMusic(volume);
} }

2
src/Options.h
View File

@ -5,8 +5,6 @@
Copyright 2014-2021 ClassiCube | Licensed under BSD-3 Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/ */
#define OPT_USE_MUSIC "usemusic"
#define OPT_USE_SOUND "usesound"
#define OPT_MUSIC_VOLUME "musicvolume" #define OPT_MUSIC_VOLUME "musicvolume"
#define OPT_SOUND_VOLUME "soundsvolume" #define OPT_SOUND_VOLUME "soundsvolume"
#define OPT_FORCE_OPENAL "forceopenal" #define OPT_FORCE_OPENAL "forceopenal"