diff --git a/Changes.txt b/Changes.txt index 154bb8440..27ba6e9c1 100644 --- a/Changes.txt +++ b/Changes.txt @@ -37,7 +37,7 @@ are no longer corrupted/cut off. This includes properly supporting the 2600-daptor II, which is flashable to an AVox-USB converter. - * The serial port to use for an AtariVox-USB adaptor is now autodetected. + * Added auto-detection of the serial port used for an AtariVox-USB adaptor. * Added QuadTari controller support. @@ -51,11 +51,14 @@ * Added another oddball TIA glitch option for delayed background color. + * Added option to disable all scaling and postprocessing. + * Replaced "Re-disassemble" with "Disassemble @ current line" in debugger. * Fixed bug when taking fullscreen snapshots; the dimensions were sometimes cut off. + -Have fun! diff --git a/docs/index.html b/docs/index.html index b8ead55cb..e5b9be777 100644 --- a/docs/index.html +++ b/docs/index.html @@ -2182,97 +2182,97 @@ shown. - - 
-audio.enabled <1|0>
- Enable or disable sound generation. - + + 
-audio.enabled <1|0>
+ Enable or disable sound generation. + - - 
-audio.volume <0 - 100>
- Set the volume. - + + 
-audio.volume <0 - 100>
+ Set the volume. + - - 
-audio.device <number>
- Set the audio device (0 = default). - + + 
-audio.device <number>
+ Set the audio device (0 = default). + - - 
-audio.preset <1 - 5>
- Set an audio preset. Numbers in sequence represent presets for - 'custom', 'low quality, medium lag', 'high quality, medium lag', - 'high quality, low lag' and 'ultra quality, minimal lag'. - + + 
-audio.preset <1 - 5>
+ Set an audio preset. Numbers in sequence represent presets for + 'custom', 'low quality, medium lag', 'high quality, medium lag', + 'high quality, low lag' and 'ultra quality, minimal lag'. + - - 
-audio.fragment_size <128|256|512|1024|2048|4096>
- Set the number of samples in a single fragment processed by the audio driver. - + + 
-audio.fragment_size <128|256|512|1024|2048|4096>
+ Set the number of samples in a single fragment processed by the audio driver. + - - 
-audio.sample_rate <44100|48000|96000>
- Set sound sample output frequency. - + + 
-audio.sample_rate <44100|48000|96000>
+ Set sound sample output frequency. + - - 
-audio.resampling_quality <1|2|3>
- Set resampling quality to low (1), high (2) or ultra (3). - + + 
-audio.resampling_quality <1|2|3>
+ Set resampling quality to low (1), high (2) or ultra (3). + - - 
-audio.headroom <0 - 20>
- Set number of additional half-frames to prebuffer. - + + 
-audio.headroom <0 - 20>
+ Set number of additional half-frames to prebuffer. + - - 
-audio.buffer_size <0 - 20>
- Set maximum number of additional half-frames to buffer. - + + 
-audio.buffer_size <0 - 20>
+ Set maximum number of additional half-frames to buffer. + - - 
-audio.stereo <1|0>
- Enable or disable stereo mode for all ROMs. - + + 
-audio.stereo <1|0>
+ Enable or disable stereo mode for all ROMs. + - - 
-audio.dpc_pitch <10000 - 30000>
- Set the pitch of Pitfall II music. - + + 
-audio.dpc_pitch <10000 - 30000>
+ Set the pitch of Pitfall II music. + - - 
-tia.zoom <zoom>
- Use the specified zoom level (integer) while in TIA/emulation mode. - - + + 
-tia.zoom <zoom>
+ Use the specified zoom level (integer) while in TIA/emulation mode. + + - - 
-tia.vsizeadjust <-5 - 5>
- Adjust the display height of the TIA image - - + + 
-tia.vsizeadjust <-5 - 5>
+ Adjust the display height of the TIA image + + - - 
-tia.inter <1|0>
- Use interpolation for the TIA image (results in blending/smoothing - of the image). - + + 
-tia.inter <1|0>
+ Use interpolation for the TIA image (results in blending/smoothing + of the image). + - - 
-tia.fs_stretch <1|0>
- Stretch TIA image completely while in fullscreen mode, vs. keeping the correct - aspect ratio. - + + 
-tia.fs_stretch <1|0>
+ Stretch TIA image completely while in fullscreen mode, vs. keeping the correct + aspect ratio. + - - 
-tia.fs_refresh <1|0>
- While in fullscreen mode, adapt the display's refresh rate to the game's frame rate - to minimize judder.
- Note: Not available for macOS. - + + 
-tia.fs_refresh <1|0>
+ While in fullscreen mode, adapt the display's refresh rate to the game's frame rate + to minimize judder.
+ Note: Not available for macOS. + - - 
-tia.fs_overscan <0 - 10>
- Add overscan to TIA image while in fullscreen mode + + 
-tia.fs_overscan <0 - 10>
+ Add overscan to TIA image while in fullscreen mode @@ -2284,6 +2284,11 @@ + + 
-tia.plain_video <1|0>
+ Disable all scaling and postprocessing. + + 
-tv.filter <0 - 5>
Blargg TV effects, 0 is disabled, next numbers in diff --git a/src/emucore/Console.cxx b/src/emucore/Console.cxx index 04040c597..3ae8c203e 100644 --- a/src/emucore/Console.cxx +++ b/src/emucore/Console.cxx @@ -623,7 +623,7 @@ FBInitStatus Console::initializeVideo(bool full) if(full) { uInt32 width, height; - if (myOSystem.settings().getBool("plain-video")) { + if (myOSystem.settings().getBool("tia.plain_video")) { width = 2 * myTIA->width(); height = myTIA->height(); } else { diff --git a/src/emucore/Settings.cxx b/src/emucore/Settings.cxx index 595ab35ec..f3f1ef61b 100644 --- a/src/emucore/Settings.cxx +++ b/src/emucore/Settings.cxx @@ -48,7 +48,6 @@ Settings::Settings() setPermanent("windowedpos", Common::Point(50, 50)); setPermanent("display", 0); setPermanent("uimessages", "true"); - setTemporary("plain-video", "false"); // TIA specific options setPermanent("tia.inter", "false"); setPermanent("tia.zoom", "3"); @@ -58,6 +57,7 @@ Settings::Settings() setPermanent("tia.fs_overscan", "0"); setPermanent("tia.vsizeadjust", 0); setPermanent("tia.dbgcolors", "roygpb"); + setTemporary("tia.plain_video", "false"); // Palette options setPermanent("palette", PaletteHandler::SETTING_STANDARD); setPermanent("pal.phase_ntsc", "26.2"); @@ -418,7 +418,6 @@ void Settings::usage() const << " -palette \n" - << " -plain-video <1|0> Disable all scaling and postprocessing\n" << " -pal.phase_ntsc Phase shift for NTSC 'custom' palette\n" << " -pal.phase_pal Phase shift for PAL 'custom' palette\n" << " -pal.hue <-1.0 - 1.0> Adjust hue for current palette\n" @@ -455,6 +454,7 @@ void Settings::usage() const << " -tia.fs_overscan <0-10> Add overscan to TIA image in fullscreen mode\n" << " -tia.dbgcolors Debug colors to use for each object (see manual\n" << " for description)\n" + << " -tia.plain_video <1|0> Disable all scaling and postprocessing\n" << endl << " -tv.filter <0-5> Set TV effects off (0) or to specified mode\n" << " (1-5)\n" diff --git a/src/emucore/TIASurface.cxx b/src/emucore/TIASurface.cxx index a6f11c956..a9cca5795 100644 --- a/src/emucore/TIASurface.cxx +++ b/src/emucore/TIASurface.cxx @@ -317,7 +317,7 @@ void TIASurface::enableNTSC(bool enable) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - string TIASurface::effectsInfo() const { - if (plainVideoEnabled()) return "plain video mode"; + if (plainVideoEnabled()) return "Plain video mode"; const FBSurface::Attributes& attr = mySLineSurface->attributes(); ostringstream buf; @@ -525,5 +525,5 @@ void TIASurface::updateSurfaceSettings() // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bool TIASurface::plainVideoEnabled() const { - return myOSystem.settings().getBool("plain-video"); + return myOSystem.settings().getBool("tia.plain_video"); }