thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Turned enum PluginError into Common::Error, which in the future is to be used in more places. Help with this is highly welcome

Browse source 
svn-id: r34906
This commit is contained in:
Max Horn 2008-11-05 17:24:56 +00:00
parent fe2935ad4b
commit f32be87633
28 changed files with 97 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

6
backends/midi/alsa.cpp
View file

@ -269,7 +269,7 @@ public:
} }
MusicDevices getDevices() const; MusicDevices getDevices() const;
PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
}; };
#define perm_ok(pinfo,bits) ((snd_seq_port_info_get_capability(pinfo) & (bits)) == (bits)) #define perm_ok(pinfo,bits) ((snd_seq_port_info_get_capability(pinfo) & (bits)) == (bits))
@ -315,10 +315,10 @@ MusicDevices AlsaMusicPlugin::getDevices() const {
return devices; return devices;
} }
PluginError AlsaMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { Common::Error AlsaMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
*mididriver = new MidiDriver_ALSA(); *mididriver = new MidiDriver_ALSA();
return kNoError; return Common::kNoError;
} }
MidiDriver *MidiDriver_ALSA_create(Audio::Mixer *mixer) { MidiDriver *MidiDriver_ALSA_create(Audio::Mixer *mixer) {

6
backends/midi/camd.cpp
View file

@ -177,7 +177,7 @@ public:
} }
MusicDevices getDevices() const; MusicDevices getDevices() const;
PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
}; };
MusicDevices CamdMusicPlugin::getDevices() const { MusicDevices CamdMusicPlugin::getDevices() const {
@ -188,10 +188,10 @@ MusicDevices CamdMusicPlugin::getDevices() const {
return devices; return devices;
} }
PluginError CamdMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { Common::Error CamdMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
*mididriver = new MidiDriver_CAMD(); *mididriver = new MidiDriver_CAMD();
return kNoError; return Common::kNoError;
} }
MidiDriver *MidiDriver_CAMD_create(Audio::Mixer *mixer) { MidiDriver *MidiDriver_CAMD_create(Audio::Mixer *mixer) {

6
backends/midi/coreaudio.cpp
View file

@ -218,7 +218,7 @@ public:
} }
MusicDevices getDevices() const; MusicDevices getDevices() const;
PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
}; };
MusicDevices CoreAudioMusicPlugin::getDevices() const { MusicDevices CoreAudioMusicPlugin::getDevices() const {
@ -229,10 +229,10 @@ MusicDevices CoreAudioMusicPlugin::getDevices() const {
return devices; return devices;
} }
PluginError CoreAudioMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { Common::Error CoreAudioMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
*mididriver = new MidiDriver_CORE(); *mididriver = new MidiDriver_CORE();
return kNoError; return Common::kNoError;
} }
MidiDriver *MidiDriver_CORE_create(Audio::Mixer *mixer) { MidiDriver *MidiDriver_CORE_create(Audio::Mixer *mixer) {

6
backends/midi/coremidi.cpp
View file

@ -190,7 +190,7 @@ public:
} }
MusicDevices getDevices() const; MusicDevices getDevices() const;
PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
}; };
MusicDevices CoreMIDIMusicPlugin::getDevices() const { MusicDevices CoreMIDIMusicPlugin::getDevices() const {
@ -201,10 +201,10 @@ MusicDevices CoreMIDIMusicPlugin::getDevices() const {
return devices; return devices;
} }
PluginError CoreMIDIMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { Common::Error CoreMIDIMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
*mididriver = new MidiDriver_CoreMIDI(); *mididriver = new MidiDriver_CoreMIDI();
return kNoError; return Common::kNoError;
} }
MidiDriver *MidiDriver_CoreMIDI_create(Audio::Mixer *mixer) { MidiDriver *MidiDriver_CoreMIDI_create(Audio::Mixer *mixer) {

6
backends/midi/dmedia.cpp
View file

@ -189,7 +189,7 @@ public:
} }
MusicDevices getDevices() const; MusicDevices getDevices() const;
PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
}; };
MusicDevices DMediaMusicPlugin::getDevices() const { MusicDevices DMediaMusicPlugin::getDevices() const {
@ -200,10 +200,10 @@ MusicDevices DMediaMusicPlugin::getDevices() const {
return devices; return devices;
} }
PluginError DMediaMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { Common::Error DMediaMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
*mididriver = new MidiDriver_DMEDIA(); *mididriver = new MidiDriver_DMEDIA();
return kNoError; return Common::kNoError;
} }
MidiDriver *MidiDriver_DMEDIA_create(Audio::Mixer *mixer) { MidiDriver *MidiDriver_DMEDIA_create(Audio::Mixer *mixer) {

6
backends/midi/quicktime.cpp
View file

@ -274,7 +274,7 @@ public:
} }
MusicDevices getDevices() const; MusicDevices getDevices() const;
PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
}; };
MusicDevices QuickTimeMusicPlugin::getDevices() const { MusicDevices QuickTimeMusicPlugin::getDevices() const {
@ -285,10 +285,10 @@ MusicDevices QuickTimeMusicPlugin::getDevices() const {
return devices; return devices;
} }
PluginError QuickTimeMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { Common::Error QuickTimeMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
*mididriver = new MidiDriver_QT(); *mididriver = new MidiDriver_QT();
return kNoError; return Common::kNoError;
} }
MidiDriver *MidiDriver_QT_create(Audio::Mixer *mixer) { MidiDriver *MidiDriver_QT_create(Audio::Mixer *mixer) {

6
backends/midi/seq.cpp
View file

@ -184,7 +184,7 @@ public:
} }
MusicDevices getDevices() const; MusicDevices getDevices() const;
PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
}; };
MusicDevices SeqMusicPlugin::getDevices() const { MusicDevices SeqMusicPlugin::getDevices() const {
@ -195,10 +195,10 @@ MusicDevices SeqMusicPlugin::getDevices() const {
return devices; return devices;
} }
PluginError SeqMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { Common::Error SeqMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
*mididriver = new MidiDriver_SEQ(); *mididriver = new MidiDriver_SEQ();
return kNoError; return Common::kNoError;
} }
MidiDriver *MidiDriver_SEQ_create(Audio::Mixer *mixer) { MidiDriver *MidiDriver_SEQ_create(Audio::Mixer *mixer) {

6
backends/midi/stmidi.cpp
View file

@ -119,7 +119,7 @@ public:
} }
MusicDevices getDevices() const; MusicDevices getDevices() const;
PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver)
const; const;
}; };
@ -131,10 +131,10 @@ MusicDevices StMidiMusicPlugin::getDevices() const {
return devices; return devices;
} }
PluginError StMidiMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { Common::Error StMidiMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
*mididriver = new MidiDriver_STMIDI(); *mididriver = new MidiDriver_STMIDI();
return kNoError; return Common::kNoError;
} }
MidiDriver *MidiDriver_STMIDI_create(Audio::Mixer *mixer) { MidiDriver *MidiDriver_STMIDI_create(Audio::Mixer *mixer) {

6
backends/midi/timidity.cpp
View file

@ -525,7 +525,7 @@ public:
} }
MusicDevices getDevices() const; MusicDevices getDevices() const;
PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
}; };
MusicDevices TimidityMusicPlugin::getDevices() const { MusicDevices TimidityMusicPlugin::getDevices() const {
@ -534,10 +534,10 @@ MusicDevices TimidityMusicPlugin::getDevices() const {
return devices; return devices;
} }
PluginError TimidityMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { Common::Error TimidityMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
*mididriver = new MidiDriver_TIMIDITY(); *mididriver = new MidiDriver_TIMIDITY();
return kNoError; return Common::kNoError;
} }
MidiDriver *MidiDriver_TIMIDITY_create(Audio::Mixer *mixer) { MidiDriver *MidiDriver_TIMIDITY_create(Audio::Mixer *mixer) {

6
backends/midi/windows.cpp
View file

@ -158,7 +158,7 @@ public:
} }
MusicDevices getDevices() const; MusicDevices getDevices() const;
PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
}; };
MusicDevices WindowsMusicPlugin::getDevices() const { MusicDevices WindowsMusicPlugin::getDevices() const {
@ -169,10 +169,10 @@ MusicDevices WindowsMusicPlugin::getDevices() const {
return devices; return devices;
} }
PluginError WindowsMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { Common::Error WindowsMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
*mididriver = new MidiDriver_WIN(); *mididriver = new MidiDriver_WIN();
return kNoError; return Common::kNoError;
} }
MidiDriver *MidiDriver_WIN_create(Audio::Mixer *mixer) { MidiDriver *MidiDriver_WIN_create(Audio::Mixer *mixer) {

6
backends/midi/ypa1.cpp
View file

@ -117,7 +117,7 @@ public:
} }
MusicDevices getDevices() const; MusicDevices getDevices() const;
PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
}; };
MusicDevices YamahaPa1MusicPlugin::getDevices() const { MusicDevices YamahaPa1MusicPlugin::getDevices() const {
@ -128,10 +128,10 @@ MusicDevices YamahaPa1MusicPlugin::getDevices() const {
return devices; return devices;
} }
PluginError YamahaPa1MusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { Common::Error YamahaPa1MusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
*mididriver = new MidiDriver_YamahaPa1(); *mididriver = new MidiDriver_YamahaPa1();
return kNoError; return Common::kNoError;
} }
MidiDriver *MidiDriver_YamahaPa1_create(Audio::Mixer *mixer) { MidiDriver *MidiDriver_YamahaPa1_create(Audio::Mixer *mixer) {

6
backends/midi/zodiac.cpp
View file

@ -135,7 +135,7 @@ public:
} }
MusicDevices getDevices() const; MusicDevices getDevices() const;
PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
}; };
MusicDevices ZodiacMusicPlugin::getDevices() const { MusicDevices ZodiacMusicPlugin::getDevices() const {
@ -146,10 +146,10 @@ MusicDevices ZodiacMusicPlugin::getDevices() const {
return devices; return devices;
} }
PluginError ZodiacMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { Common::Error ZodiacMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
*mididriver = new MidiDriver_Zodiac(); *mididriver = new MidiDriver_Zodiac();
return kNoError; return Common::kNoError;
} }
MidiDriver *MidiDriver_Zodiac_create(Audio::Mixer *mixer) { MidiDriver *MidiDriver_Zodiac_create(Audio::Mixer *mixer) {

8
base/main.cpp
View file

@ -132,18 +132,18 @@ static int runGame(const EnginePlugin *plugin, OSystem &system, const Common::St
// Create the game engine // Create the game engine
Engine *engine = 0; Engine *engine = 0;
PluginError err = (*plugin)->createInstance(&system, &engine); Common::Error err = (*plugin)->createInstance(&system, &engine);
if (!engine || err != kNoError) { if (!engine || err != Common::kNoError) {
// TODO: Show an error dialog or so? // TODO: Show an error dialog or so?
// TODO: Also take 'err' into consideration... // TODO: Also take 'err' into consideration...
//GUI::MessageDialog alert("ScummVM could not find any game in the specified directory!"); //GUI::MessageDialog alert("ScummVM could not find any game in the specified directory!");
//alert.runModal(); //alert.runModal();
const char *errMsg = 0; const char *errMsg = 0;
switch (err) { switch (err) {
case kInvalidPathError: case Common::kInvalidPathError:
errMsg = "Invalid game path"; errMsg = "Invalid game path";
break; break;
case kNoGameDataFoundError: case Common::kNoGameDataFoundError:
errMsg = "Unable to locate game data"; errMsg = "Unable to locate game data";
break; break;
default: default:

2
common/advancedDetector.cpp
View file

@ -220,7 +220,7 @@ GameList AdvancedMetaEngine::detectGames(const FSList &fslist) const {
return detectedGames; return detectedGames;
} }
PluginError AdvancedMetaEngine::createInstance(OSystem *syst, Engine **engine) const { Common::Error AdvancedMetaEngine::createInstance(OSystem *syst, Engine **engine) const {
assert(engine); assert(engine);
upgradeTargetIfNecessary(params); upgradeTargetIfNecessary(params);

2
common/advancedDetector.h
View file

@ -201,7 +201,7 @@ public:
virtual GameList getSupportedGames() const; virtual GameList getSupportedGames() const;
virtual GameDescriptor findGame(const char *gameid) const; virtual GameDescriptor findGame(const char *gameid) const;
virtual GameList detectGames(const FSList &fslist) const; virtual GameList detectGames(const FSList &fslist) const;
virtual PluginError createInstance(OSystem *syst, Engine **engine) const; virtual Common::Error createInstance(OSystem *syst, Engine **engine) const;
// To be provided by subclasses // To be provided by subclasses
virtual bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const = 0; virtual bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const = 0;

25
common/error.h
View file

@ -32,6 +32,8 @@
/** /**
* Errors used in the SaveFileManager class. * Errors used in the SaveFileManager class.
*
* @todo Merge this partially into Common::Error. We only need a small subset of these errors, though.
*/ */
enum SFMError { enum SFMError {
SFM_NO_ERROR, //Default state, indicates no error has been recorded SFM_NO_ERROR, //Default state, indicates no error has been recorded
@ -44,17 +46,26 @@ enum SFMError {
SFM_DIR_ROFS //mkdir()::EROFS: The parent directory resides on a read-only file system SFM_DIR_ROFS //mkdir()::EROFS: The parent directory resides on a read-only file system
}; };
namespace Common {
/** /**
* Error codes which may be reported by plugins under various circumstances. * Error codes which may be reported by plugins under various circumstances.
* @todo Turn this into a global 'ErrorCode' enum used by all of ScummVM ? *
* @todo Clarify the names, and add doxygen comments to each error.
* @todo Add more error values, e.g. for load/save errors. Use those in SaveFileManager,
* (Meta)Engine save/load API, Engine::init() and Engine::go(), ...
* @todo Maybe add an API which keeps track of an error message,
* similiar to SDL_SetError/SDL_GetError/SDL_ClearError?
*/ */
enum PluginError { enum Error {
kNoError = 0, // No error occured kNoError = 0, //!< No error occured
kInvalidPathError, kInvalidPathError, //!< Engine initialization: Invalid game path was passed
kNoGameDataFoundError, kNoGameDataFoundError, //!< Engine initialization: No game data was found in the specified location
kUnsupportedGameidError, kUnsupportedGameidError, //!< Engine initialization: Gameid not supported by this (Meta)Engine
kUnknownError // Catch-all error, used if no other error code matches kUnknownError //!< Catch-all error, used if no other error code matches
}; };
} // End of namespace Common
#endif //COMMON_ERROR_H #endif //COMMON_ERROR_H

4
engines/metaengine.h
View file

@ -75,9 +75,9 @@ public:
* @param syst Pointer to the global OSystem object * @param syst Pointer to the global OSystem object
* @param engine Pointer to a pointer which the MetaEngine sets to * @param engine Pointer to a pointer which the MetaEngine sets to
* the newly create Engine, or 0 in case of an error * the newly create Engine, or 0 in case of an error
* @return a PluginError describing the error which occurred, or kNoError * @return a Common::Error describing the error which occurred, or kNoError
*/ */
virtual PluginError createInstance(OSystem *syst, Engine **engine) const = 0; virtual Common::Error createInstance(OSystem *syst, Engine **engine) const = 0;
/** /**
* Return a list of all save states associated with the given target. * Return a list of all save states associated with the given target.

6
engines/queen/queen.cpp
View file

@ -65,7 +65,7 @@ public:
virtual SaveStateList listSaves(const char *target) const; virtual SaveStateList listSaves(const char *target) const;
virtual void removeSaveState(const char *target, int slot) const; virtual void removeSaveState(const char *target, int slot) const;
virtual PluginError createInstance(OSystem *syst, Engine **engine) const; virtual Common::Error createInstance(OSystem *syst, Engine **engine) const;
}; };
const char *QueenMetaEngine::getName() const { const char *QueenMetaEngine::getName() const {
@ -174,10 +174,10 @@ void QueenMetaEngine::removeSaveState(const char *target, int slot) const {
g_system->getSavefileManager()->removeSavefile(filename.c_str()); g_system->getSavefileManager()->removeSavefile(filename.c_str());
} }
PluginError QueenMetaEngine::createInstance(OSystem *syst, Engine **engine) const { Common::Error QueenMetaEngine::createInstance(OSystem *syst, Engine **engine) const {
assert(engine); assert(engine);
*engine = new Queen::QueenEngine(syst); *engine = new Queen::QueenEngine(syst);
return kNoError; return Common::kNoError;
} }
#if PLUGIN_ENABLED_DYNAMIC(QUEEN) #if PLUGIN_ENABLED_DYNAMIC(QUEEN)

10
engines/scumm/detection.cpp
View file

@ -682,7 +682,7 @@ public:
virtual GameDescriptor findGame(const char *gameid) const; virtual GameDescriptor findGame(const char *gameid) const;
virtual GameList detectGames(const Common::FSList &fslist) const; virtual GameList detectGames(const Common::FSList &fslist) const;
virtual PluginError createInstance(OSystem *syst, Engine **engine) const; virtual Common::Error createInstance(OSystem *syst, Engine **engine) const;
virtual SaveStateList listSaves(const char *target) const; virtual SaveStateList listSaves(const char *target) const;
virtual void removeSaveState(const char *target, int slot) const; virtual void removeSaveState(const char *target, int slot) const;
@ -765,7 +765,7 @@ GameList ScummMetaEngine::detectGames(const Common::FSList &fslist) const {
* *
* This is heavily based on our MD5 detection scheme. * This is heavily based on our MD5 detection scheme.
*/ */
PluginError ScummMetaEngine::createInstance(OSystem *syst, Engine **engine) const { Common::Error ScummMetaEngine::createInstance(OSystem *syst, Engine **engine) const {
assert(syst); assert(syst);
assert(engine); assert(engine);
const char *gameid = ConfMan.get("gameid").c_str(); const char *gameid = ConfMan.get("gameid").c_str();
@ -792,7 +792,7 @@ PluginError ScummMetaEngine::createInstance(OSystem *syst, Engine **engine) cons
Common::FSList fslist; Common::FSList fslist;
Common::FSNode dir(ConfMan.get("path")); Common::FSNode dir(ConfMan.get("path"));
if (!dir.getChildren(fslist, Common::FSNode::kListFilesOnly)) { if (!dir.getChildren(fslist, Common::FSNode::kListFilesOnly)) {
return kInvalidPathError; return Common::kInvalidPathError;
} }
// Invoke the detector, but fixed to the specified gameid. // Invoke the detector, but fixed to the specified gameid.
@ -801,7 +801,7 @@ PluginError ScummMetaEngine::createInstance(OSystem *syst, Engine **engine) cons
// Unable to locate game data // Unable to locate game data
if (results.empty()) { if (results.empty()) {
return kNoGameDataFoundError; return Common::kNoGameDataFoundError;
} }
// No unique match found. If a platform override is present, try to // No unique match found. If a platform override is present, try to
@ -943,7 +943,7 @@ PluginError ScummMetaEngine::createInstance(OSystem *syst, Engine **engine) cons
error("Engine_SCUMM_create(): Unknown version of game engine"); error("Engine_SCUMM_create(): Unknown version of game engine");
} }
return kNoError; return Common::kNoError;
} }
const char *ScummMetaEngine::getName() const { const char *ScummMetaEngine::getName() const {

8
engines/sky/sky.cpp
View file

@ -23,8 +23,6 @@
* *
*/ */
#include "base/plugins.h" #include "base/plugins.h"
#include "common/config-manager.h" #include "common/config-manager.h"
@ -115,7 +113,7 @@ public:
virtual GameDescriptor findGame(const char *gameid) const; virtual GameDescriptor findGame(const char *gameid) const;
virtual GameList detectGames(const Common::FSList &fslist) const; virtual GameList detectGames(const Common::FSList &fslist) const;
virtual PluginError createInstance(OSystem *syst, Engine **engine) const; virtual Common::Error createInstance(OSystem *syst, Engine **engine) const;
virtual SaveStateList listSaves(const char *target) const; virtual SaveStateList listSaves(const char *target) const;
}; };
@ -203,10 +201,10 @@ GameList SkyMetaEngine::detectGames(const Common::FSList &fslist) const {
return detectedGames; return detectedGames;
} }
PluginError SkyMetaEngine::createInstance(OSystem *syst, Engine **engine) const { Common::Error SkyMetaEngine::createInstance(OSystem *syst, Engine **engine) const {
assert(engine); assert(engine);
*engine = new Sky::SkyEngine(syst); *engine = new Sky::SkyEngine(syst);
return kNoError; return Common::kNoError;
} }
SaveStateList SkyMetaEngine::listSaves(const char *target) const { SaveStateList SkyMetaEngine::listSaves(const char *target) const {

7
engines/sword1/sword1.cpp
View file

@ -23,7 +23,6 @@
* *
*/ */
#include "sword1/sword1.h" #include "sword1/sword1.h"
#include "base/plugins.h" #include "base/plugins.h"
@ -101,7 +100,7 @@ public:
virtual GameList detectGames(const Common::FSList &fslist) const; virtual GameList detectGames(const Common::FSList &fslist) const;
virtual SaveStateList listSaves(const char *target) const; virtual SaveStateList listSaves(const char *target) const;
virtual PluginError createInstance(OSystem *syst, Engine **engine) const; virtual Common::Error createInstance(OSystem *syst, Engine **engine) const;
}; };
bool SwordMetaEngine::hasFeature(MetaEngineFeature f) const { bool SwordMetaEngine::hasFeature(MetaEngineFeature f) const {
@ -195,10 +194,10 @@ GameList SwordMetaEngine::detectGames(const Common::FSList &fslist) const {
return detectedGames; return detectedGames;
} }
PluginError SwordMetaEngine::createInstance(OSystem *syst, Engine **engine) const { Common::Error SwordMetaEngine::createInstance(OSystem *syst, Engine **engine) const {
assert(engine); assert(engine);
*engine = new SwordEngine(syst); *engine = new SwordEngine(syst);
return kNoError; return Common::kNoError;
} }
SaveStateList SwordMetaEngine::listSaves(const char *target) const { SaveStateList SwordMetaEngine::listSaves(const char *target) const {

10
engines/sword2/sword2.cpp
View file

@ -87,7 +87,7 @@ public:
virtual SaveStateList listSaves(const char *target) const; virtual SaveStateList listSaves(const char *target) const;
virtual void removeSaveState(const char *target, int slot) const; virtual void removeSaveState(const char *target, int slot) const;
virtual PluginError createInstance(OSystem *syst, Engine **engine) const; virtual Common::Error createInstance(OSystem *syst, Engine **engine) const;
}; };
bool Sword2MetaEngine::hasFeature(MetaEngineFeature f) const { bool Sword2MetaEngine::hasFeature(MetaEngineFeature f) const {
@ -211,14 +211,14 @@ void Sword2MetaEngine::removeSaveState(const char *target, int slot) const {
g_system->getSavefileManager()->removeSavefile(filename.c_str()); g_system->getSavefileManager()->removeSavefile(filename.c_str());
} }
PluginError Sword2MetaEngine::createInstance(OSystem *syst, Engine **engine) const { Common::Error Sword2MetaEngine::createInstance(OSystem *syst, Engine **engine) const {
assert(syst); assert(syst);
assert(engine); assert(engine);
Common::FSList fslist; Common::FSList fslist;
Common::FSNode dir(ConfMan.get("path")); Common::FSNode dir(ConfMan.get("path"));
if (!dir.getChildren(fslist, Common::FSNode::kListAll)) { if (!dir.getChildren(fslist, Common::FSNode::kListAll)) {
return kInvalidPathError; return Common::kInvalidPathError;
} }
// Invoke the detector // Invoke the detector
@ -228,11 +228,11 @@ PluginError Sword2MetaEngine::createInstance(OSystem *syst, Engine **engine) con
for (uint i = 0; i < detectedGames.size(); i++) { for (uint i = 0; i < detectedGames.size(); i++) {
if (detectedGames[i].gameid() == gameid) { if (detectedGames[i].gameid() == gameid) {
*engine = new Sword2::Sword2Engine(syst); *engine = new Sword2::Sword2Engine(syst);
return kNoError; return Common::kNoError;
} }
} }
return kNoGameDataFoundError; return Common::kNoGameDataFoundError;
} }
#if PLUGIN_ENABLED_DYNAMIC(SWORD2) #if PLUGIN_ENABLED_DYNAMIC(SWORD2)

4
sound/musicplugin.h
View file

@ -100,9 +100,9 @@ public:
* @param mixer Pointer to the global Mixer object * @param mixer Pointer to the global Mixer object
* @param mididriver Pointer to a pointer which the MusicPluginObject sets * @param mididriver Pointer to a pointer which the MusicPluginObject sets
* to the newly create MidiDriver, or 0 in case of an error * to the newly create MidiDriver, or 0 in case of an error
* @return a PluginError describing the error which occurred, or kNoError * @return a Common::Error describing the error which occurred, or kNoError
*/ */
virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const = 0; virtual Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const = 0;
}; };

6
sound/null.cpp
View file

@ -46,13 +46,13 @@ public:
} }
MusicDevices getDevices() const; MusicDevices getDevices() const;
PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
}; };
PluginError NullMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { Common::Error NullMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
*mididriver = new MidiDriver_NULL(); *mididriver = new MidiDriver_NULL();
return kNoError; return Common::kNoError;
} }
MusicDevices NullMusicPlugin::getDevices() const { MusicDevices NullMusicPlugin::getDevices() const {

6
sound/softsynth/adlib.cpp
View file

@ -1529,7 +1529,7 @@ public:
} }
MusicDevices getDevices() const; MusicDevices getDevices() const;
PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
}; };
MusicDevices AdlibEmuMusicPlugin::getDevices() const { MusicDevices AdlibEmuMusicPlugin::getDevices() const {
@ -1538,10 +1538,10 @@ MusicDevices AdlibEmuMusicPlugin::getDevices() const {
return devices; return devices;
} }
PluginError AdlibEmuMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { Common::Error AdlibEmuMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
*mididriver = new MidiDriver_ADLIB(mixer); *mididriver = new MidiDriver_ADLIB(mixer);
return kNoError; return Common::kNoError;
} }
MidiDriver *MidiDriver_ADLIB_create(Audio::Mixer *mixer) { MidiDriver *MidiDriver_ADLIB_create(Audio::Mixer *mixer) {

4
sound/softsynth/fluidsynth.cpp
View file

@ -230,7 +230,7 @@ public:
} }
MusicDevices getDevices() const; MusicDevices getDevices() const;
PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
}; };
MusicDevices FluidSynthMusicPlugin::getDevices() const { MusicDevices FluidSynthMusicPlugin::getDevices() const {
@ -239,7 +239,7 @@ MusicDevices FluidSynthMusicPlugin::getDevices() const {
return devices; return devices;
} }
PluginError FluidSynthMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { Common::Error FluidSynthMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
*mididriver = new MidiDriver_FluidSynth(mixer); *mididriver = new MidiDriver_FluidSynth(mixer);
return kNoError; return kNoError;

6
sound/softsynth/mt32.cpp
View file

@ -495,7 +495,7 @@ public:
} }
MusicDevices getDevices() const; MusicDevices getDevices() const;
PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
}; };
MusicDevices MT32EmuMusicPlugin::getDevices() const { MusicDevices MT32EmuMusicPlugin::getDevices() const {
@ -504,10 +504,10 @@ MusicDevices MT32EmuMusicPlugin::getDevices() const {
return devices; return devices;
} }
PluginError MT32EmuMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { Common::Error MT32EmuMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
*mididriver = new MidiDriver_MT32(mixer); *mididriver = new MidiDriver_MT32(mixer);
return kNoError; return Common::kNoError;
} }
MidiDriver *MidiDriver_MT32_create(Audio::Mixer *mixer) { MidiDriver *MidiDriver_MT32_create(Audio::Mixer *mixer) {

6
sound/softsynth/ym2612.cpp
View file

@ -766,7 +766,7 @@ public:
} }
MusicDevices getDevices() const; MusicDevices getDevices() const;
PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
}; };
MusicDevices TownsEmuMusicPlugin::getDevices() const { MusicDevices TownsEmuMusicPlugin::getDevices() const {
@ -775,10 +775,10 @@ MusicDevices TownsEmuMusicPlugin::getDevices() const {
return devices; return devices;
} }
PluginError TownsEmuMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { Common::Error TownsEmuMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
*mididriver = new MidiDriver_YM2612(mixer); *mididriver = new MidiDriver_YM2612(mixer);
return kNoError; return Common::kNoError;
} }
MidiDriver *MidiDriver_YM2612_create(Audio::Mixer *mixer) { MidiDriver *MidiDriver_YM2612_create(Audio::Mixer *mixer) {