COMPOSER: Split detection features & adapt to new plugins.

configure

@@ -6162,7 +6162,7 @@ done
 
 declare -a static_detect_engines=("PLUMBERS" "AGI" "SCUMM" "SKY" "DREAMWEB" "DRASCULA" "LURE"
 								  "SWORD1" "SWORD2" "SWORD25" "ADL" "QUEEN" "CGE" "CGE2" "ACCESS"
-								  "ZVISION" "AGOS" "GOB")
+								  "ZVISION" "AGOS" "GOB" "COMPOSER")
 detectId="_DETECTION"
 
 echo "Creating engines/plugins_table.h"

engines/composer/composer.h

@@ -44,6 +44,7 @@
 
 #include "composer/resource.h"
 #include "composer/console.h"
+#include "composer/detection_enums.h"
 
 namespace Audio {
 	class QueuingAudioStream;
@@ -53,17 +54,6 @@ namespace Composer {
 
 struct ComposerGameDescription;
 
-enum GameType {
-	GType_ComposerV1,
-	GType_ComposerV2
-};
-
-enum GameFileTypes {
-	GAME_CONFIGFILE     = 1 << 0,    // Game configuration
-	GAME_SCRIPTFILE     = 1 << 1,    // Game script
-	GAME_EXECUTABLE     = 1 << 2     // Game executable
-};
-
 class Archive;
 struct Animation;
 class ComposerEngine;

engines/composer/detection.cpp

@@ -21,54 +21,10 @@
  */
 
 #include "base/plugins.h"
-#include "common/savefile.h"
-#include "common/serializer.h"
-#include "common/str-array.h"
 #include "engines/advancedDetector.h"
 
-#include "composer/composer.h"
-
-namespace Composer {
-
-struct ComposerGameDescription {
-	ADGameDescription desc;
-
-	int gameType;
-};
-
-int ComposerEngine::getGameType() const {
-	return _gameDescription->gameType;
-}
-
-const char *ComposerEngine::getGameId() const {
-	return _gameDescription->desc.gameId;
-}
-
-uint32 ComposerEngine::getFeatures() const {
-	return _gameDescription->desc.flags;
-}
-
-Common::Language ComposerEngine::getLanguage() const {
-	return _gameDescription->desc.language;
-}
-
-Common::Platform ComposerEngine::getPlatform() const {
-	return _gameDescription->desc.platform;
-}
-
-bool ComposerEngine::loadDetectedConfigFile(Common::INIFile &configFile) const {
-	const ADGameFileDescription *res = _gameDescription->desc.filesDescriptions;
-	while (res->fileName != NULL) {
-		if (res->fileType == GAME_CONFIGFILE) {
-			return configFile.loadFromFile(res->fileName);
-		}
-		res++;
-	}
-	// default config file name
-	return configFile.loadFromFile("book.ini") || configFile.loadFromFile("book.mac");
-}
-
-}
+#include "composer/detection_enums.h"
+#include "composer/detection.h"
 
 static const PlainGameDescriptor composerGames[] = {
 	{"babayaga", "Magic Tales: Baba Yaga and the Magic Geese"},
@@ -115,72 +71,6 @@ public:
 	const char *getOriginalCopyright() const override {
 		return "Copyright (C) 1995-1999 Animation Magic";
 	}
-
-	bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
-	bool hasFeature(MetaEngineFeature f) const override;
-	int getMaximumSaveSlot() const override;
-	SaveStateList listSaves(const char* target) const override;
 };
 
-bool ComposerMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
-	const Composer::ComposerGameDescription *gd = (const Composer::ComposerGameDescription *)desc;
-	if (gd) {
-		*engine = new Composer::ComposerEngine(syst, gd);
-	}
-	return gd != 0;
-}
-
-bool ComposerMetaEngine::hasFeature(MetaEngineFeature f) const {
-	return ((f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup));
-}
-
-Common::String getSaveName(Common::InSaveFile *in) {
-	Common::Serializer ser(in, NULL);
-	Common::String name;
-	uint32 tmp;
-	ser.syncAsUint32LE(tmp);
-	ser.syncAsUint32LE(tmp);
-	ser.syncString(name);
-	return name;
-}
-int ComposerMetaEngine::getMaximumSaveSlot() const {
-	return 99;
-}
-SaveStateList ComposerMetaEngine::listSaves(const char *target) const {
-	Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
-	Common::StringArray filenames;
-	Common::String saveDesc;
-	Common::String pattern = Common::String::format("%s.##", target);
-
-	filenames = saveFileMan->listSavefiles(pattern);
-
-	SaveStateList saveList;
-	for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); ++file) {
-		// Obtain the last 3 digits of the filename, since they correspond to the save slot
-		int slotNum = atoi(file->c_str() + file->size() - 2);
-
-		if (slotNum >= 0 && slotNum <= 99) {
-			Common::InSaveFile *in = saveFileMan->openForLoading(*file);
-			if (in) {
-				saveDesc = getSaveName(in);
-				saveList.push_back(SaveStateDescriptor(slotNum, saveDesc));
-				delete in;
-			}
-		}
-	}
-
-	Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
-	return saveList;
-}
-
-bool Composer::ComposerEngine::hasFeature(EngineFeature f) const {
-	return (f == kSupportsReturnToLauncher
-		|| f == kSupportsSavingDuringRuntime
-		|| f == kSupportsLoadingDuringRuntime);
-}
-
-#if PLUGIN_ENABLED_DYNAMIC(COMPOSER)
-	REGISTER_PLUGIN_DYNAMIC(COMPOSER, PLUGIN_TYPE_ENGINE, ComposerMetaEngine);
-#else
-	REGISTER_PLUGIN_STATIC(COMPOSER, PLUGIN_TYPE_ENGINE, ComposerMetaEngine);
-#endif
+REGISTER_PLUGIN_STATIC(COMPOSER_DETECTION, PLUGIN_TYPE_METAENGINE, ComposerMetaEngine);

