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

Fix warnings, and compile failure for libretro.

This commit is contained in:
Stephen Anthony 2019-05-17 21:53:59 -02:30
parent 6fc3863ef9
commit 22b15d7f37
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/emucore/FrameBuffer.cxx
View File

@ -48,6 +48,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
FrameBuffer::FrameBuffer(OSystem& osystem) FrameBuffer::FrameBuffer(OSystem& osystem)
: myOSystem(osystem), : myOSystem(osystem),
myNumDisplays(1),
myInitializedCount(0), myInitializedCount(0),
myPausedCount(0), myPausedCount(0),
myStatsEnabled(false), myStatsEnabled(false),
@ -55,8 +56,7 @@ FrameBuffer::FrameBuffer(OSystem& osystem)
myGrabMouse(false), myGrabMouse(false),
myHiDPIAllowed(false), myHiDPIAllowed(false),
myHiDPIEnabled(false), myHiDPIEnabled(false),
myCurrentModeList(nullptr), myCurrentModeList(nullptr)
myNumDisplays(1)
{ {
} }

4
src/gui/StellaSettingsDialog.cxx
View File

@ -114,10 +114,10 @@ void StellaSettingsDialog::addUIOptions(WidgetArray& wid, int& xpos, int& ypos,
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void StellaSettingsDialog::addVideoOptions(WidgetArray& wid, int& xpos, int& ypos, const GUI::Font& font) void StellaSettingsDialog::addVideoOptions(WidgetArray& wid, int& xpos, int& ypos,
const GUI::Font& font)
{ {
const int VGAP = 4; const int VGAP = 4;
const int INDENT = 20;
const int lineHeight = font.getLineHeight(), const int lineHeight = font.getLineHeight(),
fontWidth = font.getMaxCharWidth(); fontWidth = font.getMaxCharWidth();
VariantList items; VariantList items;

9
src/gui/StellaSettingsDialog.hxx
View File

@ -24,13 +24,11 @@ class PopUpWidget;
#include "Menu.hxx" #include "Menu.hxx"
#include "Dialog.hxx" #include "Dialog.hxx"
#include "MessageBox.hxx" #include "MessageBox.hxx"
// FIXME - use the R77 define in the final release
// use the '1' define for testing
#if defined(RETRON77) #if defined(RETRON77)
// #if 1 #include "R77HelpDialog.hxx"
#include "R77HelpDialog.hxx"
#else #else
#include "HelpDialog.hxx" #include "HelpDialog.hxx"
#endif #endif
namespace GUI { namespace GUI {
@ -77,7 +75,6 @@ class StellaSettingsDialog : public Dialog
PopUpWidget* myTVMode; PopUpWidget* myTVMode;
// TV scanline intensity // TV scanline intensity
StaticTextWidget* myTVScanlines;
SliderWidget* myTVScanIntense; SliderWidget* myTVScanIntense;
// TV phosphor effect // TV phosphor effect

8
src/libretro/FrameBufferLIBRETRO.hxx
View File

@ -124,6 +124,14 @@ class FrameBufferLIBRETRO : public FrameBuffer
*/ */
Int32 getCurrentDisplayIndex() override { return 0; } Int32 getCurrentDisplayIndex() override { return 0; }
/**
This method is called to query the current window position.
@param x The x-position retrieved
@param y The y-position retrieved
*/
void getCurrentWindowPos(int&, int&) override { }
/** /**
This method is called to change to the given video mode. This method is called to change to the given video mode.