diff options
| author | Eugene Sandulenko | 2010-08-11 19:32:07 +0000 | 
|---|---|---|
| committer | Eugene Sandulenko | 2010-08-11 19:32:07 +0000 | 
| commit | ff8b296c299d01dd1e7670e6c6d38e12b4c1f3e6 (patch) | |
| tree | 4b7cfdae50122f6dcddeb3055cde9dbb288baf84 | |
| parent | 581935dda41a40d4862ceb28f2afac8e3d766fea (diff) | |
| download | scummvm-rg350-ff8b296c299d01dd1e7670e6c6d38e12b4c1f3e6.tar.gz scummvm-rg350-ff8b296c299d01dd1e7670e6c6d38e12b4c1f3e6.tar.bz2 scummvm-rg350-ff8b296c299d01dd1e7670e6c6d38e12b4c1f3e6.zip  | |
Use tabs instead of spaces for indentation.
svn-id: r51997
| -rw-r--r-- | base/plugins.cpp | 8 | ||||
| -rw-r--r-- | common/util.cpp | 6 | ||||
| -rw-r--r-- | common/util.h | 8 | ||||
| -rw-r--r-- | gui/options.cpp | 18 | ||||
| -rw-r--r-- | sound/mididrv.cpp | 30 | ||||
| -rw-r--r-- | sound/mididrv.h | 54 | 
6 files changed, 62 insertions, 62 deletions
diff --git a/base/plugins.cpp b/base/plugins.cpp index be6c30e243..ea3c65684a 100644 --- a/base/plugins.cpp +++ b/base/plugins.cpp @@ -200,10 +200,10 @@ public:  		LINK_PLUGIN(ADLIB)  		LINK_PLUGIN(PCSPK)  		LINK_PLUGIN(PCJR) -        #ifndef DISABLE_SID -        LINK_PLUGIN(C64) -        #endif -        LINK_PLUGIN(AMIGA) +		#ifndef DISABLE_SID +		LINK_PLUGIN(C64) +		#endif +		LINK_PLUGIN(AMIGA)  		LINK_PLUGIN(APPLEIIGS)  		LINK_PLUGIN(TOWNS)  		#if defined (UNIX) diff --git a/common/util.cpp b/common/util.cpp index d8a621568c..179e648012 100644 --- a/common/util.cpp +++ b/common/util.cpp @@ -306,9 +306,9 @@ const struct GameOpt {  	{ GUIO_MIDICMS,      "midiCMS" },  	{ GUIO_MIDIPCJR,     "midiPCJr" },  	{ GUIO_MIDIADLIB,    "midiAdLib" }, -    { GUIO_MIDIC64,      "midiC64" }, -    { GUIO_MIDIAMIGA,    "midiAmiga" }, -    { GUIO_MIDIAPPLEIIGS,"midiAppleIIgs" }, +	{ GUIO_MIDIC64,      "midiC64" }, +	{ GUIO_MIDIAMIGA,    "midiAmiga" }, +	{ GUIO_MIDIAPPLEIIGS,"midiAppleIIgs" },  	{ GUIO_MIDITOWNS,    "midiTowns" },  	{ GUIO_MIDIPC98,     "midiPC98" },  	{ GUIO_MIDIMT32,     "midiMt32" }, diff --git a/common/util.h b/common/util.h index 99adc0c82f..52e4295bbb 100644 --- a/common/util.h +++ b/common/util.h @@ -223,10 +223,10 @@ enum GameGUIOption {  	GUIO_MIDICMS		= (1 << 7),  	GUIO_MIDIPCJR		= (1 << 8),  	GUIO_MIDIADLIB		= (1 << 9), -    GUIO_MIDIC64        = (1 << 10), -    GUIO_MIDIAMIGA      = (1 << 11), -    GUIO_MIDIAPPLEIIGS  = (1 << 12), -    GUIO_MIDITOWNS		= (1 << 13), +	GUIO_MIDIC64        = (1 << 10), +	GUIO_MIDIAMIGA      = (1 << 11), +	GUIO_MIDIAPPLEIIGS  = (1 << 12), +	GUIO_MIDITOWNS		= (1 << 13),  	GUIO_MIDIPC98		= (1 << 14),  	GUIO_MIDIMT32		= (1 << 15),  	GUIO_MIDIGM			= (1 << 16) diff --git a/gui/options.cpp b/gui/options.cpp index 69e92bf5eb..4969f8ef3f 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -673,15 +673,15 @@ void OptionsDialog::addAudioControls(GuiObject *boss, const Common::String &pref  			const uint32 deviceGuiOption = MidiDriver::musicType2GUIO(d->getMusicType());  			if ((_domain == Common::ConfigManager::kApplicationDomain && d->getMusicType() != MT_TOWNS  // global dialog - skip useless FM-Towns, C64, Amiga, AppleIIGS options there -                && d->getMusicType() != MT_C64 && d->getMusicType() != MT_AMIGA && d->getMusicType() != MT_APPLEIIGS) -			    || (_domain != Common::ConfigManager::kApplicationDomain && !(_guioptions & allFlags)) // No flags are specified -			    || (_guioptions & deviceGuiOption) // flag is present -			    // HACK/FIXME: For now we have to show GM devices, even when the game only has GUIO_MIDIMT32 set, -			    // else we would not show for example external devices connected via ALSA, since they are always -			    // marked as General MIDI device. -			    || (deviceGuiOption == Common::GUIO_MIDIGM && (_guioptions & Common::GUIO_MIDIMT32)) -			    || d->getMusicDriverId() == "auto" || d->getMusicDriverId() == "null") // always add default and null device -					_midiPopUp->appendEntry(d->getCompleteName(), d->getHandle()); +				 && d->getMusicType() != MT_C64 && d->getMusicType() != MT_AMIGA && d->getMusicType() != MT_APPLEIIGS) +				|| (_domain != Common::ConfigManager::kApplicationDomain && !(_guioptions & allFlags)) // No flags are specified +				|| (_guioptions & deviceGuiOption) // flag is present +				// HACK/FIXME: For now we have to show GM devices, even when the game only has GUIO_MIDIMT32 set, +				// else we would not show for example external devices connected via ALSA, since they are always +				// marked as General MIDI device. +				|| (deviceGuiOption == Common::GUIO_MIDIGM && (_guioptions & Common::GUIO_MIDIMT32)) +				|| d->getMusicDriverId() == "auto" || d->getMusicDriverId() == "null") // always add default and null device +				_midiPopUp->appendEntry(d->getCompleteName(), d->getHandle());  		}  	} diff --git a/sound/mididrv.cpp b/sound/mididrv.cpp index 0f4b4d779f..eb8bafee01 100644 --- a/sound/mididrv.cpp +++ b/sound/mididrv.cpp @@ -61,14 +61,14 @@ static const uint32 GUIOMapping[] = {  	/*MDT_CMS,		Common::GUIO_MIDICMS,*/  	MT_PCJR,		Common::GUIO_MIDIPCJR,  	MT_ADLIB,		Common::GUIO_MIDIADLIB, -    MT_C64,		    Common::GUIO_MIDIC64, -    MT_AMIGA,	    Common::GUIO_MIDIAMIGA, +	MT_C64,		    Common::GUIO_MIDIC64, +	MT_AMIGA,	    Common::GUIO_MIDIAMIGA,  	MT_APPLEIIGS,	Common::GUIO_MIDIAPPLEIIGS, -    MT_TOWNS,		Common::GUIO_MIDITOWNS, -    MT_PC98,		Common::GUIO_MIDIPC98, -    MT_GM,			Common::GUIO_MIDIGM, +	MT_TOWNS,		Common::GUIO_MIDITOWNS, +	MT_PC98,		Common::GUIO_MIDIPC98, +	MT_GM,			Common::GUIO_MIDIGM,  	MT_MT32,		Common::GUIO_MIDIMT32, -	0,		0 +	0,				0  };  uint32 MidiDriver::musicType2GUIO(uint32 musicType) { @@ -154,17 +154,17 @@ MidiDriver::DeviceHandle MidiDriver::detectDevice(int flags) {  			return hdl;  		break; -    case MT_C64: +	case MT_C64:  		if (flags & MDT_C64)  			return hdl;  		break; -    case MT_AMIGA: +	case MT_AMIGA:  		if (flags & MDT_AMIGA)  			return hdl;  		break;         -    case MT_APPLEIIGS: +	case MT_APPLEIIGS:  		if (flags & MDT_APPLEIIGS)  			return hdl;  		break; @@ -243,21 +243,21 @@ MidiDriver::DeviceHandle MidiDriver::detectDevice(int flags) {  		MusicType tp = MT_AUTO;  		if (flags & MDT_TOWNS)  			tp = MT_TOWNS; -        else if (flags & MDT_PC98) +		else if (flags & MDT_PC98)  			tp = MT_PC98;  		else if (flags & MDT_ADLIB)  			tp = MT_ADLIB;  		else if (flags & MDT_PCSPK)  			tp = MT_PCSPK; -        else if (flags & MDT_PCJR) +		else if (flags & MDT_PCJR)  			tp = MT_PCJR; -        else if (flags & MDT_C64) +		else if (flags & MDT_C64)  			tp = MT_C64; -        else if (flags & MDT_AMIGA) +		else if (flags & MDT_AMIGA)  			tp = MT_AMIGA; -        else if (flags & MDT_APPLEIIGS) +		else if (flags & MDT_APPLEIIGS)  			tp = MT_APPLEIIGS; -        else if (l == 0) +		else if (l == 0)  			// if we haven't tried to find a MIDI device yet we do this now.  			continue;  		else diff --git a/sound/mididrv.h b/sound/mididrv.h index ff21b891da..7ba1fe19f7 100644 --- a/sound/mididrv.h +++ b/sound/mididrv.h @@ -50,21 +50,21 @@ namespace Common { class String; }   * Music types that music drivers can implement and engines can rely on.   */  enum MusicType { -	MT_INVALID = -1,    // Invalid output -	MT_AUTO = 0,        // Auto -	MT_NULL,            // Null -	MT_PCSPK,           // PC Speaker -	MT_PCJR,            // PCjr -	MT_CMS,             // CMS -	MT_ADLIB,           // AdLib -	MT_C64,             // C64 -    MT_AMIGA,           // Amiga -    MT_APPLEIIGS,       // Apple IIGS -	MT_TOWNS,           // FM-TOWNS -	MT_PC98,            // PC98 -	MT_GM,              // General MIDI -	MT_MT32,            // MT-32 -	MT_GS               // Roland GS +	MT_INVALID = -1,	// Invalid output +	MT_AUTO = 0,		// Auto +	MT_NULL,			// Null +	MT_PCSPK,			// PC Speaker +	MT_PCJR,			// PCjr +	MT_CMS,				// CMS +	MT_ADLIB,			// AdLib +	MT_C64,				// C64 +	MT_AMIGA,			// Amiga +	MT_APPLEIIGS,		// Apple IIGS +	MT_TOWNS,			// FM-TOWNS +	MT_PC98,			// PC98 +	MT_GM,				// General MIDI +	MT_MT32,			// MT-32 +	MT_GS				// Roland GS  };  /** @@ -79,18 +79,18 @@ enum MusicType {   */  enum MidiDriverFlags {  	MDT_NONE        = 0, -	MDT_PCSPK       = 1 << 0,       // PC Speaker: Maps to MD_PCSPK and MD_PCJR -	MDT_CMS         = 1 << 1,       // Creative Music System / Gameblaster: Maps to MD_CMS -	MDT_PCJR        = 1 << 2,       // Tandy/PC Junior driver -	MDT_ADLIB       = 1 << 3,       // AdLib: Maps to MT_ADLIB -    MDT_C64         = 1 << 4, -    MDT_AMIGA       = 1 << 5, -    MDT_APPLEIIGS   = 1 << 6, -	MDT_TOWNS       = 1 << 7,       // FM-TOWNS: Maps to MT_TOWNS -	MDT_PC98        = 1 << 8,       // FM-TOWNS: Maps to MT_PC98 -	MDT_MIDI        = 1 << 9,       // Real MIDI -	MDT_PREFER_MT32 = 1 << 10,       // MT-32 output is preferred -	MDT_PREFER_GM   = 1 << 11       // GM output is preferred +	MDT_PCSPK       = 1 << 0,		// PC Speaker: Maps to MD_PCSPK and MD_PCJR +	MDT_CMS         = 1 << 1,		// Creative Music System / Gameblaster: Maps to MD_CMS +	MDT_PCJR        = 1 << 2,		// Tandy/PC Junior driver +	MDT_ADLIB       = 1 << 3,		// AdLib: Maps to MT_ADLIB +	MDT_C64         = 1 << 4, +	MDT_AMIGA       = 1 << 5, +	MDT_APPLEIIGS   = 1 << 6, +	MDT_TOWNS       = 1 << 7,		// FM-TOWNS: Maps to MT_TOWNS +	MDT_PC98        = 1 << 8,		// FM-TOWNS: Maps to MT_PC98 +	MDT_MIDI        = 1 << 9,		// Real MIDI +	MDT_PREFER_MT32 = 1 << 10,		// MT-32 output is preferred +	MDT_PREFER_GM   = 1 << 11		// GM output is preferred  };  /**  | 
