COMMON: mpeg2 is now needed for EMI, zlib needed for GRIM engine. USE_SMUSH not used anymore

configure

@@ -84,7 +84,7 @@ add_engine myst3 "Myst 3" yes
 #
 # Default settings
 #
-#ResidualVM defaults: mpeg2=no, faad=no, opengles=no
+#ResidualVM defaults: mpeg2=auto, faad=no, opengles=no
 #mt32emu=no, translation=no
 #
 # Default lib behaviour yes/no/auto
@@ -99,7 +99,7 @@ _timidity=auto
 _zlib=auto
 _sparkle=auto
 _png=no
-_mpeg2=yes
+_mpeg2=auto
 _theoradec=auto
 _faad=no
 _fluidsynth=auto
@@ -122,7 +122,6 @@ _build_hq_scalers=yes
 _enable_prof=no
 _global_constructors=no
 _bink=yes
-_smush=yes
 # Default vkeybd/keymapper options
 _vkeybd=no
 _keymapper=no
@@ -796,7 +795,7 @@ Optional Libraries:
   --disable-zlib           disable zlib (compression) support [autodetect]
 
   --with-mpeg2-prefix=DIR  Prefix where libmpeg2 is installed (optional)
-  --enable-mpeg2           enable mpeg2 codec for cutscenes [no]
+  --disable-mpeg2          enable mpeg2 codec for cutscenes [autodetect]
 
   --disable-opengl         disable OpenGL (ES) support [autodetect]
 
@@ -869,7 +868,7 @@ for ac_option in $@; do
 	--disable-sparkle)        _sparkle=no     ;;
 	--enable-nasm)            _nasm=yes       ;;
 	--disable-nasm)           _nasm=no        ;;
-	--enable-mpeg2)           _mpeg2=yes      ;;
+	--disable-mpeg2)          _mpeg2=no       ;;
 	--disable-png)            _png=no         ;;
 	--enable-png)             _png=yes        ;;
 	--disable-theoradec)      _theoradec=no   ;;
@@ -3262,19 +3261,6 @@ fi
 define_in_config_if_yes "$_zlib" 'USE_ZLIB'
 echo "$_zlib"
 
-#
-# Check whether to activate SMUSH & Monkey4, based on zlib
-#
-if test ! "$_smush" = no && test ! "$_zlib" = yes; then
-	echo "...disabling SMUSH. zlib is required"
-	_smush=no
-fi
-
-if test `get_engine_build monkey4` = yes && test ! "$_zlib" = yes ; then
-	echo "...disabling Escape from Monkey Island. zlib is required"
-	engine_disable monkey4
-fi
-
 #
 # Check for Sparkle if updates support is enabled
 #
@@ -3579,11 +3565,6 @@ fi
 define_in_config_if_yes "$_opengl" "USE_OPENGL"
 define_in_config_if_yes "$_opengles" "USE_GLES"
 
-if test `get_engine_build myst3` = yes && test ! "$_opengl" = yes ; then
-	echo "...disabling Myst 3 engine. OpenGL is required"
-	engine_disable myst3
-fi
-
 #
 # Check for nasm
 #
@@ -3720,11 +3701,29 @@ else
 fi
 
 #
-# Check whether to build SMUSH video support
+# Check whether to activate engines
 #
-echo_n "Building SMUSH video support... "
-define_in_config_if_yes $_smush 'USE_SMUSH'
-echo "$_smush"
+if test `get_engine_build grim` = yes && test ! "$_zlib" = yes ; then
+	echo "...disabling Grim. zlib is required"
+	engine_disable grim
+	engine_disable monkey4
+fi
+
+if test `get_engine_build monkey4` = yes && test ! "$_mpeg2" = yes ; then
+	echo "...disabling Escape from Monkey Island. mpeg2dec is required"
+	engine_disable monkey4
+fi
+
+if test `get_engine_build monkey4` = yes && test ! "$_bink" = yes ; then
+	echo "...disabling Escape from Monkey Island. bink is required"
+	engine_disable monkey4
+fi
+
+if test `get_engine_build myst3` = yes && test ! "$_opengl" = yes ; then
+	echo "...disabling Myst 3 engine. OpenGL is required"
+	engine_disable myst3
+fi
+
 
 #
 # Figure out installation directories

