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

Updated log functionality slightly; you no longer have to supply 

a new line as part of the message.

Updates for impending 3.7.5 release.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2572 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2012-12-22 20:17:33 +00:00
parent 2aca70e19e
commit ca0f20fdff
17 changed files with 78 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Announce.txt
View File

@ -9,7 +9,7 @@
SSSS ttt eeeee llll llll aaaaa
===========================================================================
Release 3.7.4 for Linux, MacOSX and Windows
Release 3.7.5 for Linux, MacOSX and Windows
===========================================================================
The Atari 2600 Video Computer System (VCS), introduced in 1977, was the
@ -21,28 +21,28 @@ all of your favourite Atari 2600 games again! Stella was originally
developed for Linux by Bradford W. Mott, however, it has been ported to a
number of other platforms and is currently maintained by Stephen Anthony.
This is the 3.7.4 release of Stella for Linux, Mac OSX and Windows. The
This is the 3.7.5 release of Stella for Linux, Mac OSX and Windows. The
distributions currently available are:
* Binaries for Windows XP/Vista/7 :
Stella-3.7.4-win32.exe (32-bit EXE installer)
Stella-3.7.4-x64.exe (64-bit EXE installer)
Stella-3.7.4-windows.zip (32/64 bit versions)
Stella-3.7.5-win32.exe (32-bit EXE installer)
Stella-3.7.5-x64.exe (64-bit EXE installer)
Stella-3.7.5-windows.zip (32/64 bit versions)
* Binary distribution for MacOS X 32-bit & 64-bit :
Stella-3.7.4-macosx.dmg (32-bit Universal Binary)
Stella-3.7.4_intel-macosx.dmg (32/64-bit Intel/OSX 10.6+)
Stella-3.7.5-macosx.dmg (32-bit Universal Binary)
Stella-3.7.5_intel-macosx.dmg (32/64-bit Intel/OSX 10.6+)
* Binary distribution in 32-bit & 64-bit Ubuntu DEB format :
stella_3.7.4-1_i386.deb
stella_3.7.4-1_amd64.deb
stella_3.7.5-1_i386.deb
stella_3.7.5-1_amd64.deb
* Binary distribution in 32-bit & 64-bit RPM format :
stella-3.7.4-2.i386.rpm
stella-3.7.4-2.x86_64.rpm
stella-3.7.5-2.i386.rpm
stella-3.7.5-2.x86_64.rpm
* Source code distribution for all platforms :
stella-3.7.4-src.tar.gz
stella-3.7.5-src.tar.gz
Distribution Site

2
Changes.txt
View File

@ -12,7 +12,7 @@
Release History
===========================================================================
3.7.4 to 3.8: (December xx, 2012)
3.7.4 to 3.7.5: (December 22, 2012)
* Improved regressions in PAL format autodetection, introduced in the
past several releases.

3
Readme.txt
View File

@ -1,4 +1,4 @@
This is release 3.7.4 of Stella. Stella is a multi-platform Atari 2600 VCS
This is release 3.7.5 of Stella. Stella is a multi-platform Atari 2600 VCS
emulator which allows you to play all of your favourite Atari 2600 games
on your PC. You'll find the Stella Users Manual in the docs subdirectory.
If you'd like to verify that you have the latest release of Stella visit
@ -9,4 +9,3 @@ the Stella Website at:
Enjoy,
The Stella Team
October 31, 2012

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
stella (3.7.5-1) stable; urgency=high
* Version 3.7.5 release
-- Stephen Anthony <stephena@users.sf.net> Sat, 22 Dec 2012 16:44:58 -0330
stella (3.7.4-1) stable; urgency=high
* Version 3.7.4 release

4
docs/index.html
View File

@ -10,7 +10,7 @@
<br><br>
<center><h2><b>A multi-platform Atari 2600 VCS emulator</b></h2></center>
<center><h4><b>Release 3.7.4</b></h4></center>
<center><h4><b>Release 3.7.5</b></h4></center>
<br><br>
<center><h2><b>User's Guide</b></h2></center>
@ -54,7 +54,7 @@
<br><br><br>
<center><b>February 1999 - October 2012</b></center>
<center><b>February 1999 - December 2012</b></center>
<center><b>The Stella Team</b></center>
<center><b><a href="http://stella.sourceforge.net">Stella Homepage</a></b></center>

