mirror of
https://git.do.srb2.org/KartKrew/Kart-Public.git
synced 2025-01-14 22:00:50 +00:00
Merge branch 'defaultsoundvol' into 'master'
Change default sound volume See merge request STJr/SRB2!238
This commit is contained in:
commit
dcf843e485
6 changed files with 6 additions and 6 deletions
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
UINT8 cdaudio_started = 0;
|
UINT8 cdaudio_started = 0;
|
||||||
|
|
||||||
consvar_t cd_volume = {"cd_volume","31",CV_SAVE,soundvolume_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cd_volume = {"cd_volume","18",CV_SAVE,soundvolume_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cdUpdate = {"cd_update","1",CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cdUpdate = {"cd_update","1",CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -50,7 +50,7 @@ static boolean wasPlaying;
|
||||||
static int cdVolume=0; // current cd volume (0-31)
|
static int cdVolume=0; // current cd volume (0-31)
|
||||||
|
|
||||||
// 0-31 like Music & Sfx, though CD hardware volume is 0-255.
|
// 0-31 like Music & Sfx, though CD hardware volume is 0-255.
|
||||||
consvar_t cd_volume = {"cd_volume","31",CV_SAVE,soundvolume_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cd_volume = {"cd_volume","18",CV_SAVE,soundvolume_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
// allow Update for next/loop track
|
// allow Update for next/loop track
|
||||||
// some crap cd drivers take up to
|
// some crap cd drivers take up to
|
||||||
|
|
|
@ -78,7 +78,7 @@ consvar_t stereoreverse = {"stereoreverse", "Off", CV_SAVE, CV_OnOff, NULL, 0, N
|
||||||
static consvar_t precachesound = {"precachesound", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
static consvar_t precachesound = {"precachesound", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
// actual general (maximum) sound & music volume, saved into the config
|
// actual general (maximum) sound & music volume, saved into the config
|
||||||
consvar_t cv_soundvolume = {"soundvolume", "31", CV_SAVE, soundvolume_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_soundvolume = {"soundvolume", "18", CV_SAVE, soundvolume_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_digmusicvolume = {"digmusicvolume", "18", CV_SAVE, soundvolume_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_digmusicvolume = {"digmusicvolume", "18", CV_SAVE, soundvolume_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_midimusicvolume = {"midimusicvolume", "18", CV_SAVE, soundvolume_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_midimusicvolume = {"midimusicvolume", "18", CV_SAVE, soundvolume_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
// number of channels available
|
// number of channels available
|
||||||
|
|
|
@ -60,7 +60,7 @@ void SDL_SYS_CDQuit(void)
|
||||||
|
|
||||||
UINT8 cdaudio_started = 0; // for system startup/shutdown
|
UINT8 cdaudio_started = 0; // for system startup/shutdown
|
||||||
|
|
||||||
consvar_t cd_volume = {"cd_volume","31",CV_SAVE,soundvolume_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cd_volume = {"cd_volume","18",CV_SAVE,soundvolume_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cdUpdate = {"cd_update","1",CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cdUpdate = {"cd_update","1",CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
#ifndef NOSDLCD
|
#ifndef NOSDLCD
|
||||||
|
|
|
@ -161,7 +161,7 @@ static BOOL wasPlaying;
|
||||||
//static INT cdVolume = 0; // current cd volume (0-31)
|
//static INT cdVolume = 0; // current cd volume (0-31)
|
||||||
|
|
||||||
// 0-31 like Music & Sfx, though CD hardware volume is 0-255.
|
// 0-31 like Music & Sfx, though CD hardware volume is 0-255.
|
||||||
consvar_t cd_volume = {"cd_volume","31",CV_SAVE,soundvolume_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cd_volume = {"cd_volume","18",CV_SAVE,soundvolume_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
// allow Update for next/loop track
|
// allow Update for next/loop track
|
||||||
// some crap cd drivers take up to
|
// some crap cd drivers take up to
|
||||||
|
|
|
@ -159,7 +159,7 @@ static boolean wasPlaying;
|
||||||
//static int cdVolume = 0; // current cd volume (0-31)
|
//static int cdVolume = 0; // current cd volume (0-31)
|
||||||
|
|
||||||
// 0-31 like Music & Sfx, though CD hardware volume is 0-255.
|
// 0-31 like Music & Sfx, though CD hardware volume is 0-255.
|
||||||
consvar_t cd_volume = {"cd_volume","31",CV_SAVE,soundvolume_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cd_volume = {"cd_volume","18",CV_SAVE,soundvolume_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
// allow Update for next/loop track
|
// allow Update for next/loop track
|
||||||
// some crap cd drivers take up to
|
// some crap cd drivers take up to
|
||||||
|
|
Loading…
Reference in a new issue