Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-22 14:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Made some variable names for the navigation sounds more consistent

Browse source
This commit is contained in:
Leon Styhre 2020-05-15 18:41:53 +02:00
parent eec27c0258
commit 89794a34cf
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
es-app/src/views/SystemView.cpp
View file

@ -155,13 +155,13 @@ bool SystemView::input(InputConfig* config, Input input)
case VERTICAL_WHEEL: case VERTICAL_WHEEL:
if (config->isMappedLike("up", input)) if (config->isMappedLike("up", input))
{ {
navigationsounds.playThemeNavigationSound(SYSTEMBROWSE); navigationsounds.playThemeNavigationSound(SYSTEMBROWSESOUND);
listInput(-1); listInput(-1);
return true; return true;
} }
if (config->isMappedLike("down", input)) if (config->isMappedLike("down", input))
{ {
navigationsounds.playThemeNavigationSound(SYSTEMBROWSE); navigationsounds.playThemeNavigationSound(SYSTEMBROWSESOUND);
listInput(1); listInput(1);
return true; return true;
} }
@ -171,13 +171,13 @@ bool SystemView::input(InputConfig* config, Input input)
default: default:
if (config->isMappedLike("left", input)) if (config->isMappedLike("left", input))
{ {
navigationsounds.playThemeNavigationSound(SYSTEMBROWSE); navigationsounds.playThemeNavigationSound(SYSTEMBROWSESOUND);
listInput(-1); listInput(-1);
return true; return true;
} }
if (config->isMappedLike("right", input)) if (config->isMappedLike("right", input))
{ {
navigationsounds.playThemeNavigationSound(SYSTEMBROWSE); navigationsounds.playThemeNavigationSound(SYSTEMBROWSESOUND);
listInput(1); listInput(1);
return true; return true;
} }
@ -195,7 +195,7 @@ bool SystemView::input(InputConfig* config, Input input)
{ {
// get random system // get random system
// go to system // go to system
navigationsounds.playThemeNavigationSound(SYSTEMBROWSE); navigationsounds.playThemeNavigationSound(SYSTEMBROWSESOUND);
setCursor(SystemData::getRandomSystem()); setCursor(SystemData::getRandomSystem());
return true; return true;
} }

4
es-app/src/views/ViewController.cpp
View file

@ -105,7 +105,7 @@ void ViewController::goToNextGameList()
assert(mState.viewing == GAME_LIST); assert(mState.viewing == GAME_LIST);
SystemData* system = getState().getSystem(); SystemData* system = getState().getSystem();
assert(system); assert(system);
navigationsounds.playThemeNavigationSound(QUICKSYSSELECT); navigationsounds.playThemeNavigationSound(QUICKSYSSELECTSOUND);
goToGameList(system->getNext()); goToGameList(system->getNext());
} }
@ -114,7 +114,7 @@ void ViewController::goToPrevGameList()
assert(mState.viewing == GAME_LIST); assert(mState.viewing == GAME_LIST);
SystemData* system = getState().getSystem(); SystemData* system = getState().getSystem();
assert(system); assert(system);
navigationsounds.playThemeNavigationSound(QUICKSYSSELECT); navigationsounds.playThemeNavigationSound(QUICKSYSSELECTSOUND);
goToGameList(system->getPrev()); goToGameList(system->getPrev());
} }

8
es-core/src/Sound.cpp
View file

@ -50,10 +50,10 @@ void NavigationSounds::playThemeNavigationSound(NavigationSoundsID soundID)
switch(soundID) switch(soundID)
{ {
case SYSTEMBROWSE: case SYSTEMBROWSESOUND:
navigationsounds.systembrowseSound->play(); navigationsounds.systembrowseSound->play();
break; break;
case QUICKSYSSELECT: case QUICKSYSSELECTSOUND:
navigationsounds.quicksysselectSound->play(); navigationsounds.quicksysselectSound->play();
break; break;
case SELECTSOUND: case SELECTSOUND:
@ -77,10 +77,10 @@ bool NavigationSounds::isPlayingThemeNavigationSound(NavigationSoundsID soundID)
{ {
switch(soundID) switch(soundID)
{ {
case SYSTEMBROWSE: case SYSTEMBROWSESOUND:
return navigationsounds.systembrowseSound->isPlaying(); return navigationsounds.systembrowseSound->isPlaying();
break; break;
case QUICKSYSSELECT: case QUICKSYSSELECTSOUND:
return navigationsounds.quicksysselectSound->isPlaying(); return navigationsounds.quicksysselectSound->isPlaying();
break; break;
case SELECTSOUND: case SELECTSOUND:

4
es-core/src/Sound.h
View file

@ -45,8 +45,8 @@ private:
enum NavigationSoundsID enum NavigationSoundsID
{ {
SYSTEMBROWSE, SYSTEMBROWSESOUND,
QUICKSYSSELECT, QUICKSYSSELECTSOUND,
SELECTSOUND, SELECTSOUND,
BACKSOUND, BACKSOUND,
SCROLLSOUND, SCROLLSOUND,