2
src/common/FrameBufferSoft.cxx
View File

@ -57,7 +57,7 @@ bool FrameBufferSoft::initSubsystem(VideoMode& mode)
if(!myRectList)
{
myOSystem->logMessage("ERROR: Unable to get memory for SDL rects\n", 0);
myOSystem->logMessage("ERROR: Unable to get memory for SDL rects", 0);
return false;
}

2
src/common/SoundNull.cxx
View File

@ -27,7 +27,7 @@
SoundNull::SoundNull(OSystem* osystem)
: Sound(osystem)
{
myOSystem->logMessage("Sound disabled.\n\n", 1);
myOSystem->logMessage("Sound disabled.\n", 1);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

18
src/common/SoundSDL.cxx
View File

@ -43,7 +43,7 @@ SoundSDL::SoundSDL(OSystem* osystem)
myIsMuted(true),
myVolume(100)
{
myOSystem->logMessage("SoundSDL::SoundSDL started ...\n", 2);
myOSystem->logMessage("SoundSDL::SoundSDL started ...", 2);
// The sound system is opened only once per program run, to eliminate
// issues with opening and closing it multiple times
@ -87,7 +87,7 @@ SoundSDL::SoundSDL(OSystem* osystem)
myIsInitializedFlag = true;
SDL_PauseAudio(1);
myOSystem->logMessage("SoundSDL::SoundSDL initialized\n", 2);
myOSystem->logMessage("SoundSDL::SoundSDL initialized", 2);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -100,7 +100,7 @@ SoundSDL::~SoundSDL()
myIsEnabled = myIsInitializedFlag = false;
}
myOSystem->logMessage("SoundSDL destroyed\n", 2);
myOSystem->logMessage("SoundSDL destroyed", 2);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -108,19 +108,19 @@ void SoundSDL::setEnabled(bool state)
{
myOSystem->settings().setBool("sound", state);
myOSystem->logMessage(state ? "SoundSDL::setEnabled(true)\n" :
"SoundSDL::setEnabled(false)\n", 2);
myOSystem->logMessage(state ? "SoundSDL::setEnabled(true)" :
"SoundSDL::setEnabled(false)", 2);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void SoundSDL::open()
{
myOSystem->logMessage("SoundSDL::open started ...\n", 2);
myOSystem->logMessage("SoundSDL::open started ...", 2);
myIsEnabled = false;
mute(true);
if(!myIsInitializedFlag || !myOSystem->settings().getBool("sound"))
{
myOSystem->logMessage("Sound disabled\n\n", 1);
myOSystem->logMessage("Sound disabled\n", 1);
return;
}
@ -156,7 +156,7 @@ void SoundSDL::open()
myIsEnabled = true;
mute(false);
myOSystem->logMessage("SoundSDL::open finished\n", 2);
myOSystem->logMessage("SoundSDL::open finished", 2);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -169,7 +169,7 @@ void SoundSDL::close()
myLastRegisterSetCycle = 0;
myTIASound.reset();
myRegWriteQueue.clear();
myOSystem->logMessage("SoundSDL::close\n", 2);
myOSystem->logMessage("SoundSDL::close", 2);
}
}

36
src/common/mainSDL.cxx
View File

@ -44,9 +44,6 @@
extern "C" {
int stellaMain(int argc, char* argv[]);
}
#elif defined(GP2X)
#include "SettingsGP2X.hxx"
#include "OSystemGP2X.hxx"
#else
#error Unsupported platform!
#endif
@ -65,7 +62,7 @@ OSystem* theOSystem = (OSystem*) NULL;
// Does general Cleanup in case any operation failed (or at end of program)
int Cleanup()
{
theOSystem->logMessage("Cleanup from mainSDL\n", 2);
theOSystem->logMessage("Cleanup from mainSDL", 2);
theOSystem->saveConfig();
if(theOSystem)
@ -97,31 +94,28 @@ int main(int argc, char* argv[])
#elif defined(MAC_OSX)
theOSystem = new OSystemMACOSX();
SettingsMACOSX settings(theOSystem);
#elif defined(GP2X)
theOSystem = new OSystemGP2X();
SettingsGP2X settings(theOSystem);
#else
#error Unsupported platform!
#endif
theOSystem->loadConfig();
theOSystem->logMessage("Loading config options ...\n", 2);
theOSystem->logMessage("Loading config options ...", 2);
// Take care of commandline arguments
theOSystem->logMessage("Loading commandline arguments ...\n", 2);
theOSystem->logMessage("Loading commandline arguments ...", 2);
string romfile = theOSystem->settings().loadCommandLine(argc, argv);
// Finally, make sure the settings are valid
// We do it once here, so the rest of the program can assume valid settings
theOSystem->logMessage("Validating config options ...\n", 2);
theOSystem->logMessage("Validating config options ...", 2);
theOSystem->settings().validate();
// Create the full OSystem after the settings, since settings are
// probably needed for defaults
theOSystem->logMessage("Creating the OSystem ...\n", 2);
theOSystem->logMessage("Creating the OSystem ...", 2);
if(!theOSystem->create())
{
theOSystem->logMessage("ERROR: Couldn't create OSystem\n", 0);
theOSystem->logMessage("ERROR: Couldn't create OSystem", 0);
return Cleanup();
}
@ -130,24 +124,24 @@ int main(int argc, char* argv[])
// If so, show the information and immediately exit
if(theOSystem->settings().getBool("listrominfo"))
{
theOSystem->logMessage("Showing output from 'listrominfo' ...\n", 2);
theOSystem->logMessage("Showing output from 'listrominfo' ...", 2);
theOSystem->propSet().print();
return Cleanup();
}
else if(theOSystem->settings().getBool("rominfo"))
{
theOSystem->logMessage("Showing output from 'rominfo' ...\n", 2);
theOSystem->logMessage("Showing output from 'rominfo' ...", 2);
FilesystemNode romnode(romfile);
if(argc > 1 && romnode.exists() && romnode.isFile())
theOSystem->logMessage(theOSystem->getROMInfo(romfile), 0);
else
theOSystem->logMessage("ERROR: ROM doesn't exist\n", 0);
theOSystem->logMessage("ERROR: ROM doesn't exist", 0);
return Cleanup();
}
else if(theOSystem->settings().getBool("help"))
{
theOSystem->logMessage("Displaying usage\n", 2);
theOSystem->logMessage("Displaying usage", 2);
theOSystem->settings().usage();
return Cleanup();
}
@ -171,12 +165,12 @@ int main(int argc, char* argv[])
FilesystemNode romnode(romfile);
if(romfile == "" || romnode.isDirectory())
{
theOSystem->logMessage("Attempting to use ROM launcher ...\n", 2);
theOSystem->logMessage("Attempting to use ROM launcher ...", 2);
bool launcherOpened = romfile != "" ?
theOSystem->createLauncher(romnode.getPath()) : theOSystem->createLauncher();
if(!launcherOpened)
{
theOSystem->logMessage("Launcher could not be started, showing usage\n", 2);
theOSystem->logMessage("Launcher could not be started, showing usage", 2);
theOSystem->settings().usage();
return Cleanup();
}
@ -185,7 +179,7 @@ int main(int argc, char* argv[])
{
if(theOSystem->settings().getBool("takesnapshot"))
{
theOSystem->logMessage("Taking snapshots with 'takesnapshot' ...\n", 2);
theOSystem->logMessage("Taking snapshots with 'takesnapshot' ...", 2);
for(int i = 0; i < 30; ++i) theOSystem->frameBuffer().update();
theOSystem->eventHandler().takeSnapshot();
return Cleanup();
@ -216,9 +210,9 @@ int main(int argc, char* argv[])
while(SDL_PollEvent(&event)) /* swallow event */ ;
// Start the main loop, and don't exit until the user issues a QUIT command
theOSystem->logMessage("Starting main loop ...\n", 2);
theOSystem->logMessage("Starting main loop ...", 2);
theOSystem->mainLoop();
theOSystem->logMessage("Finished main loop ...\n", 2);
theOSystem->logMessage("Finished main loop ...", 2);
// Cleanup time ...
return Cleanup();

4
src/emucore/EventHandler.cxx
View File

@ -136,7 +136,7 @@ void EventHandler::setupJoysticks()
// Initialize the joystick subsystem
if((SDL_InitSubSystem(SDL_INIT_JOYSTICK) == -1) || (SDL_NumJoysticks() <= 0))
{
myOSystem->logMessage("No joysticks present.\n\n", 1);
myOSystem->logMessage("No joysticks present.", 1);
return;
}
@ -220,7 +220,7 @@ void EventHandler::setupJoysticks()
buf << " " << i << ": " << myJoysticks[i].about() << endl << endl;
myOSystem->logMessage(buf.str(), 1);
#else
myOSystem->logMessage("No joysticks present.\n\n", 1);
myOSystem->logMessage("No joysticks present.", 1);
#endif
}

8
src/emucore/FrameBuffer.cxx
View File

@ -158,7 +158,7 @@ FBInitStatus FrameBuffer::initialize(const string& title,
}
else
{
myOSystem->logMessage("ERROR: Couldn't initialize video subsystem\n", 0);
myOSystem->logMessage("ERROR: Couldn't initialize video subsystem", 0);
return kFailNotSupported;
}
}
@ -187,7 +187,7 @@ FBInitStatus FrameBuffer::initialize(const string& title,
// Finally, show some information about the framebuffer,
// but only on the first initialization
if(myInitializedCount == 1)
myOSystem->logMessage(about() + "\n", 1);
myOSystem->logMessage(about(), 1);
return kSuccess;
}
@ -873,7 +873,7 @@ void FrameBuffer::setWindowIcon()
sscanf(stella_icon[0], "%u %u %u %u", &w, &h, &ncols, &nbytes);
if((w != 32) || (h != 32) || (ncols > 255) || (nbytes > 1))
{
myOSystem->logMessage("ERROR: Couldn't load the application icon.\n", 0);
myOSystem->logMessage("ERROR: Couldn't load the application icon.", 0);
return;
}
@ -895,7 +895,7 @@ void FrameBuffer::setWindowIcon()
}
else
{
myOSystem->logMessage("ERROR: Couldn't load the application icon.\n", 0);
myOSystem->logMessage("ERROR: Couldn't load the application icon.", 0);
return;
}
rgba[code] = col;

21
src/emucore/OSystem.cxx
View File

@ -212,8 +212,7 @@ bool OSystem::create()
<< "Configuration file: '"
<< FilesystemNode(myConfigFile).getRelativePath() << "'" << endl
<< "User game properties: '"
<< FilesystemNode(myPropertiesFile).getRelativePath() << "'" << endl
<< endl;
<< FilesystemNode(myPropertiesFile).getRelativePath() << "'" << endl;
logMessage(buf.str(), 1);
// Get relevant information about the video hardware
@ -448,7 +447,7 @@ FBInitStatus OSystem::createFrameBuffer()
#endif
default: // Should never happen
logMessage("ERROR: Unknown emulation state in createFrameBuffer()\n", 0);
logMessage("ERROR: Unknown emulation state in createFrameBuffer()", 0);
break;
}
@ -472,7 +471,7 @@ fallback:
if(fbstatus == kFailNotSupported && myFrameBuffer &&
myFrameBuffer->type() == kDoubleBuffer)
{
logMessage("ERROR: OpenGL mode failed, fallback to software\n", 0);
logMessage("ERROR: OpenGL mode failed, fallback to software", 0);
delete myFrameBuffer; myFrameBuffer = NULL;
mySettings->setString("video", "soft");
FBInitStatus newstatus = createFrameBuffer();
@ -514,7 +513,7 @@ bool OSystem::createConsole(const string& romfile, const string& md5sum)
showmessage = true; // we show a message if a ROM is being reloaded
if(myRomFile == "")
{
logMessage("ERROR: Rom file not specified ...\n", 0);
logMessage("ERROR: Rom file not specified ...", 0);
return false;
}
}
@ -551,7 +550,7 @@ bool OSystem::createConsole(const string& romfile, const string& md5sum)
myEventHandler->setMouseControllerMode(mySettings->getBool("usemouse"));
if(createFrameBuffer() != kSuccess) // Takes care of initializeVideo()
{
logMessage("ERROR: Couldn't create framebuffer for console\n", 0);
logMessage("ERROR: Couldn't create framebuffer for console", 0);
myEventHandler->reset(EventHandler::S_LAUNCHER);
return false;
}
@ -634,7 +633,7 @@ bool OSystem::createLauncher(const string& startdir)
status = true;
}
else
logMessage("ERROR: Couldn't create launcher\n", 0);
logMessage("ERROR: Couldn't create launcher", 0);
myLauncherUsed = myLauncherUsed || status;
return status;
@ -675,14 +674,14 @@ void OSystem::logMessage(const string& message, uInt8 level)
{
if(level == 0)
{
cout << message << flush;
myLogMessages += message;
cout << message << endl << flush;
myLogMessages += message + "\n";
}
else if(level <= (uInt8)mySettings->getInt("loglevel"))
{
if(mySettings->getBool("logtoconsole"))
cout << message << flush;
myLogMessages += message;
cout << message << endl << flush;
myLogMessages += message + "\n";
}
}

