empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix various warnings.

Browse source 
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
This commit is contained in:
Andrea Odetti 2021-05-29 21:50:33 +01:00
parent 01c5c91fbd
commit e2634210ca
7 changed files with 14 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/frontends/sdl/imgui/sdlimguiframe.h
View file

@ -6,7 +6,7 @@
namespace common2
{
class EmulatorOptions;
struct EmulatorOptions;
}
namespace sa2

8
source/frontends/sdl/imgui/sdlsettings.cpp
View file

@ -378,7 +378,7 @@ namespace sa2
ImGui::TableNextColumn();
ImGui::Text("%d", slot);
ImGui::TableNextColumn();
ImGui::Text("%d", drive + 1);
ImGui::Text("%zu", drive + 1);
ImGui::TableNextColumn();
ImGui::Text("%d", firmware);
ImGui::TableNextColumn();
@ -434,7 +434,7 @@ namespace sa2
ImGui::TableNextColumn();
ImGui::Text("%d", SLOT7);
ImGui::TableNextColumn();
ImGui::Text("%d", drive + 1);
ImGui::Text("%zu", drive + 1);
ImGui::TableNextColumn();
ImGui::TextUnformatted("HD");
ImGui::TableNextColumn();
@ -947,7 +947,7 @@ namespace sa2
{
if (myAddressCycles.find(nAddress) != myAddressCycles.end())
{
ImGui::Text("%d", myAddressCycles[nAddress]);
ImGui::Text("%" PRIu64, myAddressCycles[nAddress]);
}
}
@ -1078,7 +1078,7 @@ namespace sa2
frame->ChangeMode(MODE_RUNNING);
}
ImGui::SameLine();
ImGui::Text("%016llu - %04X", g_nCumulativeCycles, regs.pc);
ImGui::Text("%016" PRIu64 " - %04X", g_nCumulativeCycles, regs.pc);
if (!mySyncCPU)
{

13
source/frontends/sdl/main.cpp
View file

@ -56,19 +56,6 @@ namespace
common2::Timer * timer;
};
Uint32 emulator_callback(Uint32 interval, void *param)
{
Data * data = static_cast<Data *>(param);
SDL_LockMutex(data->mutex);
data->timer->tic();
data->frame->ExecuteOneFrame(interval);
data->timer->toc();
SDL_UnlockMutex(data->mutex);
return interval;
}
void setGLSwapInterval(const int interval)
{
const int current = SDL_GL_GetSwapInterval();

2
source/frontends/sdl/renderer/sdlrendererframe.h
View file

@ -4,7 +4,7 @@
namespace common2
{
class EmulatorOptions;
struct EmulatorOptions;
}
namespace sa2

4
source/frontends/sdl/sdlframe.cpp
View file

@ -133,9 +133,9 @@ namespace sa2
: myForceCapsLock(true)
, myMultiplier(1)
, myFullscreen(false)
, mySpeed(options.fixedSpeed)
, myDragAndDropSlot(SLOT6)
, myDragAndDropDrive(DRIVE_1)
, mySpeed(options.fixedSpeed)
{
}
@ -521,7 +521,7 @@ namespace sa2
const uint64_t cyclesToExecutePerFrame = mySpeed.getCyclesAtFixedSpeed(msNextFrame * 1000);
int count = maximumFrames;
while (g_bFullSpeed = (count && canDoFullSpeed()))
while ((g_bFullSpeed = (count && canDoFullSpeed())))
{
Execute(cyclesToExecutePerFrame);
--count;

8
source/linux/windows/dsound.cpp
View file

@ -10,13 +10,13 @@ HRESULT IDirectSoundNotify::SetNotificationPositions(DWORD cPositionNotifies, LP
}
IDirectSoundBuffer::IDirectSoundBuffer(const size_t aBufferSize, const size_t aChannels, const size_t aSampleRate, const size_t aBitsPerSample, const size_t aFlags)
: bufferSize(aBufferSize)
, channels(aChannels)
: mySoundNotify(new IDirectSoundNotify)
, mySoundBuffer(aBufferSize)
, bufferSize(aBufferSize)
, sampleRate(aSampleRate)
, channels(aChannels)
, bitsPerSample(aBitsPerSample)
, flags(aFlags)
, mySoundNotify(new IDirectSoundNotify)
, mySoundBuffer(aBufferSize)
{
}

4
source/linux/windows/dsound.h
View file

@ -75,7 +75,7 @@ typedef struct IDirectSoundNotify *LPDIRECTSOUNDNOTIFY,**LPLPDIRECTSOUNDNOTIFY;
class IDirectSoundBuffer : public IUnknown
{
std::unique_ptr<IDirectSoundNotify> mySoundNotify;
const std::unique_ptr<IDirectSoundNotify> mySoundNotify;
std::vector<char> mySoundBuffer;
size_t myPlayPosition = 0;
@ -116,7 +116,7 @@ class IDirectSoundBuffer : public IUnknown
HRESULT GetStatus( LPDWORD lpdwStatus );
HRESULT Restore();
};
typedef struct IDirectSoundBuffer *LPDIRECTSOUNDBUFFER,**LPLPDIRECTSOUNDBUFFER;
typedef class IDirectSoundBuffer *LPDIRECTSOUNDBUFFER,**LPLPDIRECTSOUNDBUFFER;
struct IDirectSound : public IUnknown
{