Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-02-16 12:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed the playing of some navigation sounds during textlist and carousel navigation.

Browse source
This commit is contained in:
Leon Styhre 2022-03-25 23:17:56 +01:00
parent 51e883cd45
commit e7aeb8e2b4
2 changed files with 12 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
es-core/src/components/primary/CarouselComponent.h
View file

@ -292,34 +292,28 @@ template <typename T> bool CarouselComponent<T>::input(InputConfig* config, Inpu
}
if constexpr (std::is_same_v<T, FileData*>) {
if (config->isMappedLike("leftshoulder", input)) {
if (getCursor() == 0) {
if (!NavigationSounds::getInstance().isPlayingThemeNavigationSound(SCROLLSOUND))
NavigationSounds::getInstance().playThemeNavigationSound(SCROLLSOUND);
return true;
}
if (mCancelTransitionsCallback)
mCancelTransitionsCallback();
List::listInput(-10);
return true;
}
if (config->isMappedLike("rightshoulder", input)) {
if (getCursor() == static_cast<int>(mEntries.size()) - 1) {
if (!NavigationSounds::getInstance().isPlayingThemeNavigationSound(SCROLLSOUND))
NavigationSounds::getInstance().playThemeNavigationSound(SCROLLSOUND);
return true;
}
if (mCancelTransitionsCallback)
mCancelTransitionsCallback();
List::listInput(10);
return true;
}
if (config->isMappedLike("lefttrigger", input)) {
if (getCursor() == 0)
return true;
mTriggerJump = true;
if (mCancelTransitionsCallback)
mCancelTransitionsCallback();
return this->listFirstRow();
}
if (config->isMappedLike("righttrigger", input)) {
if (getCursor() == static_cast<int>(mEntries.size()) - 1)
return true;
mTriggerJump = true;
if (mCancelTransitionsCallback)
mCancelTransitionsCallback();

32
es-core/src/components/primary/TextListComponent.h
View file

@ -227,47 +227,31 @@ template <typename T> bool TextListComponent<T>::input(InputConfig* config, Inpu
return true;
}
if (config->isMappedLike("leftshoulder", input)) {
if (getCursor() == 0) {
if (!NavigationSounds::getInstance().isPlayingThemeNavigationSound(SCROLLSOUND))
NavigationSounds::getInstance().playThemeNavigationSound(SCROLLSOUND);
return true;
}
if (mCancelTransitionsCallback)
mCancelTransitionsCallback();
List::listInput(-10);
return true;
}
if (config->isMappedLike("rightshoulder", input)) {
if (getCursor() == static_cast<int>(mEntries.size()) - 1) {
if (!NavigationSounds::getInstance().isPlayingThemeNavigationSound(SCROLLSOUND))
NavigationSounds::getInstance().playThemeNavigationSound(SCROLLSOUND);
return true;
}
if (mCancelTransitionsCallback)
mCancelTransitionsCallback();
List::listInput(10);
return true;
}
if (config->isMappedLike("righttrigger", input)) {
if (getCursor() == static_cast<int>(mEntries.size()) - 1) {
if (!NavigationSounds::getInstance().isPlayingThemeNavigationSound(SCROLLSOUND))
NavigationSounds::getInstance().playThemeNavigationSound(SCROLLSOUND);
return true;
}
if (mCancelTransitionsCallback)
mCancelTransitionsCallback();
return this->listLastRow();
}
if (config->isMappedLike("lefttrigger", input)) {
if (getCursor() == 0) {
if (!NavigationSounds::getInstance().isPlayingThemeNavigationSound(SCROLLSOUND))
NavigationSounds::getInstance().playThemeNavigationSound(SCROLLSOUND);
if (getCursor() == 0)
return true;
}
if (mCancelTransitionsCallback)
mCancelTransitionsCallback();
return this->listFirstRow();
}
if (config->isMappedLike("righttrigger", input)) {
if (getCursor() == static_cast<int>(mEntries.size()) - 1)
return true;
if (mCancelTransitionsCallback)
mCancelTransitionsCallback();
return this->listLastRow();
}
}
else {
if (config->isMappedLike("up", input) || config->isMappedLike("down", input) ||