devtools/create_project/create_project.cpp

@@ -848,7 +848,6 @@ const Feature s_features[] = {
 
 	// Feature flags
 	{        "bink",        "USE_BINK",         "", true, "Bink video support" },
-	{       "smush",       "USE_SMUSH",         "", true, "Smush video support" },
 	{     "scalers",     "USE_SCALERS",         "", true, "Scalers" },
 	{   "hqscalers",  "USE_HQ_SCALERS",         "", true, "HQ scalers" },
 	{       "16bit",   "USE_RGB_COLOR",         "", true, "16bit color support" },

engines/grim/movie/codecs/smush_decoder.cpp

@@ -37,8 +37,6 @@
 #include "engines/grim/movie/codecs/blocky16.h"
 #include "engines/grim/movie/codecs/smush_decoder.h"
 
-#ifdef USE_SMUSH
-
 namespace Grim {
 
 // Prototypes to avoid depending on grim.h
@@ -570,5 +568,3 @@ uint32 SmushDecoder::getTimeToNextFrame() const {
 }
 
 } // end of namespace Grim
-
-#endif // USE_SMUSH

engines/grim/movie/codecs/smush_decoder.h

@@ -31,8 +31,6 @@
 
 #include "graphics/surface.h"
 
-#ifdef USE_SMUSH
-
 namespace Audio {
 	class QueuingAudioStream;
 }
@@ -117,6 +115,4 @@ protected:
 
 } // end of namespace Grim
 
-#endif // USE_SMUSH
-
 #endif

engines/grim/movie/movie.cpp

@@ -205,11 +205,11 @@ void MoviePlayer::restoreState(SaveGame *state) {
 	state->endSection();
 }
 
-#if !defined(USE_MPEG2) || !defined(USE_SMUSH) || !defined(USE_BINK)
+#if !defined(USE_MPEG2) || !defined(USE_BINK)
 #define NEED_NULLPLAYER
 #endif
 
-// Fallback for when USE_MPEG2 / USE_BINK / USE_SMUSH isnt defined
+// Fallback for when USE_MPEG2 / USE_BINK isnt defined
 
 #ifdef NEED_NULLPLAYER
 class NullPlayer : public MoviePlayer {
@@ -240,12 +240,6 @@ MoviePlayer *CreateMpegPlayer() {
 }
 #endif
 
-#ifndef USE_SMUSH
-MoviePlayer *CreateSmushPlayer(bool demo) {
-	return new NullPlayer("SMUSH");
-}
-#endif
-
 #ifndef USE_BINK
 MoviePlayer *CreateBinkPlayer(bool demo) {
 	return new NullPlayer("BINK");

engines/grim/movie/smush.cpp

@@ -27,8 +27,6 @@
 #include "engines/grim/resource.h"
 #include "engines/grim/grim.h"
 
-#ifdef USE_SMUSH
-
 namespace Grim {
 
 MoviePlayer *CreateSmushPlayer(bool demo) {
@@ -91,5 +89,3 @@ void SmushPlayer::restoreState(SaveGame *state) {
 }
 
 } // end of namespace Grim
-
-#endif // USE_SMUSH

engines/grim/movie/smush.h

@@ -25,8 +25,6 @@
 
 #include "engines/grim/movie/movie.h"
 
-#ifdef USE_SMUSH
-
 namespace Grim {
 
 class SmushDecoder;
@@ -47,6 +45,4 @@ private:
 
 } // end of namespace Grim
 
-#endif // USE_SMUSH
-
 #endif