added doc for plain video mode

renamed plain video mode option
This commit is contained in:
thrust26 2020-10-05 14:26:11 +02:00
parent e2d8d7e23e
commit 60bffab65d
5 changed files with 89 additions and 81 deletions

View File

@ -37,7 +37,7 @@
are no longer corrupted/cut off. This includes properly supporting the are no longer corrupted/cut off. This includes properly supporting the
2600-daptor II, which is flashable to an AVox-USB converter. 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. * Added QuadTari controller support.
@ -51,11 +51,14 @@
* Added another oddball TIA glitch option for delayed background color. * 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. * Replaced "Re-disassemble" with "Disassemble @ current line" in debugger.
* Fixed bug when taking fullscreen snapshots; the dimensions were * Fixed bug when taking fullscreen snapshots; the dimensions were
sometimes cut off. sometimes cut off.
-Have fun! -Have fun!

View File

@ -2182,97 +2182,97 @@
shown.</td> shown.</td>
</tr> </tr>
<tr> <tr>
<td><pre>-audio.enabled &lt;1|0&gt;</pre></td> <td><pre>-audio.enabled &lt;1|0&gt;</pre></td>
<td>Enable or disable sound generation.</td> <td>Enable or disable sound generation.</td>
</tr> </tr>
<tr> <tr>
<td><pre>-audio.volume &lt;0 - 100&gt;</pre></td> <td><pre>-audio.volume &lt;0 - 100&gt;</pre></td>
<td>Set the volume.</td> <td>Set the volume.</td>
</tr> </tr>
<tr> <tr>
<td><pre>-audio.device &lt;number&gt;</pre></td> <td><pre>-audio.device &lt;number&gt;</pre></td>
<td>Set the audio device (0 = default).</td> <td>Set the audio device (0 = default).</td>
</tr> </tr>
<tr> <tr>
<td><pre>-audio.preset &lt;1 - 5&gt;</pre></td> <td><pre>-audio.preset &lt;1 - 5&gt;</pre></td>
<td>Set an audio preset. Numbers in sequence represent presets for <td>Set an audio preset. Numbers in sequence represent presets for
'custom', 'low quality, medium lag', 'high quality, medium lag', 'custom', 'low quality, medium lag', 'high quality, medium lag',
'high quality, low lag' and 'ultra quality, minimal lag'.</td> 'high quality, low lag' and 'ultra quality, minimal lag'.</td>
</tr> </tr>
<tr> <tr>
<td><pre>-audio.fragment_size &lt;128|256|512|1024|2048|4096&gt;</pre></td> <td><pre>-audio.fragment_size &lt;128|256|512|1024|2048|4096&gt;</pre></td>
<td>Set the number of samples in a single fragment processed by the audio driver.</td> <td>Set the number of samples in a single fragment processed by the audio driver.</td>
</tr> </tr>
<tr> <tr>
<td><pre>-audio.sample_rate &lt;44100|48000|96000&gt;</pre></td> <td><pre>-audio.sample_rate &lt;44100|48000|96000&gt;</pre></td>
<td>Set sound sample output frequency.</td> <td>Set sound sample output frequency.</td>
</tr> </tr>
<tr> <tr>
<td><pre>-audio.resampling_quality &lt;1|2|3&gt;</pre></td> <td><pre>-audio.resampling_quality &lt;1|2|3&gt;</pre></td>
<td>Set resampling quality to low (1), high (2) or ultra (3).</td> <td>Set resampling quality to low (1), high (2) or ultra (3).</td>
</tr> </tr>
<tr> <tr>
<td><pre>-audio.headroom &lt;0 - 20&gt;</pre></td> <td><pre>-audio.headroom &lt;0 - 20&gt;</pre></td>
<td>Set number of additional half-frames to prebuffer.</td> <td>Set number of additional half-frames to prebuffer.</td>
</tr> </tr>
<tr> <tr>
<td><pre>-audio.buffer_size &lt;0 - 20&gt;</pre></td> <td><pre>-audio.buffer_size &lt;0 - 20&gt;</pre></td>
<td>Set maximum number of additional half-frames to buffer.</td> <td>Set maximum number of additional half-frames to buffer.</td>
</tr> </tr>
<tr> <tr>
<td><pre>-audio.stereo &lt;1|0&gt;</pre></td> <td><pre>-audio.stereo &lt;1|0&gt;</pre></td>
<td>Enable or disable stereo mode for all ROMs.</td> <td>Enable or disable stereo mode for all ROMs.</td>
</tr> </tr>
<tr> <tr>
<td><pre>-audio.dpc_pitch &lt;10000 - 30000&gt;</pre></td> <td><pre>-audio.dpc_pitch &lt;10000 - 30000&gt;</pre></td>
<td>Set the pitch of Pitfall II music.</td> <td>Set the pitch of Pitfall II music.</td>
</tr> </tr>
<tr> <tr>
<td><pre>-tia.zoom &lt;zoom&gt;</pre></td> <td><pre>-tia.zoom &lt;zoom&gt;</pre></td>
<td>Use the specified zoom level (integer) while in TIA/emulation mode. <td>Use the specified zoom level (integer) while in TIA/emulation mode.
</td> </td>
</tr> </tr>
<tr> <tr>
<td><pre>-tia.vsizeadjust &lt;-5 - 5&gt;</pre></td> <td><pre>-tia.vsizeadjust &lt;-5 - 5&gt;</pre></td>
<td>Adjust the display height of the TIA image <td>Adjust the display height of the TIA image
</td> </td>
</tr> </tr>
<tr> <tr>
<td><pre>-tia.inter &lt;1|0&gt;</pre></td> <td><pre>-tia.inter &lt;1|0&gt;</pre></td>
<td>Use interpolation for the TIA image (results in blending/smoothing <td>Use interpolation for the TIA image (results in blending/smoothing
of the image).</td> of the image).</td>
</tr> </tr>
<tr> <tr>
<td><pre>-tia.fs_stretch &lt;1|0&gt;</pre></td> <td><pre>-tia.fs_stretch &lt;1|0&gt;</pre></td>
<td>Stretch TIA image completely while in fullscreen mode, vs. keeping the correct <td>Stretch TIA image completely while in fullscreen mode, vs. keeping the correct
aspect ratio.</td> aspect ratio.</td>
</tr> </tr>
<tr> <tr>
<td><pre>-tia.fs_refresh &lt;1|0&gt;</pre></td> <td><pre>-tia.fs_refresh &lt;1|0&gt;</pre></td>
<td>While in fullscreen mode, adapt the display's refresh rate to the game's frame rate <td>While in fullscreen mode, adapt the display's refresh rate to the game's frame rate
to minimize judder.</br> to minimize judder.</br>
Note: Not available for macOS.</td> Note: Not available for macOS.</td>
</tr> </tr>
<tr> <tr>
<td><pre>-tia.fs_overscan &lt;0 - 10&gt;</pre></td> <td><pre>-tia.fs_overscan &lt;0 - 10&gt;</pre></td>
<td>Add overscan to TIA image while in fullscreen mode</td> <td>Add overscan to TIA image while in fullscreen mode</td>
</tr> </tr>
<tr> <tr>
@ -2284,6 +2284,11 @@
</td> </td>
</tr> </tr>
<tr>
<td><pre>-tia.plain_video &lt;1|0&gt;</pre></td>
<td>Disable all scaling and postprocessing.</td>
</tr>
<tr> <tr>
<td><pre>-tv.filter &lt;0 - 5&gt;</pre></td> <td><pre>-tv.filter &lt;0 - 5&gt;</pre></td>
<td>Blargg TV effects, 0 is disabled, next numbers in <td>Blargg TV effects, 0 is disabled, next numbers in

