mirror of https://github.com/snes9xgit/snes9x.git
Merge pull request #505 from tmkk/apurefactor_mac
APU refactoring follow-ups for Mac port
This commit is contained in:
OV2
GitHub
commit
2ce6de57ac
|
|
@ -9,7 +9,11 @@
|
|||
|
||||
#include <cstring>
|
||||
#include <cassert>
|
||||
#if __cplusplus >= 201103L
|
||||
#include <cstdint>
|
||||
#else
|
||||
#include <stdint.h>
|
||||
#endif
|
||||
#include <cmath>
|
||||
|
||||
class Resampler
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@
|
|||
#include <AudioToolbox/AudioToolbox.h>
|
||||
#include <AudioUnit/AudioUnitCarbonView.h>
|
||||
#include <pthread.h>
|
||||
#include <semaphore.h>
|
||||
|
||||
#include "mac-prefix.h"
|
||||
#include "mac-dialog.h"
|
||||
|
|
@ -49,6 +50,10 @@ static WindowRef effectWRef;
|
|||
static HISize effectWSize;
|
||||
static pthread_mutex_t mutex;
|
||||
static UInt32 outStoredFrames, cnvStoredFrames, revStoredFrames, eqlStoredFrames, devStoredFrames;
|
||||
static int16_t *audioBuffer;
|
||||
static uint32_t audioBufferSampleCapacity;
|
||||
static uint32_t audioBufferSampleCount;
|
||||
static sem_t *soundSyncSemaphore;
|
||||
|
||||
static void ConnectAudioUnits (void);
|
||||
static void DisconnectAudioUnits (void);
|
||||
|
|
@ -60,7 +65,7 @@ static void StoreBufferFrameSize (void);
|
|||
static void ChangeBufferFrameSize (void);
|
||||
static void ReplaceAudioUnitCarbonView (void);
|
||||
static void ResizeSoundEffectsDialog (HIViewRef);
|
||||
static void MacFinalizeSamplesCallBack (void *);
|
||||
static void MacSamplesAvailableCallBack (void *);
|
||||
static OSStatus MacAURenderCallBack (void *, AudioUnitRenderActionFlags *, const AudioTimeStamp *, UInt32, UInt32, AudioBufferList *);
|
||||
static pascal OSStatus SoundEffectsEventHandler (EventHandlerCallRef, EventRef, void *);
|
||||
static pascal OSStatus SoundEffectsCarbonViewEventHandler (EventHandlerCallRef, EventRef, void *);
|
||||
|
|
@ -139,7 +144,8 @@ void InitMacSound (void)
|
|||
LoadEffectPresets();
|
||||
|
||||
pthread_mutex_init(&mutex, NULL);
|
||||
S9xSetSamplesAvailableCallback(MacFinalizeSamplesCallBack, NULL);
|
||||
soundSyncSemaphore = sem_open("/s9x_mac_soundsync", O_CREAT, 0644, 1);
|
||||
S9xSetSamplesAvailableCallback(MacSamplesAvailableCallBack, NULL);
|
||||
}
|
||||
|
||||
void DeinitMacSound (void)
|
||||
|
|
@ -147,6 +153,8 @@ void DeinitMacSound (void)
|
|||
OSStatus err;
|
||||
|
||||
pthread_mutex_destroy(&mutex);
|
||||
sem_close(soundSyncSemaphore);
|
||||
sem_unlink("/s9x_mac_soundsync");
|
||||
SaveEffectPresets();
|
||||
DisconnectAudioUnits();
|
||||
err = AUGraphUninitialize(agraph);
|
||||
|
|
@ -325,49 +333,72 @@ static OSStatus MacAURenderCallBack (void *inRefCon, AudioUnitRenderActionFlags
|
|||
*ioActionFlags |= kAudioUnitRenderAction_OutputIsSilence;
|
||||
}
|
||||
else
|
||||
if (Settings.Stereo)
|
||||
{
|
||||
unsigned int samples;
|
||||
|
||||
samples = ioData->mBuffers[0].mDataByteSize;
|
||||
if (Settings.SixteenBitSound)
|
||||
samples >>= 1;
|
||||
static bool recoverBufferUnderrun = false;
|
||||
unsigned int samples = ioData->mBuffers[0].mDataByteSize >> 1;
|
||||
|
||||
pthread_mutex_lock(&mutex);
|
||||
S9xMixSamples((uint8 *) ioData->mBuffers[0].mData, samples);
|
||||
pthread_mutex_unlock(&mutex);
|
||||
}
|
||||
else // Manually map L to R
|
||||
{
|
||||
unsigned int monosmp;
|
||||
|
||||
monosmp = ioData->mBuffers[0].mDataByteSize >> 1;
|
||||
if (Settings.SixteenBitSound)
|
||||
monosmp >>= 1;
|
||||
|
||||
pthread_mutex_lock(&mutex);
|
||||
S9xMixSamples((uint8 *) ioData->mBuffers[0].mData, monosmp);
|
||||
pthread_mutex_unlock(&mutex);
|
||||
|
||||
if (Settings.SixteenBitSound)
|
||||
if (samples > audioBufferSampleCount || (recoverBufferUnderrun && audioBufferSampleCount<<1 < audioBufferSampleCapacity))
|
||||
{
|
||||
for (int i = monosmp - 1; i >= 0; i--)
|
||||
((int16 *) ioData->mBuffers[0].mData)[i * 2 + 1] = ((int16 *) ioData->mBuffers[0].mData)[i * 2] = ((int16 *) ioData->mBuffers[0].mData)[i];
|
||||
/* buffer underrun - emit silence at least 50% of buffer is filled */
|
||||
bzero(ioData->mBuffers[0].mData, samples*2);
|
||||
recoverBufferUnderrun = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
for (int i = monosmp - 1; i >= 0; i--)
|
||||
((int8 *) ioData->mBuffers[0].mData)[i * 2 + 1] = ((int8 *) ioData->mBuffers[0].mData)[i * 2] = ((int8 *) ioData->mBuffers[0].mData)[i];
|
||||
recoverBufferUnderrun = false;
|
||||
memcpy(ioData->mBuffers[0].mData, audioBuffer, samples*2);
|
||||
memmove(audioBuffer, audioBuffer+samples, (audioBufferSampleCount-samples)*2);
|
||||
audioBufferSampleCount -= samples;
|
||||
sem_post(soundSyncSemaphore);
|
||||
}
|
||||
pthread_mutex_unlock(&mutex);
|
||||
}
|
||||
|
||||
return (noErr);
|
||||
}
|
||||
|
||||
static void MacFinalizeSamplesCallBack (void *userData)
|
||||
static void MacSamplesAvailableCallBack (void *userData)
|
||||
{
|
||||
uint32_t availableSamples = S9xGetSampleCount();
|
||||
if (Settings.DynamicRateControl)
|
||||
{
|
||||
S9xUpdateDynamicRate((audioBufferSampleCapacity-audioBufferSampleCount)*2, audioBufferSampleCapacity*2);
|
||||
}
|
||||
|
||||
tryLock:
|
||||
pthread_mutex_lock(&mutex);
|
||||
S9xFinalizeSamples();
|
||||
if (audioBufferSampleCapacity - audioBufferSampleCount < availableSamples)
|
||||
{
|
||||
/* buffer overrun */
|
||||
if (Settings.DynamicRateControl && !Settings.SoundSync)
|
||||
{
|
||||
/* for dynamic rate control, clear S9x internal buffer and do nothing */
|
||||
pthread_mutex_unlock(&mutex);
|
||||
S9xClearSamples();
|
||||
return;
|
||||
}
|
||||
if (Settings.SoundSync && !Settings.TurboMode)
|
||||
{
|
||||
/* when SoundSync is enabled, wait buffer for being drained by render callback */
|
||||
pthread_mutex_unlock(&mutex);
|
||||
sem_wait(soundSyncSemaphore);
|
||||
goto tryLock;
|
||||
}
|
||||
/* dispose samples to allocate 50% of the buffer capacity */
|
||||
uint32_t samplesToBeDisposed = availableSamples + audioBufferSampleCount - audioBufferSampleCapacity/2;
|
||||
if(samplesToBeDisposed >= audioBufferSampleCount)
|
||||
{
|
||||
audioBufferSampleCount = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
memmove(audioBuffer, audioBuffer+samplesToBeDisposed, (audioBufferSampleCount-samplesToBeDisposed)*2);
|
||||
audioBufferSampleCount = audioBufferSampleCount - samplesToBeDisposed;
|
||||
}
|
||||
}
|
||||
S9xMixSamples((uint8 *)(audioBuffer+audioBufferSampleCount), availableSamples);
|
||||
audioBufferSampleCount += availableSamples;
|
||||
pthread_mutex_unlock(&mutex);
|
||||
}
|
||||
|
||||
|
|
@ -472,6 +503,10 @@ bool8 S9xOpenSoundDevice (void)
|
|||
|
||||
err = AUGraphInitialize(agraph);
|
||||
|
||||
if (audioBuffer) free(audioBuffer);
|
||||
audioBufferSampleCapacity = 2 * macSoundBuffer_ms * Settings.SoundPlaybackRate / 1000;
|
||||
audioBuffer = (int16_t *)calloc(audioBufferSampleCapacity,sizeof(int16_t));
|
||||
audioBufferSampleCount = 0;
|
||||
return (true);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@ long drawingMethod = kDrawingOpenGL;
|
|||
int videoMode = VIDEOMODE_SMOOTH;
|
||||
|
||||
SInt32 macSoundVolume = 80; // %
|
||||
uint32 macSoundBuffer_ms = 100; // ms
|
||||
uint32 macSoundBuffer_ms = 80; // ms
|
||||
uint32 macSoundInterval_ms = 16; // ms
|
||||
bool8 macSoundLagEnable = false;
|
||||
uint16 aueffect = 0;
|
||||
|
|
@ -3032,7 +3032,7 @@ static void Initialize (void)
|
|||
Settings.SixteenBitSound = true;
|
||||
Settings.Stereo = true;
|
||||
Settings.SoundPlaybackRate = 32000;
|
||||
Settings.SoundInputRate = 32000;
|
||||
Settings.SoundInputRate = 31950;
|
||||
Settings.SupportHiRes = true;
|
||||
Settings.Transparency = true;
|
||||
Settings.AutoDisplayMessages = true;
|
||||
|
|
|
|||
|
|
@ -149,14 +149,10 @@ static PrefList prefList[] =
|
|||
{ 'CIFl', &ciFilterEnable, sizeof(bool8 ) },
|
||||
|
||||
{ 'sSyn', &Settings.SoundSync, sizeof(bool8 ) },
|
||||
{ 'so16', &Settings.SixteenBitSound, sizeof(bool8 ) },
|
||||
{ 'ster', &Settings.Stereo, sizeof(bool8 ) },
|
||||
{ 'rbst', &Settings.ReverseStereo, sizeof(bool8 ) },
|
||||
{ 'srat', &Settings.SoundPlaybackRate, sizeof(uint32 ) },
|
||||
{ 'InRt', &Settings.SoundInputRate, sizeof(uint32 ) },
|
||||
{ 'MxIv', &macSoundInterval_ms, sizeof(uint32 ) },
|
||||
{ 'SBuf', &macSoundBuffer_ms, sizeof(uint32 ) },
|
||||
{ 'SLag', &macSoundLagEnable, sizeof(bool8 ) },
|
||||
{ 'Volm', &macSoundVolume, sizeof(SInt32 ) },
|
||||
{ 'AUef', &aueffect, sizeof(uint16 ) },
|
||||
{ 'AUce', &cureffect, sizeof(int ) },
|
||||
|
|
@ -262,6 +258,12 @@ void SavePrefs (void)
|
|||
CFRelease(mref);
|
||||
}
|
||||
|
||||
sref = (CFStringRef) CFDictionaryGetValue(CFBundleGetInfoDictionary(CFBundleGetMainBundle()), CFSTR("CFBundleShortVersionString"));
|
||||
if (sref)
|
||||
{
|
||||
CFPreferencesSetAppValue(CFSTR("LastVersionUsed"), sref, kCFPreferencesCurrentApplication);
|
||||
}
|
||||
|
||||
CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
|
||||
}
|
||||
|
||||
|
|
@ -305,6 +307,13 @@ void LoadPrefs (void)
|
|||
|
||||
CFRelease(mref);
|
||||
}
|
||||
|
||||
sref = (CFStringRef) CFPreferencesCopyAppValue(CFSTR("LastVersionUsed"), kCFPreferencesCurrentApplication);
|
||||
if (!sref) {
|
||||
Settings.SoundInputRate = 31950;
|
||||
macSoundBuffer_ms = 80;
|
||||
}
|
||||
else CFRelease(sref);
|
||||
}
|
||||
|
||||
void ConfigurePreferences (void)
|
||||
|
|
@ -538,16 +547,17 @@ void ConfigurePreferences (void)
|
|||
cid.id = iNibS16BitPlayback;
|
||||
HIViewFindByID(root, cid, &ctl);
|
||||
SetControl32BitValue(ctl, Settings.SixteenBitSound);
|
||||
DeactivateControl(ctl);
|
||||
|
||||
cid.id = iNibSStereo;
|
||||
HIViewFindByID(root, cid, &ctl);
|
||||
SetControl32BitValue(ctl, Settings.Stereo);
|
||||
DeactivateControl(ctl);
|
||||
|
||||
cid.id = iNibSReverseStereo;
|
||||
HIViewFindByID(root, cid, &ctl);
|
||||
SetControl32BitValue(ctl, Settings.ReverseStereo);
|
||||
if (!Settings.Stereo)
|
||||
DeactivateControl(ctl);
|
||||
DeactivateControl(ctl);
|
||||
|
||||
cid.id = iNibSPlaybackRate;
|
||||
HIViewFindByID(root, cid, &ctl);
|
||||
|
|
@ -633,6 +643,7 @@ void ConfigurePreferences (void)
|
|||
cid.id = iNibSAllowLag;
|
||||
HIViewFindByID(root, cid, &ctl);
|
||||
SetControl32BitValue(ctl, macSoundLagEnable);
|
||||
DeactivateControl(ctl);
|
||||
|
||||
cid.id = iNibSVolume;
|
||||
HIViewFindByID(root, cid, &ctl);
|
||||
|
|
|
|||
|
|
@ -460,5 +460,5 @@ void SNES9X_Quit (void)
|
|||
|
||||
void SNES9X_InitSound (void)
|
||||
{
|
||||
S9xInitSound(macSoundBuffer_ms, macSoundLagEnable ? macSoundBuffer_ms / 2 : 0);
|
||||
S9xInitSound(0, 0);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,15 +19,12 @@
|
|||
BF0B39B41FA5792F002B04D3 /* blargg_source.h in Headers */ = {isa = PBXBuildFile; fileRef = BF0B39811FA5792F002B04D3 /* blargg_source.h */; };
|
||||
BF0B39B51FA5792F002B04D3 /* sdsp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF0B39821FA5792F002B04D3 /* sdsp.cpp */; };
|
||||
BF0B39B61FA5792F002B04D3 /* sdsp.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BF0B39831FA5792F002B04D3 /* sdsp.hpp */; };
|
||||
BF0B39B71FA5792F002B04D3 /* SPC_DSP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF0B39841FA5792F002B04D3 /* SPC_DSP.cpp */; };
|
||||
BF0B39B81FA5792F002B04D3 /* SPC_DSP.h in Headers */ = {isa = PBXBuildFile; fileRef = BF0B39851FA5792F002B04D3 /* SPC_DSP.h */; };
|
||||
BF0B39D61FA5792F002B04D3 /* smp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF0B39A61FA5792F002B04D3 /* smp.cpp */; };
|
||||
BF0B39D71FA5792F002B04D3 /* smp.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BF0B39A71FA5792F002B04D3 /* smp.hpp */; };
|
||||
BF0B39D81FA5792F002B04D3 /* smp_state.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF0B39A81FA5792F002B04D3 /* smp_state.cpp */; };
|
||||
BF0B39DA1FA5792F002B04D3 /* snes.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BF0B39AB1FA5792F002B04D3 /* snes.hpp */; };
|
||||
BF0B39DB1FA5792F002B04D3 /* hermite_resampler.h in Headers */ = {isa = PBXBuildFile; fileRef = BF0B39AC1FA5792F002B04D3 /* hermite_resampler.h */; };
|
||||
BF0B39DC1FA5792F002B04D3 /* resampler.h in Headers */ = {isa = PBXBuildFile; fileRef = BF0B39AD1FA5792F002B04D3 /* resampler.h */; };
|
||||
BF0B39DD1FA5792F002B04D3 /* ring_buffer.h in Headers */ = {isa = PBXBuildFile; fileRef = BF0B39AE1FA5792F002B04D3 /* ring_buffer.h */; };
|
||||
BF0B39DF1FA580F9002B04D3 /* msu1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF0B39DE1FA580F9002B04D3 /* msu1.cpp */; };
|
||||
BF0B39E01FA5810A002B04D3 /* msu1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF0B39DE1FA580F9002B04D3 /* msu1.cpp */; };
|
||||
BF0B39E11FA5810B002B04D3 /* msu1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF0B39DE1FA580F9002B04D3 /* msu1.cpp */; };
|
||||
|
|
@ -50,8 +47,6 @@
|
|||
BF0B39F31FA5815A002B04D3 /* sdsp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF0B39821FA5792F002B04D3 /* sdsp.cpp */; };
|
||||
BF0B39F41FA5815C002B04D3 /* sdsp.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BF0B39831FA5792F002B04D3 /* sdsp.hpp */; };
|
||||
BF0B39F51FA5815C002B04D3 /* sdsp.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BF0B39831FA5792F002B04D3 /* sdsp.hpp */; };
|
||||
BF0B39F61FA5815F002B04D3 /* SPC_DSP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF0B39841FA5792F002B04D3 /* SPC_DSP.cpp */; };
|
||||
BF0B39F71FA58160002B04D3 /* SPC_DSP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF0B39841FA5792F002B04D3 /* SPC_DSP.cpp */; };
|
||||
BF0B39F81FA58162002B04D3 /* SPC_DSP.h in Headers */ = {isa = PBXBuildFile; fileRef = BF0B39851FA5792F002B04D3 /* SPC_DSP.h */; };
|
||||
BF0B39F91FA58163002B04D3 /* SPC_DSP.h in Headers */ = {isa = PBXBuildFile; fileRef = BF0B39851FA5792F002B04D3 /* SPC_DSP.h */; };
|
||||
BF0B39FA1FA58165002B04D3 /* smp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF0B39A61FA5792F002B04D3 /* smp.cpp */; };
|
||||
|
|
@ -62,12 +57,8 @@
|
|||
BF0B39FF1FA5816A002B04D3 /* smp_state.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF0B39A81FA5792F002B04D3 /* smp_state.cpp */; };
|
||||
BF0B3A001FA5816D002B04D3 /* snes.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BF0B39AB1FA5792F002B04D3 /* snes.hpp */; };
|
||||
BF0B3A011FA5816D002B04D3 /* snes.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BF0B39AB1FA5792F002B04D3 /* snes.hpp */; };
|
||||
BF0B3A021FA58170002B04D3 /* hermite_resampler.h in Headers */ = {isa = PBXBuildFile; fileRef = BF0B39AC1FA5792F002B04D3 /* hermite_resampler.h */; };
|
||||
BF0B3A031FA58170002B04D3 /* hermite_resampler.h in Headers */ = {isa = PBXBuildFile; fileRef = BF0B39AC1FA5792F002B04D3 /* hermite_resampler.h */; };
|
||||
BF0B3A041FA58172002B04D3 /* resampler.h in Headers */ = {isa = PBXBuildFile; fileRef = BF0B39AD1FA5792F002B04D3 /* resampler.h */; };
|
||||
BF0B3A051FA58172002B04D3 /* resampler.h in Headers */ = {isa = PBXBuildFile; fileRef = BF0B39AD1FA5792F002B04D3 /* resampler.h */; };
|
||||
BF0B3A061FA58174002B04D3 /* ring_buffer.h in Headers */ = {isa = PBXBuildFile; fileRef = BF0B39AE1FA5792F002B04D3 /* ring_buffer.h */; };
|
||||
BF0B3A071FA58174002B04D3 /* ring_buffer.h in Headers */ = {isa = PBXBuildFile; fileRef = BF0B39AE1FA5792F002B04D3 /* ring_buffer.h */; };
|
||||
CF047D38109D0E0600FD0754 /* 65c816.h in Headers */ = {isa = PBXBuildFile; fileRef = EAE0615A0526CCB900A80003 /* 65c816.h */; };
|
||||
CF047D3B109D0E0600FD0754 /* bsx.h in Headers */ = {isa = PBXBuildFile; fileRef = EA2F381A09B17E9E0078DCA7 /* bsx.h */; };
|
||||
CF047D3C109D0E0600FD0754 /* c4.h in Headers */ = {isa = PBXBuildFile; fileRef = EAE061600526CCB900A80003 /* c4.h */; };
|
||||
|
|
@ -734,9 +725,7 @@
|
|||
BF0B39A71FA5792F002B04D3 /* smp.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = smp.hpp; sourceTree = "<group>"; };
|
||||
BF0B39A81FA5792F002B04D3 /* smp_state.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = smp_state.cpp; sourceTree = "<group>"; };
|
||||
BF0B39AB1FA5792F002B04D3 /* snes.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = snes.hpp; sourceTree = "<group>"; };
|
||||
BF0B39AC1FA5792F002B04D3 /* hermite_resampler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hermite_resampler.h; sourceTree = "<group>"; };
|
||||
BF0B39AD1FA5792F002B04D3 /* resampler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = resampler.h; sourceTree = "<group>"; };
|
||||
BF0B39AE1FA5792F002B04D3 /* ring_buffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ring_buffer.h; sourceTree = "<group>"; };
|
||||
BF0B39DE1FA580F9002B04D3 /* msu1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = msu1.cpp; sourceTree = "<group>"; };
|
||||
BF0B39E21FA58124002B04D3 /* msu1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = msu1.h; sourceTree = "<group>"; };
|
||||
CF047E15109D0E0600FD0754 /* Snes9x (i386).app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Snes9x (i386).app"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
|
|
@ -1082,9 +1071,7 @@
|
|||
BF0B397A1FA5792F002B04D3 /* apu.cpp */,
|
||||
BF0B397B1FA5792F002B04D3 /* apu.h */,
|
||||
BF0B397C1FA5792F002B04D3 /* bapu */,
|
||||
BF0B39AC1FA5792F002B04D3 /* hermite_resampler.h */,
|
||||
BF0B39AD1FA5792F002B04D3 /* resampler.h */,
|
||||
BF0B39AE1FA5792F002B04D3 /* ring_buffer.h */,
|
||||
);
|
||||
path = apu;
|
||||
sourceTree = "<group>";
|
||||
|
|
@ -1475,7 +1462,6 @@
|
|||
CF047D79109D0E0600FD0754 /* portable.h in Headers */,
|
||||
CF047D7A109D0E0600FD0754 /* rcdefs.h in Headers */,
|
||||
CF047D7B109D0E0600FD0754 /* rngcoder.h in Headers */,
|
||||
BF0B3A061FA58174002B04D3 /* ring_buffer.h in Headers */,
|
||||
CF047D7C109D0E0600FD0754 /* s9x-jma.h in Headers */,
|
||||
CF047D7D109D0E0600FD0754 /* winout.h in Headers */,
|
||||
CF047D7E109D0E0600FD0754 /* mac-appleevent.h in Headers */,
|
||||
|
|
@ -1490,7 +1476,6 @@
|
|||
CF047D87109D0E0600FD0754 /* mac-dialog.h in Headers */,
|
||||
CF047D88109D0E0600FD0754 /* mac-file.h in Headers */,
|
||||
CF047D89109D0E0600FD0754 /* mac-gworld.h in Headers */,
|
||||
BF0B3A021FA58170002B04D3 /* hermite_resampler.h in Headers */,
|
||||
CF047D8A109D0E0600FD0754 /* mac-joypad.h in Headers */,
|
||||
CF047D8B109D0E0600FD0754 /* mac-keyboard.h in Headers */,
|
||||
BF0B39E81FA58131002B04D3 /* apu.h in Headers */,
|
||||
|
|
@ -1597,7 +1582,6 @@
|
|||
CF0566CC0CF98E7E00C7877C /* rngcoder.h in Headers */,
|
||||
CF0566CD0CF98E7E00C7877C /* s9x-jma.h in Headers */,
|
||||
CF0566CE0CF98E7E00C7877C /* winout.h in Headers */,
|
||||
BF0B39DD1FA5792F002B04D3 /* ring_buffer.h in Headers */,
|
||||
CF0566D00CF98E7E00C7877C /* mac-appleevent.h in Headers */,
|
||||
CF0566D10CF98E7E00C7877C /* mac-audio.h in Headers */,
|
||||
CF0566D30CF98E7E00C7877C /* mac-cart.h in Headers */,
|
||||
|
|
@ -1611,7 +1595,6 @@
|
|||
CF0566D90CF98E7E00C7877C /* mac-coreimage.h in Headers */,
|
||||
CF0566DA0CF98E7E00C7877C /* mac-dialog.h in Headers */,
|
||||
CF0566DC0CF98E7E00C7877C /* mac-file.h in Headers */,
|
||||
BF0B39DB1FA5792F002B04D3 /* hermite_resampler.h in Headers */,
|
||||
CF0566DD0CF98E7E00C7877C /* mac-gworld.h in Headers */,
|
||||
CF0566DF0CF98E7E00C7877C /* mac-joypad.h in Headers */,
|
||||
CF0566E00CF98E7E00C7877C /* mac-keyboard.h in Headers */,
|
||||
|
|
@ -1715,7 +1698,6 @@
|
|||
CF2F46531095EE72007D33FA /* portable.h in Headers */,
|
||||
CF2F46541095EE72007D33FA /* rcdefs.h in Headers */,
|
||||
CF2F46551095EE72007D33FA /* rngcoder.h in Headers */,
|
||||
BF0B3A071FA58174002B04D3 /* ring_buffer.h in Headers */,
|
||||
CF2F46561095EE72007D33FA /* s9x-jma.h in Headers */,
|
||||
CF2F46571095EE72007D33FA /* winout.h in Headers */,
|
||||
CF2F46581095EE72007D33FA /* mac-appleevent.h in Headers */,
|
||||
|
|
@ -1730,7 +1712,6 @@
|
|||
CF2F46611095EE72007D33FA /* mac-dialog.h in Headers */,
|
||||
CF2F46621095EE72007D33FA /* mac-file.h in Headers */,
|
||||
CF2F46631095EE72007D33FA /* mac-gworld.h in Headers */,
|
||||
BF0B3A031FA58170002B04D3 /* hermite_resampler.h in Headers */,
|
||||
CF2F46641095EE72007D33FA /* mac-joypad.h in Headers */,
|
||||
CF2F46651095EE72007D33FA /* mac-keyboard.h in Headers */,
|
||||
BF0B39E91FA58131002B04D3 /* apu.h in Headers */,
|
||||
|
|
@ -2027,7 +2008,6 @@
|
|||
CF047DF0109D0E0600FD0754 /* mac-cocoatools.mm in Sources */,
|
||||
CF047DF1109D0E0600FD0754 /* mac-controls.cpp in Sources */,
|
||||
CF047DF2109D0E0600FD0754 /* mac-coreimage.mm in Sources */,
|
||||
BF0B39F61FA5815F002B04D3 /* SPC_DSP.cpp in Sources */,
|
||||
BF0B39FE1FA5816A002B04D3 /* smp_state.cpp in Sources */,
|
||||
BF0B39F21FA58159002B04D3 /* sdsp.cpp in Sources */,
|
||||
CF047DF3109D0E0600FD0754 /* mac-dialog.cpp in Sources */,
|
||||
|
|
@ -2057,7 +2037,6 @@
|
|||
CF0567040CF98E7E00C7877C /* c4.cpp in Sources */,
|
||||
CF0567050CF98E7E00C7877C /* c4emu.cpp in Sources */,
|
||||
CF0567060CF98E7E00C7877C /* cheats.cpp in Sources */,
|
||||
BF0B39B71FA5792F002B04D3 /* SPC_DSP.cpp in Sources */,
|
||||
BF0B39AF1FA5792F002B04D3 /* apu.cpp in Sources */,
|
||||
CF0567070CF98E7E00C7877C /* cheats2.cpp in Sources */,
|
||||
CF0567080CF98E7E00C7877C /* clip.cpp in Sources */,
|
||||
|
|
@ -2219,7 +2198,6 @@
|
|||
CF2F46CA1095EE72007D33FA /* mac-cocoatools.mm in Sources */,
|
||||
CF2F46CB1095EE72007D33FA /* mac-controls.cpp in Sources */,
|
||||
CF2F46CC1095EE72007D33FA /* mac-coreimage.mm in Sources */,
|
||||
BF0B39F71FA58160002B04D3 /* SPC_DSP.cpp in Sources */,
|
||||
BF0B39FF1FA5816A002B04D3 /* smp_state.cpp in Sources */,
|
||||
BF0B39F31FA5815A002B04D3 /* sdsp.cpp in Sources */,
|
||||
CF2F46CD1095EE72007D33FA /* mac-dialog.cpp in Sources */,
|
||||
|
|
|
|||
Loading…
Reference in New Issue