Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GUI: add sound effects #157

Merged
merged 5 commits into from Dec 16, 2018
Merged

GUI: add sound effects #157

merged 5 commits into from Dec 16, 2018

Conversation

KrahJohlito
Copy link
Member

Pull Request checklist

Note: these are not necessarily requirements

  • I reformatted the code with clang-format
  • I checked to make sure my submission worked
  • I am the author of submission or have permission from the original author
  • Requires update of the PS2SDK
  • Requires update of the gsKit
  • Others (please specify below)

Two small bug fixes, one to stop crash at init if user navigates menus and one to stop crash at unloading hdl server if the current theme is not saved to cfg.

Add sound effects (code for external files found in themes & default royalty free sounds)
Royalty free sounds source:
made by @Tupakaveli //boot sound
made by @RivalK93 //cancel
http://www.flashkit.com/soundfx/Interfaces/Switches/Switch19-intermed-5235/index.php //confirm
http://www.flashkit.com/soundfx/Interfaces/Clicks/ambient_-agent_vi-8701/index.php //cursor
http://www.flashkit.com/soundfx/Interfaces/Zings/Reminder-public_d-291/index.php //message
http://www.flashkit.com/soundfx/Interfaces/Zips/idg-zip3-intermed-2896/index.php //transition

It is a run-time option, It has been tested by the community, thanks to all the testers:
dekkit, jolek, RivalK93, svotib, TnA, Tupkaveli, VeditaBR.

and a HUGE thanks to @sp193 for all his help; contributing code, advice and trouble-shooting and making changes to the PS2SDK that support this feature.

Test-Build (sfx and boot sound are enabled by default in the test build for sake of ease they are off by default in PR)
http://frd.li/91ced1b1e263d82802cb41a4fb29610b

@TnA-Plastic
Copy link

So? Is it going to be merged?

On another note: It already got merged into the OPL Daily Builds!

@BatRastard
Copy link
Contributor

Sounds good to me! 👍

@gingerbeardman
Copy link

Really nice choice of subtle sounds - well done!

@ElPatas1
Copy link
Contributor

ElPatas1 commented Dec 8, 2018

@KrahJohlito, there is a problem with the covers using a custom theme in the last
sfx test build.

Navigating through the game list some covers disappears forever, and sometimes
some covers appears repeated in a different game.

This seems that do not happens in the previous sound test build v1.2.

Tested with Bumblebee and Spider themes.

Best regards.

@KrahJohlito
Copy link
Member Author

I've located the problem, I will fix it soon and add a commit to the PR.

Thank you sir

@KrahJohlito
Copy link
Member Author

@ElPatas1
Fix for game ART in custom themes.

It was also found that for per theme (external) sfx having a theme loaded with a short boot sound and switching to one with a long boot sound would result in the difference in duration being played back at theme change as it was trying to occupy the same amount of memory as the shorter sound. This has also been fixed. Thanks to @Tupakaveli for spotting this.

I will add the commit to the PR when you've had a chance to test this build and give it approval.
(no rush)

Thank you.

Fix-Build
http://frd.li/30f9e45a5ac6bcc19fef0b6567c9a06e

@TnA-Plastic
Copy link

TnA-Plastic commented Dec 9, 2018

@KrahJohlito: THX for the update!

@Tupakaveli: Wow! Interesting spoting, haha! :) Great job finding it and great Job Krah for finding the cause and fixing it!

@ElPatas1: Yes, please take your time! You had been 'chosen', specifically because you can compile them and because you test these things sooo thoroughly!

The '[tester-]firewall' (alpha/beta-testers who found most bugs) have certainly found most things, but probably not all! Even once you tested and approved it, we will probably still find some issues, but it's still at a stage where it is 'ready for the end-user'!

Take your time! 🙂

I am just happy that this project (I mean in regards to the SFX and sounds here, but also generally...) reached this point of development! I am glad, the end-user and theme-creators (and possibly later per game as well) can get the fruits of the stuff!

@ElPatas1
Copy link
Contributor

ElPatas1 commented Dec 9, 2018

@KrahJohlito, the covers seems to work fine now.

After unloading the HDLServer the OPL not freezes inmediately, but if you like
start any game, then the OPL freezes in the "Loading config" of the game.

I noticed that in the game settings the pademu emulation for Dualshock 3/4 is
not available, this is because you compiled this test builds without
the PADEMU feature right?

Best regards.

@KrahJohlito
Copy link
Member Author

@ElPatas1
I tested the current ifcaro beta build and the HDL server issue of unloading and trying to launch a game is present here also (console locks up at loading config), I am not sure of the cause but it is not a problem caused by this PR.

HDL server seems to have a few issues with its current code, only thing I could suggest is to force an exit at unload so OPL can reinit properly but that's more of a work-around.

Yes, sorry I was just doing a basic compile. Here is a PADEMU build if you wish to make sure it is still functioning correctly.

http://frd.li/6c76bf727c385bffaf4e67599aa2c8ad

Thanks

@ElPatas1
Copy link
Contributor

Yes, you are right, in the r1200 the freeze happens after unloading the HDLServer,
is strange, this problem was fixed long time ago and now happens again.

I continue testing the covers, and when i have time i search in which build
started again this problem.

Best regards.

@TnA-Plastic
Copy link

New merge incoming? :)

@KrahJohlito
Copy link
Member Author

@ElPatas1
I've updated the pull request to include the fix for ART in custom themes that I broke just before I made the PR, since the HDLServer issue is not related to this PR perhaps a new issue can be opened about it and this can go through?

@Jay-Jay-OPL
The folder for custom sfx was changed just before the pull request to better match the existing theme folders ie device/aspect so 'THM/thm_nameoftheme/sound' is what you're looking for.

It was here in the code
https://github.com/ifcaro/Open-PS2-Loader/pull/157/files#diff-d7645d842acf6db941b3a2dce2c0ffe4R1110
the whole time, all you had to do was look.

All the best.

@ElPatas1
Copy link
Contributor

@KrahJohlito, i tested previous OPL stable versions and the freeze happens also while starting
a game after unloadind the HDLServer, nobody noticed it never.

Then yes, i think is better separate this problem from this pull request.

Please eliminate your fix of saving the config before the initialitation of the HDLServer
from the code of this pull request as do not fixes really the problem, and also eliminate
the string of "Settings must be saved before continuing" from the "src/lang.c" file
and i merge it.

Best regards.

@TnA-Plastic
Copy link

I tend to agree on this small change and also their cause, with @ElPatas1.

The issue is not caused by your code and it would keep the PR clean from other unrelated stuff! :)

@TnA-Plastic
Copy link

THX @Krah!

You can still keep a copy of it somewhere, but like @ElPatas1 said, it is neither fixing the root of the problem (even tho', it is a half way working workaround), nor is it caused by the SFX-Code, so it is good to rather keep it for a separate PR, or fix the root of the issue. :)

@ElPatas1 ElPatas1 merged commit 156bcdb into ps2homebrew:master Dec 16, 2018
@TnA-Plastic
Copy link

Yeeeeeeheeeeeaaaaaassss!

THX!

@KrahJohlito KrahJohlito deleted the gui-final branch January 5, 2019 09:34
@KrahJohlito KrahJohlito restored the gui-final branch January 5, 2019 09:34
AKuHAK pushed a commit that referenced this pull request Sep 30, 2021
citronalco pushed a commit to citronalco/OPL-Daily-Builds that referenced this pull request Sep 10, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants