Skip to content

Commit

Permalink
clean up sdirectsound stuff that we don't seem to need
Browse files Browse the repository at this point in the history
  • Loading branch information
@sh95014
sh95014 committed Dec 10, 2023
1 parent a3a1a9f commit 2ba1315
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 57 deletions.
20 changes: 0 additions & 20 deletions Mariani.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -810,32 +810,22 @@
B049E7FA277A36CE00FC14A3 /* PropertySheetHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PropertySheetHelper.h; path = source/Configuration/PropertySheetHelper.h; sourceTree = "<group>"; };
B049E7FB277A36CE00FC14A3 /* PageAdvanced.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PageAdvanced.h; path = source/Configuration/PageAdvanced.h; sourceTree = "<group>"; };
B049E7FC277A36CE00FC14A3 /* PageAdvanced.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PageAdvanced.cpp; path = source/Configuration/PageAdvanced.cpp; sourceTree = "<group>"; };
B049E81E277B512500FC14A3 /* sdirectsound.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sdirectsound.cpp; path = source/frontends/sdl/sdirectsound.cpp; sourceTree = "<group>"; };
B049E81F277B512500FC14A3 /* sdirectsound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sdirectsound.h; path = source/frontends/sdl/sdirectsound.h; sourceTree = "<group>"; };
B049E822277B517700FC14A3 /* libSDL2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL2.a; path = /opt/homebrew/Cellar/sdl2/2.0.20/lib/libSDL2.a; sourceTree = "<absolute>"; };
B049E824277B52B200FC14A3 /* sdlframe.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sdlframe.cpp; path = source/frontends/sdl/sdlframe.cpp; sourceTree = "<group>"; };
B049E825277B52B200FC14A3 /* sdlframe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sdlframe.h; path = source/frontends/sdl/sdlframe.h; sourceTree = "<group>"; };
B049E830277B5E3700FC14A3 /* commonframe.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = commonframe.cpp; path = source/frontends/common2/commonframe.cpp; sourceTree = "<group>"; };
B049E831277B5E3700FC14A3 /* commonframe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = commonframe.h; path = source/frontends/common2/commonframe.h; sourceTree = "<group>"; };
B049E834277B614900FC14A3 /* processfile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = processfile.cpp; path = source/frontends/sdl/processfile.cpp; sourceTree = "<group>"; };
B049E835277B614900FC14A3 /* processfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = processfile.h; path = source/frontends/sdl/processfile.h; sourceTree = "<group>"; };
B049E838277B61A100FC14A3 /* utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = utils.cpp; path = source/frontends/sdl/utils.cpp; sourceTree = "<group>"; };
B049E839277B61A100FC14A3 /* utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = utils.h; path = source/frontends/sdl/utils.h; sourceTree = "<group>"; };
B049E83C277B61AC00FC14A3 /* utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = utils.h; path = source/frontends/common2/utils.h; sourceTree = "<group>"; };
B049E83D277B61AC00FC14A3 /* utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = utils.cpp; path = source/frontends/common2/utils.cpp; sourceTree = "<group>"; };
B049E840277B61CB00FC14A3 /* speed.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = speed.h; path = source/frontends/common2/speed.h; sourceTree = "<group>"; };
B049E841277B61CB00FC14A3 /* speed.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = speed.cpp; path = source/frontends/common2/speed.cpp; sourceTree = "<group>"; };
B049E844277B677400FC14A3 /* sdlrendererframe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sdlrendererframe.h; path = source/frontends/sdl/renderer/sdlrendererframe.h; sourceTree = "<group>"; };
B049E845277B677400FC14A3 /* sdlrendererframe.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sdlrendererframe.cpp; path = source/frontends/sdl/renderer/sdlrendererframe.cpp; sourceTree = "<group>"; };
B049E848277B68E900FC14A3 /* programoptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = programoptions.h; path = source/frontends/common2/programoptions.h; sourceTree = "<group>"; };
B049E84B277B6DE300FC14A3 /* programoptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = programoptions.cpp; path = source/frontends/common2/programoptions.cpp; sourceTree = "<group>"; };
B049E84D277B6F4A00FC14A3 /* libboost_program_options.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libboost_program_options.a; path = /opt/homebrew/Cellar/boost/1.76.0/lib/libboost_program_options.a; sourceTree = "<absolute>"; };
B049E84F277B6FFE00FC14A3 /* fileregistry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fileregistry.h; path = source/frontends/common2/fileregistry.h; sourceTree = "<group>"; };
B049E850277B6FFE00FC14A3 /* fileregistry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = fileregistry.cpp; path = source/frontends/common2/fileregistry.cpp; sourceTree = "<group>"; };
B049E853277B702000FC14A3 /* ptreeregistry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ptreeregistry.cpp; path = source/frontends/common2/ptreeregistry.cpp; sourceTree = "<group>"; };
B049E854277B702100FC14A3 /* ptreeregistry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ptreeregistry.h; path = source/frontends/common2/ptreeregistry.h; sourceTree = "<group>"; };
B049E857277B714800FC14A3 /* gamepad.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = gamepad.cpp; path = source/frontends/sdl/gamepad.cpp; sourceTree = "<group>"; };
B049E858277B714800FC14A3 /* gamepad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gamepad.h; path = source/frontends/sdl/gamepad.h; sourceTree = "<group>"; };
B049E89C277C43BF00FC14A3 /* EmulatorViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EmulatorViewController.h; sourceTree = "<group>"; };
B049E89D277C43BF00FC14A3 /* EmulatorViewController.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; path = EmulatorViewController.mm; sourceTree = "<group>"; };
B049E8A0277C44B100FC14A3 /* EmulatorRenderer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EmulatorRenderer.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1606,18 +1596,8 @@
B049E81D277B50E100FC14A3 /* sdl */ = {
isa = PBXGroup;
children = (
B049E857277B714800FC14A3 /* gamepad.cpp */,
B049E858277B714800FC14A3 /* gamepad.h */,
B049E834277B614900FC14A3 /* processfile.cpp */,
B049E835277B614900FC14A3 /* processfile.h */,
B049E81E277B512500FC14A3 /* sdirectsound.cpp */,
B049E81F277B512500FC14A3 /* sdirectsound.h */,
B049E824277B52B200FC14A3 /* sdlframe.cpp */,
B049E825277B52B200FC14A3 /* sdlframe.h */,
B049E845277B677400FC14A3 /* sdlrendererframe.cpp */,
B049E844277B677400FC14A3 /* sdlrendererframe.h */,
B049E838277B61A100FC14A3 /* utils.cpp */,
B049E839277B61A100FC14A3 /* utils.h */,
);
name = sdl;
sourceTree = "<group>";
Expand Down
40 changes: 3 additions & 37 deletions source/frontends/mariani/cadirectsound.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@
// Forked from frontends/sdl/sdirectsound.cpp
//

#include "frontends/sdl/sdirectsound.h"
#include <AudioToolbox/AudioToolbox.h>
#include "windows.h"
#include "Core.h"
#include <AudioToolbox/AudioToolbox.h>

namespace
{
Expand All @@ -30,27 +29,21 @@ namespace
DirectSoundGenerator(LPCDSBUFFERDESC lpcDSBufferDesc,
const char * deviceName,
const size_t ms);
virtual HRESULT Release() override;

void resetUnderruns();

sa2::SoundInfo getInfo();
virtual HRESULT Release() override;

friend OSStatus DirectSoundRenderProc(void * inRefCon,
AudioUnitRenderActionFlags * ioActionFlags,
const AudioTimeStamp * inTimeStamp,
UInt32 inBusNumber,
UInt32 inNumberFrames,
AudioBufferList * ioData);

void setVolumeIfNecessary();

private:
std::vector<uint8_t> myMixerBuffer;

AudioUnit outputUnit;
Float32 volume;

size_t myBytesPerSecond;
};

std::unordered_map<DirectSoundGenerator *, std::shared_ptr<DirectSoundGenerator>> activeSoundGenerators;
Expand All @@ -61,7 +54,6 @@ namespace
: IDirectSoundBuffer(lpcDSBufferDesc)
, outputUnit(0)
, volume(0)
, myBytesPerSecond(0)
{
AudioComponentDescription desc = { 0 };
desc.componentType = kAudioUnitType_Output;
Expand Down Expand Up @@ -131,32 +123,6 @@ namespace
return S_OK;
}

sa2::SoundInfo DirectSoundGenerator::getInfo()
{
DWORD dwStatus;
GetStatus(&dwStatus);

sa2::SoundInfo info;
info.running = dwStatus & DSBSTATUS_PLAYING;
info.channels = (UInt32)myChannels;
info.volume = GetLogarithmicVolume();
info.numberOfUnderruns = GetBufferUnderruns();

if (info.running && myBytesPerSecond > 0) {
const DWORD bytesInBuffer = GetBytesInBuffer();
const float coeff = 1.0 / myBytesPerSecond;
info.buffer = bytesInBuffer * coeff;
info.size = myBufferSize * coeff;
}

return info;
}

void DirectSoundGenerator::resetUnderruns()
{
ResetUnderrruns();
}

void DirectSoundGenerator::setVolumeIfNecessary()
{
const double logVolume = GetLogarithmicVolume();
Expand Down

0 comments on commit 2ba1315

Please sign in to comment.