3
src/emucore/OSystem.hxx
View File

@ -416,7 +416,8 @@ class OSystem
void quit() { myQuitLoop = true; }
/**
Append a message to the internal log.
Append a message to the internal log
(a newline is automatically added).
@param message The message to be appended
@param level If 0, always output the message, only append when

4
src/emucore/Settings.cxx
View File

@ -162,7 +162,7 @@ void Settings::loadConfig()
ifstream in(myOSystem->configFile().c_str());
if(!in || !in.is_open())
{
myOSystem->logMessage("ERROR: Couldn't load settings file\n", 0);
myOSystem->logMessage("ERROR: Couldn't load settings file", 0);
return;
}
@ -491,7 +491,7 @@ void Settings::saveConfig()
ofstream out(myOSystem->configFile().c_str());
if(!out || !out.is_open())
{
myOSystem->logMessage("ERROR: Couldn't save settings file\n", 0);
myOSystem->logMessage("ERROR: Couldn't save settings file", 0);
return;
}

2
src/macosx/Info-Stella.plist
View File

@ -53,7 +53,7 @@
<key>CFBundleSignature</key>
<string>StLa</string>
<key>CFBundleVersion</key>
<string>3.7.4</string>
<string>3.7.5</string>
<key>NSMainNibFile</key>
<string>SDLMain.nib</string>
<key>NSPrincipalClass</key>

5
src/unix/stella.spec
View File

@ -1,5 +1,5 @@
%define name stella
%define version 3.7.4
%define version 3.7.5
%define rel 1
%define enable_gl 1
@ -108,6 +108,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
%_datadir/icons/large/%{name}.png
%changelog
* Sat Dec 22 2012 Stephen Anthony <stephena@users.sf.net> 3.7.5-1
- Version 3.7.5 release
* Wed Oct 31 2012 Stephen Anthony <stephena@users.sf.net> 3.7.4-1
- Version 3.7.4 release

8
src/win32/stella.rc
View File

@ -36,8 +36,8 @@ IDI_ICON ICON "stella.ico"
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,7,4,0
PRODUCTVERSION 3,7,4,0
FILEVERSION 3,7,5,0
PRODUCTVERSION 3,7,5,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -55,12 +55,12 @@ BEGIN
VALUE "Comments", "The multi-platform Atari 2600 emulator. Stella is released under the GPLv2."
VALUE "CompanyName", "The Stella Team (http://stella.sourceforge.net)"
VALUE "FileDescription", "Stella"
VALUE "FileVersion", "3.7.4"
VALUE "FileVersion", "3.7.5"
VALUE "InternalName", "Stella"
VALUE "LegalCopyright", "Copyright (C) 1995-2012 The Stella Team"
VALUE "OriginalFilename", "Stella.exe"
VALUE "ProductName", "Stella"
VALUE "ProductVersion", "3.7.4"
VALUE "ProductVersion", "3.7.5"
END
END
BLOCK "VarFileInfo"