libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-16 06:39:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ZVISION: Disable MPEG movies when liba52 is not enabled

Browse Source
This commit is contained in:
Thierry Crozat 2018-10-31 21:37:56 +00:00
parent 71910c2283
commit e2935acfe4
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/zvision/scripting/actions.cpp
View File

@ -967,9 +967,9 @@ bool ActionStreamVideo::execute() {
bool subtitleExists = _engine->getSearchManager()->hasFile(subname);
bool switchToHires = false;
// NOTE: We only show the hires MPEG2 videos when libmpeg2 is compiled in,
// NOTE: We only show the hires MPEG2 videos when libmpeg2 and liba52 are compiled in,
// otherwise we fall back to the lowres ones
#ifdef USE_MPEG2
#if defined(USE_MPEG2) && defined(USE_A52)
Common::String hiresFileName = _fileName;
hiresFileName.setChar('d', hiresFileName.size() - 8);
hiresFileName.setChar('v', hiresFileName.size() - 3);

4
engines/zvision/video/video.cpp
View File

@ -23,7 +23,7 @@
#include "common/scummsys.h"
#include "common/system.h"
#include "video/video_decoder.h"
#ifdef USE_MPEG2
#if defined(USE_MPEG2) && defined(USE_A52)
#include "video/mpegps_decoder.h"
#endif
#include "engines/util.h"
@ -48,7 +48,7 @@ Video::VideoDecoder *ZVision::loadAnimation(const Common::String &fileName) {
animation = new RLFDecoder();
else if (tmpFileName.hasSuffix(".avi"))
animation = new ZorkAVIDecoder();
#ifdef USE_MPEG2
#if defined(USE_MPEG2) && defined(USE_A52)
else if (tmpFileName.hasSuffix(".vob"))
animation = new Video::MPEGPSDecoder();
#endif

7
engines/zvision/zvision.cpp
View File

@ -193,8 +193,11 @@ void ZVision::initialize() {
Graphics::ModeList modes;
modes.push_back(Graphics::Mode(WINDOW_WIDTH, WINDOW_HEIGHT));
#if defined(USE_MPEG2) && defined(USE_A52)
// For the DVD version of ZGI we can play high resolution videos
if (getGameId() == GID_GRANDINQUISITOR && (getFeatures() & GF_DVD))
modes.push_back(Graphics::Mode(HIRES_WINDOW_WIDTH, HIRES_WINDOW_HEIGHT));
#endif
initGraphicsModes(modes);
initScreen();
@ -225,8 +228,8 @@ void ZVision::initialize() {
loadSettings();
#ifndef USE_MPEG2
// libmpeg2 not loaded, disable the MPEG2 movies option
#if !defined(USE_MPEG2) || !defined(USE_A52)
// libmpeg2 or liba52 not loaded, disable the MPEG2 movies option
_scriptManager->setStateValue(StateKey_MPEGMovies, 2);
#endif