From 89794a34cf09b4d35bb4274dcad7838ec22f93db Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Fri, 15 May 2020 18:41:53 +0200
Subject: [PATCH] Made some variable names for the navigation sounds more
 consistent

---
 es-app/src/views/SystemView.cpp     | 10 +++++-----
 es-app/src/views/ViewController.cpp |  4 ++--
 es-core/src/Sound.cpp               |  8 ++++----
 es-core/src/Sound.h                 |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/es-app/src/views/SystemView.cpp b/es-app/src/views/SystemView.cpp
index c46b360d1..d00d22b19 100644
--- a/es-app/src/views/SystemView.cpp
+++ b/es-app/src/views/SystemView.cpp
@@ -155,13 +155,13 @@ bool SystemView::input(InputConfig* config, Input input)
 		case VERTICAL_WHEEL:
 			if (config->isMappedLike("up", input))
 			{
-				navigationsounds.playThemeNavigationSound(SYSTEMBROWSE);
+				navigationsounds.playThemeNavigationSound(SYSTEMBROWSESOUND);
 				listInput(-1);
 				return true;
 			}
 			if (config->isMappedLike("down", input))
 			{
-				navigationsounds.playThemeNavigationSound(SYSTEMBROWSE);
+				navigationsounds.playThemeNavigationSound(SYSTEMBROWSESOUND);
 				listInput(1);
 				return true;
 			}
@@ -171,13 +171,13 @@ bool SystemView::input(InputConfig* config, Input input)
 		default:
 			if (config->isMappedLike("left", input))
 			{
-				navigationsounds.playThemeNavigationSound(SYSTEMBROWSE);
+				navigationsounds.playThemeNavigationSound(SYSTEMBROWSESOUND);
 				listInput(-1);
 				return true;
 			}
 			if (config->isMappedLike("right", input))
 			{
-				navigationsounds.playThemeNavigationSound(SYSTEMBROWSE);
+				navigationsounds.playThemeNavigationSound(SYSTEMBROWSESOUND);
 				listInput(1);
 				return true;
 			}
@@ -195,7 +195,7 @@ bool SystemView::input(InputConfig* config, Input input)
 		{
 			// get random system
 			// go to system
-			navigationsounds.playThemeNavigationSound(SYSTEMBROWSE);
+			navigationsounds.playThemeNavigationSound(SYSTEMBROWSESOUND);
 			setCursor(SystemData::getRandomSystem());
 			return true;
 		}
diff --git a/es-app/src/views/ViewController.cpp b/es-app/src/views/ViewController.cpp
index b09e7fbaa..6d45c9a5a 100644
--- a/es-app/src/views/ViewController.cpp
+++ b/es-app/src/views/ViewController.cpp
@@ -105,7 +105,7 @@ void ViewController::goToNextGameList()
 	assert(mState.viewing == GAME_LIST);
 	SystemData* system = getState().getSystem();
 	assert(system);
-	navigationsounds.playThemeNavigationSound(QUICKSYSSELECT);
+	navigationsounds.playThemeNavigationSound(QUICKSYSSELECTSOUND);
 	goToGameList(system->getNext());
 }
 
@@ -114,7 +114,7 @@ void ViewController::goToPrevGameList()
 	assert(mState.viewing == GAME_LIST);
 	SystemData* system = getState().getSystem();
 	assert(system);
-	navigationsounds.playThemeNavigationSound(QUICKSYSSELECT);
+	navigationsounds.playThemeNavigationSound(QUICKSYSSELECTSOUND);
 	goToGameList(system->getPrev());
 }
 
diff --git a/es-core/src/Sound.cpp b/es-core/src/Sound.cpp
index f522d5baf..2103a60f8 100644
--- a/es-core/src/Sound.cpp
+++ b/es-core/src/Sound.cpp
@@ -50,10 +50,10 @@ void NavigationSounds::playThemeNavigationSound(NavigationSoundsID soundID)
 
 	switch(soundID)
 	{
-		case SYSTEMBROWSE:
+		case SYSTEMBROWSESOUND:
 			navigationsounds.systembrowseSound->play();
 			break;
-		case QUICKSYSSELECT:
+		case QUICKSYSSELECTSOUND:
 			navigationsounds.quicksysselectSound->play();
 			break;
 		case SELECTSOUND:
@@ -77,10 +77,10 @@ bool NavigationSounds::isPlayingThemeNavigationSound(NavigationSoundsID soundID)
 {
 	switch(soundID)
 	{
-		case SYSTEMBROWSE:
+		case SYSTEMBROWSESOUND:
 			return navigationsounds.systembrowseSound->isPlaying();
 			break;
-		case QUICKSYSSELECT:
+		case QUICKSYSSELECTSOUND:
 			return navigationsounds.quicksysselectSound->isPlaying();
 			break;
 		case SELECTSOUND:
diff --git a/es-core/src/Sound.h b/es-core/src/Sound.h
index 451e64ce3..1b84e9987 100644
--- a/es-core/src/Sound.h
+++ b/es-core/src/Sound.h
@@ -45,8 +45,8 @@ private:
 
 enum NavigationSoundsID
 {
-	SYSTEMBROWSE,
-	QUICKSYSSELECT,
+	SYSTEMBROWSESOUND,
+	QUICKSYSSELECTSOUND,
 	SELECTSOUND,
 	BACKSOUND,
 	SCROLLSOUND,