engines/composer/detection.h

@@ -0,0 +1,31 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+namespace Composer {
+
+struct ComposerGameDescription {
+	ADGameDescription desc;
+
+	int gameType;
+};
+
+} // End of namespace Composer

engines/composer/detection_enums.h

@@ -0,0 +1,36 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+namespace Composer {
+
+enum GameType {
+	GType_ComposerV1,
+	GType_ComposerV2
+};
+
+enum GameFileTypes {
+	GAME_CONFIGFILE     = 1 << 0,    // Game configuration
+	GAME_SCRIPTFILE     = 1 << 1,    // Game script
+	GAME_EXECUTABLE     = 1 << 2     // Game executable
+};
+
+} // End of namespace Composer

engines/composer/metaengine.cpp

@@ -0,0 +1,142 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "base/plugins.h"
+#include "common/savefile.h"
+#include "common/serializer.h"
+#include "common/str-array.h"
+#include "engines/advancedDetector.h"
+
+#include "composer/composer.h"
+#include "composer/detection.h"
+
+namespace Composer {
+
+int ComposerEngine::getGameType() const {
+	return _gameDescription->gameType;
+}
+
+const char *ComposerEngine::getGameId() const {
+	return _gameDescription->desc.gameId;
+}
+
+uint32 ComposerEngine::getFeatures() const {
+	return _gameDescription->desc.flags;
+}
+
+Common::Language ComposerEngine::getLanguage() const {
+	return _gameDescription->desc.language;
+}
+
+Common::Platform ComposerEngine::getPlatform() const {
+	return _gameDescription->desc.platform;
+}
+
+bool ComposerEngine::loadDetectedConfigFile(Common::INIFile &configFile) const {
+	const ADGameFileDescription *res = _gameDescription->desc.filesDescriptions;
+	while (res->fileName != NULL) {
+		if (res->fileType == GAME_CONFIGFILE) {
+			return configFile.loadFromFile(res->fileName);
+		}
+		res++;
+	}
+	// default config file name
+	return configFile.loadFromFile("book.ini") || configFile.loadFromFile("book.mac");
+}
+
+} // End of namespace Composer
+
+class ComposerMetaEngineConnect : public AdvancedMetaEngineConnect {
+public:
+    const char *getName() const override {
+		return "composer";
+	}
+
+	bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
+	bool hasFeature(MetaEngineFeature f) const override;
+
+	int getMaximumSaveSlot() const override;
+	SaveStateList listSaves(const char* target) const override;
+};
+
+bool ComposerMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
+	const Composer::ComposerGameDescription *gd = (const Composer::ComposerGameDescription *)desc;
+	if (gd) {
+		*engine = new Composer::ComposerEngine(syst, gd);
+	}
+	return gd != 0;
+}
+
+bool ComposerMetaEngineConnect::hasFeature(MetaEngineFeature f) const {
+	return ((f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup));
+}
+
+Common::String getSaveName(Common::InSaveFile *in) {
+	Common::Serializer ser(in, NULL);
+	Common::String name;
+	uint32 tmp;
+	ser.syncAsUint32LE(tmp);
+	ser.syncAsUint32LE(tmp);
+	ser.syncString(name);
+	return name;
+}
+int ComposerMetaEngineConnect::getMaximumSaveSlot() const {
+	return 99;
+}
+SaveStateList ComposerMetaEngineConnect::listSaves(const char *target) const {
+	Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
+	Common::StringArray filenames;
+	Common::String saveDesc;
+	Common::String pattern = Common::String::format("%s.##", target);
+
+	filenames = saveFileMan->listSavefiles(pattern);
+
+	SaveStateList saveList;
+	for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); ++file) {
+		// Obtain the last 3 digits of the filename, since they correspond to the save slot
+		int slotNum = atoi(file->c_str() + file->size() - 2);
+
+		if (slotNum >= 0 && slotNum <= 99) {
+			Common::InSaveFile *in = saveFileMan->openForLoading(*file);
+			if (in) {
+				saveDesc = getSaveName(in);
+				saveList.push_back(SaveStateDescriptor(slotNum, saveDesc));
+				delete in;
+			}
+		}
+	}
+
+	Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
+	return saveList;
+}
+
+bool Composer::ComposerEngine::hasFeature(EngineFeature f) const {
+	return (f == kSupportsReturnToLauncher
+		|| f == kSupportsSavingDuringRuntime
+		|| f == kSupportsLoadingDuringRuntime);
+}
+
+#if PLUGIN_ENABLED_DYNAMIC(COMPOSER)
+	REGISTER_PLUGIN_DYNAMIC(COMPOSER, PLUGIN_TYPE_ENGINE, ComposerMetaEngineConnect);
+#else
+	REGISTER_PLUGIN_STATIC(COMPOSER, PLUGIN_TYPE_ENGINE, ComposerMetaEngineConnect);
+#endif

engines/composer/module.mk

@@ -3,8 +3,8 @@ MODULE := engines/composer
 MODULE_OBJS = \
 	console.o \
 	composer.o \
-	detection.o \
 	graphics.o \
+	metaengine.o \
 	resource.o \
 	saveload.o \
 	scripting.o
@@ -16,3 +16,6 @@ endif
 
 # Include common rules
 include $(srcdir)/rules.mk
+
+# Detection objects
+DETECT_OBJS += $(MODULE)/detection.o