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.

Sign up for GitHub

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

Jump to bottom

Add sound effects for PPSSPP interface navigation #13239

Merged
merged 9 commits into from
Aug 3, 2020
Merged

Add sound effects for PPSSPP interface navigation #13239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6f02844
Consolidate BackgroundAudio.cpp into a class
hrydgard Aug 2, 2020
e13b53e
BackgroundAudio: Switch to a heap allocated buffer.
hrydgard Aug 2, 2020
a0922e7
Initial sound effects
hrydgard Aug 2, 2020
b30be91
Read in WAV files for UI sounds
hrydgard Aug 2, 2020
5423f76
Hook up the first UI sound, make it play.
hrydgard Aug 2, 2020
55eb284
Hook up a couple more sounds. Unfortunately clickable back buttons no…
hrydgard Aug 2, 2020
434b717
Add a couple of more sounds. Rename some vars.
hrydgard Aug 3, 2020
3fd8f3d
Add a setting. Various tweaks to sound triggering.
hrydgard Aug 3, 2020
b77d954
Off by default
hrydgard Aug 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Core/Config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,7 @@ static ConfigSetting generalSettings[] = {
ConfigSetting("Language", &g_Config.sLanguageIni, &DefaultLangRegion),
ConfigSetting("ForceLagSync2", &g_Config.bForceLagSync, false, true, true),
ConfigSetting("DiscordPresence", &g_Config.bDiscordPresence, true, true, false), // Or maybe it makes sense to have it per-game? Race conditions abound...
ConfigSetting("UISound", &g_Config.bUISound, false, true, false),

ReportedConfigSetting("NumWorkerThreads", &g_Config.iNumWorkerThreads, &DefaultNumWorkers, true, true),
ConfigSetting("AutoLoadSaveState", &g_Config.iAutoLoadSaveState, 0, true, true),
Expand Down
1 change: 1 addition & 0 deletions Core/Config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ struct Config {
int iMaxRecent;
int iCurrentStateSlot;
int iRewindFlipFrequency;
bool bUISound;
bool bEnableStateUndo;
int iAutoLoadSaveState; // 0 = off, 1 = oldest, 2 = newest, >2 = slot number + 3
bool bEnableCheats;
Expand Down
4 changes: 2 additions & 2 deletions Core/HLE/sceMpeg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1882,11 +1882,11 @@ static u32 sceMpegAvcCopyYCbCr(u32 mpeg, u32 sourceAddr, u32 YCbCrAddr)

MpegContext *ctx = getMpegCtx(mpeg);
if (!ctx) {
WARN_LOG(ME, "UNIMPL sceMpegAvcCopyYCbCr(%08x, %08x, %08x): bad mpeg handle", mpeg, sourceAddr, YCbCrAddr);
ERROR_LOG(ME, "UNIMPL sceMpegAvcCopyYCbCr(%08x, %08x, %08x): bad mpeg handle", mpeg, sourceAddr, YCbCrAddr);
return -1;
}

ERROR_LOG(ME, "UNIMPL sceMpegAvcCopyYCbCr(%08x, %08x, %08x)", mpeg, sourceAddr, YCbCrAddr);
WARN_LOG(ME, "UNIMPL sceMpegAvcCopyYCbCr(%08x, %08x, %08x)", mpeg, sourceAddr, YCbCrAddr);
return 0;
}

Expand Down
3 changes: 1 addition & 2 deletions Core/WaveFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright 2008 Dolphin Emulator Project
// Licensed under GPLv2+
// Refer to the license.txt file included.
#ifndef MOBILE_DEVICE

#include <string>

#include "Core/WaveFile.h"
Expand Down Expand Up @@ -105,4 +105,3 @@ void WaveFileWriter::AddStereoSamples(const short* sample_data, u32 count)
file.WriteBytes(sample_data, count * 4);
audio_size += count * 4;
}
#endif
4 changes: 0 additions & 4 deletions Core/WaveFile.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
// ---------------------------------------------------------------------------------

#pragma once
#ifndef MOBILE_DEVICE

#include <array>
#include <string>
Expand Down Expand Up @@ -40,6 +39,3 @@ class WaveFileWriter
void Write(u32 value);
void Write4(const char* ptr);
};

#endif

Loading