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

Determining whether we're in NTSC or PAL mode wasn't working for 

detection of gl_aspectn vs. gl_aspectp.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1656 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2009-01-24 18:11:47 +00:00
parent 5f595b60de
commit 771108ad3b
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
stella/src/common/FrameBufferGL.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: FrameBufferGL.cxx,v 1.136 2009-01-24 17:32:29 stephena Exp $
// $Id: FrameBufferGL.cxx,v 1.137 2009-01-24 18:11:47 stephena Exp $
//============================================================================
#ifdef DISPLAY_OPENGL
@ -222,10 +222,10 @@ bool FrameBufferGL::setVidMode(VideoMode& mode)
if(!inUIMode)
{
// Aspect ratio (depends on whether NTSC or PAL is detected)
int aspect = myOSystem->settings().getInt(
myOSystem->console().getFramerate() > 55.0 ? "gl_aspectn" : "gl_aspectp");
if(aspect != 100)
mode.image_w = (uInt16)(float(mode.image_w * aspect) / 100.0);
const string& frate = myOSystem->console().about().InitialFrameRate;
int aspect =
myOSystem->settings().getInt(frate == "60" ? "gl_aspectn" : "gl_aspectp");
mode.image_w = (uInt16)(float(mode.image_w * aspect) / 100.0);
// Fullscreen mode stretching
if(fullScreen() && myOSystem->settings().getBool("gl_fsmax") &&

6
stella/src/emucore/Console.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: Console.cxx,v 1.154 2009-01-22 00:49:32 stephena Exp $
// $Id: Console.cxx,v 1.155 2009-01-24 18:11:47 stephena Exp $
//============================================================================
#include <cassert>
@ -152,12 +152,14 @@ Console::Console(OSystem* osystem, Cartridge* cart, const Properties& props)
myDisplayFormat == "SECAM60")
{
// Assume we've got ~262 scanlines (NTSC-like format)
myFramerate = 60.0;
myFramerate = 60.0;
myConsoleInfo.InitialFrameRate = "60";
}
else
{
// Assume we've got ~312 scanlines (PAL-like format)
myFramerate = 50.0;
myConsoleInfo.InitialFrameRate = "50";
if(myProperties.get(Display_Height) == "210")
myProperties.set(Display_Height, "250");

5
stella/src/emucore/Console.hxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: Console.hxx,v 1.72 2009-01-19 16:52:32 stephena Exp $
// $Id: Console.hxx,v 1.73 2009-01-24 18:11:47 stephena Exp $
//============================================================================
#ifndef CONSOLE_HXX
@ -46,13 +46,14 @@ struct ConsoleInfo
string Control0;
string Control1;
string DisplayFormat;
string InitialFrameRate;
};
/**
This class represents the entire game console.
@author Bradford W. Mott
@version $Id: Console.hxx,v 1.72 2009-01-19 16:52:32 stephena Exp $
@version $Id: Console.hxx,v 1.73 2009-01-24 18:11:47 stephena Exp $
*/
class Console : public Serializable
{