View File

@ -623,7 +623,7 @@ FBInitStatus Console::initializeVideo(bool full)
if(full) if(full)
{ {
uInt32 width, height; uInt32 width, height;
if (myOSystem.settings().getBool("plain-video")) { if (myOSystem.settings().getBool("tia.plain_video")) {
width = 2 * myTIA->width(); width = 2 * myTIA->width();
height = myTIA->height(); height = myTIA->height();
} else { } else {

View File

@ -48,7 +48,6 @@ Settings::Settings()
setPermanent("windowedpos", Common::Point(50, 50)); setPermanent("windowedpos", Common::Point(50, 50));
setPermanent("display", 0); setPermanent("display", 0);
setPermanent("uimessages", "true"); setPermanent("uimessages", "true");
setTemporary("plain-video", "false");
// TIA specific options // TIA specific options
setPermanent("tia.inter", "false"); setPermanent("tia.inter", "false");
setPermanent("tia.zoom", "3"); setPermanent("tia.zoom", "3");
@ -58,6 +57,7 @@ Settings::Settings()
setPermanent("tia.fs_overscan", "0"); setPermanent("tia.fs_overscan", "0");
setPermanent("tia.vsizeadjust", 0); setPermanent("tia.vsizeadjust", 0);
setPermanent("tia.dbgcolors", "roygpb"); setPermanent("tia.dbgcolors", "roygpb");
setTemporary("tia.plain_video", "false");
// Palette options // Palette options
setPermanent("palette", PaletteHandler::SETTING_STANDARD); setPermanent("palette", PaletteHandler::SETTING_STANDARD);
setPermanent("pal.phase_ntsc", "26.2"); setPermanent("pal.phase_ntsc", "26.2");
@ -418,7 +418,6 @@ void Settings::usage() const
<< " -palette <standard| Use the specified color palette\n" << " -palette <standard| Use the specified color palette\n"
<< " z26|user|\n" << " z26|user|\n"
<< " custom>\n" << " custom>\n"
<< " -plain-video <1|0> Disable all scaling and postprocessing\n"
<< " -pal.phase_ntsc <number> Phase shift for NTSC 'custom' palette\n" << " -pal.phase_ntsc <number> Phase shift for NTSC 'custom' palette\n"
<< " -pal.phase_pal <number> Phase shift for PAL 'custom' palette\n" << " -pal.phase_pal <number> Phase shift for PAL 'custom' palette\n"
<< " -pal.hue <-1.0 - 1.0> Adjust hue for current 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.fs_overscan <0-10> Add overscan to TIA image in fullscreen mode\n"
<< " -tia.dbgcolors <string> Debug colors to use for each object (see manual\n" << " -tia.dbgcolors <string> Debug colors to use for each object (see manual\n"
<< " for description)\n" << " for description)\n"
<< " -tia.plain_video <1|0> Disable all scaling and postprocessing\n"
<< endl << endl
<< " -tv.filter <0-5> Set TV effects off (0) or to specified mode\n" << " -tv.filter <0-5> Set TV effects off (0) or to specified mode\n"
<< " (1-5)\n" << " (1-5)\n"

View File

@ -317,7 +317,7 @@ void TIASurface::enableNTSC(bool enable)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
string TIASurface::effectsInfo() const string TIASurface::effectsInfo() const
{ {
if (plainVideoEnabled()) return "plain video mode"; if (plainVideoEnabled()) return "Plain video mode";
const FBSurface::Attributes& attr = mySLineSurface->attributes(); const FBSurface::Attributes& attr = mySLineSurface->attributes();
ostringstream buf; ostringstream buf;
@ -525,5 +525,5 @@ void TIASurface::updateSurfaceSettings()
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool TIASurface::plainVideoEnabled() const { bool TIASurface::plainVideoEnabled() const {
return myOSystem.settings().getBool("plain-video"); return myOSystem.settings().getBool("tia.plain_video");
} }