ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #261 from vadosnaprimer/release_0_9_9 

Mic sample fixes for 0.9.9
This commit is contained in:
zeromus 2019-03-25 16:39:18 -04:00 committed by GitHub
parent 3695f5b329 9967581aa8
commit 0523bceaa7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desmume/src/windows/main.cpp
View File

@ -2776,7 +2776,7 @@ static void RefreshMicSettings()
{ {
MessageBox(NULL, "Unable to read the mic sample", "DeSmuME", (MB_OK | MB_ICONEXCLAMATION)); MessageBox(NULL, "Unable to read the mic sample", "DeSmuME", (MB_OK | MB_ICONEXCLAMATION));
} }
else else if (osd)
{ {
osd->addLine("Mic sample %d selected", MicSampleSelection); osd->addLine("Mic sample %d selected", MicSampleSelection);
} }

34
desmume/src/windows/mic.cpp
View File

@ -231,7 +231,8 @@ bool LoadSamples(const char *name)
if (!name || !*name) return true; if (!name || !*name) return true;
//analyze the filename for _0 at the end. anything with _0 at the end is assumed to be the beginning of a series of files //analyze the filename for _0 at the end. anything with _0 at the end is assumed to be the beginning of a series of files
//(and if not, it can still be loaded just fine) //series with just digits in filenames also work: "0.wav". in those \ would be a remainder from the path
//(and if neither, it can still be loaded just fine)
const char* ext = strrchr(name,'.'); const char* ext = strrchr(name,'.');
//in case the filename had no extension... it's an error. //in case the filename had no extension... it's an error.
@ -243,13 +244,13 @@ bool LoadSamples(const char *name)
if(ext<name) if(ext<name)
return LoadSample(name); return LoadSample(name);
//if it was not a _0, just load it //if it was not a _0 or a \0, just load it
if(strncmp(maybe_0,"_0",2)) if(strncmp(maybe_0,"_0",2) && strncmp(maybe_0,"\\0",2))
return LoadSample(name); return LoadSample(name);
//otherwise replace it with increasing numbers and load all those //otherwise replace it with increasing numbers and load all those
std::string prefix = name; std::string prefix = name;
prefix.resize(maybe_0-name+1); //take care to keep the _ prefix.resize(maybe_0-name+1); //take care to keep the _ or \
//if found, it's a wildcard. load all those samples //if found, it's a wildcard. load all those samples
//this is limited to 254 entries in order to prevent some surprises, because I was stupid and used a byte for the MicSampleSelection. //this is limited to 254 entries in order to prevent some surprises, because I was stupid and used a byte for the MicSampleSelection.
@ -394,27 +395,12 @@ u8 Mic_ReadSample()
{ {
if(micSamples.size() > 0) if(micSamples.size() > 0)
{ {
//why is this reading every sample twice? I did this for some reason in 57dbe9128d0f8cbb4bd79154fb9cda3ab6fab386 tmp = micSamples[MicSampleSelection][micReadSamplePos >> 1];
//maybe the game reads two samples in succession to check them or something. stuff definitely works better with the two-in-a-row micReadSamplePos++;
if (micReadSamplePos == micSamples[MicSampleSelection].size()*2) if(micReadSamplePos == micSamples[MicSampleSelection].size()*2)
{ {
tmp = 0x80; //silence, with 8 bit signed values micReadSamplePos=0;
} printf("Ended mic sample MicSampleSelection\n");
else
{
tmp = micSamples[MicSampleSelection][micReadSamplePos >> 1];
//nintendogs seems sensitive to clipped samples, at least.
//by clamping these, we get better sounds on playback
//I don't know how important it is, but I like nintendogs to sound good at least..
if(tmp == 0) tmp = 1;
if(tmp == 255) tmp = 254;
micReadSamplePos++;
if(micReadSamplePos == micSamples[MicSampleSelection].size()*2)
{
printf("Ended mic sample MicSampleSelection\n");
}
} }
} }
else else