speed-dreams/speed-dreams-code
speed-dreams/speed-dreams-code
7
1
Fork 3
Code Issues 8 Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fixed weird behavior of sound backend combo-box in Options / Sound menu

Browse source 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@3726 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 327a98a870f6ea6868ca2b9ec0f3f431d8f9ec2c
Former-commit-id: e335779448c4beb4aaf4d5645de31e807940d6b9
This commit is contained in:
pouillot 2011-07-16 10:08:44 +00:00
parent 7a927ae3c4
commit 349edd8863
1 changed files with 11 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/modules/userinterface/legacymenu/confscreens/soundconfig.cpp
View file

@ -112,33 +112,22 @@ static void saveSoundOption(void *)
// Toggle sound state openal/plib/disabled.
static void changeSoundState(void *vp)
{
if (vp == 0) {
curOption--;
if (curOption < 0) {
curOption = nbOptions - 1;
}
} else {
curOption++;
if (curOption == nbOptions) {
curOption = 0;
}
}
curOption = (curOption + (int)(long)vp + nbOptions) % nbOptions;
GfuiLabelSetText(scrHandle, SoundOptionId, soundOptionList[curOption]);
}
// Volume
static void changeVolume(void * )
{
char *val;
char buf[256];
val = GfuiEditboxGetString(scrHandle, VolumeValueId);
char* val = GfuiEditboxGetString(scrHandle, VolumeValueId);
sscanf(val, "%g", &VolumeValue);
if (VolumeValue > 100.0f) {
VolumeValue = 100.0f;
}
else if (VolumeValue < 0.0f) {
VolumeValue = 0.0f;
}
if (VolumeValue > 100.0f)
VolumeValue = 100.0f;
else if (VolumeValue < 0.0f)
VolumeValue = 0.0f;
char buf[32];
sprintf(buf, "%g", VolumeValue);
GfuiEditboxSetString(scrHandle, VolumeValueId, buf);
}
@ -150,7 +139,7 @@ static void onActivate(void * /* dummy */)
// Sound menu
void * SoundMenuInit(void *prevMenu)
void* SoundMenuInit(void *prevMenu)
{
// Has screen already been created?
if (scrHandle) {
@ -179,7 +168,7 @@ void * SoundMenuInit(void *prevMenu)
GfuiAddKey(scrHandle, GFUIK_ESCAPE, "Cancel Selection", prevMenu, GfuiScreenActivate, NULL);
GfuiAddKey(scrHandle, GFUIK_F1, "Help", scrHandle, GfuiHelpScreen, NULL);
GfuiAddKey(scrHandle, GFUIK_F12, "Screen-Shot", NULL, GfuiScreenShot, NULL);
GfuiAddKey(scrHandle, GFUIK_LEFT, "Previous Option in list", (void*)0, changeSoundState, NULL);
GfuiAddKey(scrHandle, GFUIK_LEFT, "Previous Option in list", (void*)-1, changeSoundState, NULL);
GfuiAddKey(scrHandle, GFUIK_RIGHT, "Next Option in list", (void*)1, changeSoundState, NULL);
return scrHandle;