[Scummvm-cvs-logs] scummvm master -> e1dd57e016bfd9b20e389ecc69f089dfe59b2d86

wjp wjp at usecode.org
Mon Jul 20 20:03:54 CEST 2015


This automated email contains information about 7 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
91e925d8ce GOB: Get rid of unused Audio::mixer references
4887796888 ACCESS: Avoid use of global constructors
ac4360af88 SCUMM: Get rid of unused Audio::mixer references
ac2c01880e SHERLOCK: Avoid non-ASCII characters in string constants
856475067a MISC: Remove some unused private member variables
fad3b425b9 AGI: Disable unused palettes for compilation
e1dd57e016 Merge pull request #603 from fingolfin/fix-warnings


Commit: 91e925d8cec1eff97d76ba4f0870171a3cb5b3b3
    https://github.com/scummvm/scummvm/commit/91e925d8cec1eff97d76ba4f0870171a3cb5b3b3
Author: Max Horn (max at quendi.de)
Date: 2015-07-19T17:06:18+02:00

Commit Message:
GOB: Get rid of unused Audio::mixer references

Also remove the unused AdLib::_rate member variable.

Changed paths:
    engines/gob/sound/adlib.cpp
    engines/gob/sound/adlib.h
    engines/gob/sound/adlplayer.cpp
    engines/gob/sound/adlplayer.h
    engines/gob/sound/musplayer.cpp
    engines/gob/sound/musplayer.h
    engines/gob/sound/sound.cpp



diff --git a/engines/gob/sound/adlib.cpp b/engines/gob/sound/adlib.cpp
index 995cc48..1e024d5 100644
--- a/engines/gob/sound/adlib.cpp
+++ b/engines/gob/sound/adlib.cpp
@@ -115,7 +115,7 @@ const uint16 AdLib::kHihatParams    [kParamCount] = {
 	  0,  1,  0, 15, 11,  0,  7,  5,  0,  0,  0,  0,  0,  0   };
 
 
-AdLib::AdLib(Audio::Mixer &mixer, int callbackFreq) : _mixer(&mixer), _opl(0),
+AdLib::AdLib(int callbackFreq) : _opl(0),
 	_toPoll(0), _repCount(0), _first(true), _playing(false), _ended(true), _volume(0) {
 
 	initFreqs();
diff --git a/engines/gob/sound/adlib.h b/engines/gob/sound/adlib.h
index 28ebf9d..d604582 100644
--- a/engines/gob/sound/adlib.h
+++ b/engines/gob/sound/adlib.h
@@ -37,7 +37,7 @@ namespace Gob {
 /** Base class for a player of an AdLib music format. */
 class AdLib {
 public:
-	AdLib(Audio::Mixer &mixer, int callbackFrequency);
+	AdLib(int callbackFrequency);
 	virtual ~AdLib();
 
 	bool isPlaying() const;    ///< Are we currently playing?
@@ -225,15 +225,12 @@ private:
 	static const uint16 kHihatParams    [kParamCount];
 
 
-	Audio::Mixer *_mixer;
 	OPL::OPL *_opl;
 
 	Common::Mutex _mutex;
 
 	int _volume;
 
-	uint32 _rate;
-
 	uint32 _toPoll;
 
 	int32 _repCount;
diff --git a/engines/gob/sound/adlplayer.cpp b/engines/gob/sound/adlplayer.cpp
index e5a2760..6354d8c 100644
--- a/engines/gob/sound/adlplayer.cpp
+++ b/engines/gob/sound/adlplayer.cpp
@@ -28,7 +28,7 @@
 
 namespace Gob {
 
-ADLPlayer::ADLPlayer(Audio::Mixer &mixer) : AdLib(mixer, 1000),
+ADLPlayer::ADLPlayer() : AdLib(1000),
 	_songData(0), _songDataSize(0), _playPos(0) {
 
 }
diff --git a/engines/gob/sound/adlplayer.h b/engines/gob/sound/adlplayer.h
index bd43cc0..50e1db5 100644
--- a/engines/gob/sound/adlplayer.h
+++ b/engines/gob/sound/adlplayer.h
@@ -36,7 +36,7 @@ namespace Gob {
 /** A player for Coktel Vision's ADL music format. */
 class ADLPlayer : public AdLib {
 public:
-	ADLPlayer(Audio::Mixer &mixer);
+	ADLPlayer();
 	~ADLPlayer();
 
 	bool load(Common::SeekableReadStream &adl);
diff --git a/engines/gob/sound/musplayer.cpp b/engines/gob/sound/musplayer.cpp
index 2c0330e..dcbb712 100644
--- a/engines/gob/sound/musplayer.cpp
+++ b/engines/gob/sound/musplayer.cpp
@@ -27,7 +27,7 @@
 
 namespace Gob {
 
-MUSPlayer::MUSPlayer(Audio::Mixer &mixer) : AdLib(mixer, 60),
+MUSPlayer::MUSPlayer() : AdLib(60),
 	_songData(0), _songDataSize(0), _playPos(0), _songID(0) {
 
 }
diff --git a/engines/gob/sound/musplayer.h b/engines/gob/sound/musplayer.h
index 7c1189b..973192f 100644
--- a/engines/gob/sound/musplayer.h
+++ b/engines/gob/sound/musplayer.h
@@ -40,7 +40,7 @@ namespace Gob {
  */
 class MUSPlayer : public AdLib {
 public:
-	MUSPlayer(Audio::Mixer &mixer);
+	MUSPlayer();
 	~MUSPlayer();
 
 	/** Load the instruments (.SND or .TBR) */
diff --git a/engines/gob/sound/sound.cpp b/engines/gob/sound/sound.cpp
index 9b19b9c..22dfe9d 100644
--- a/engines/gob/sound/sound.cpp
+++ b/engines/gob/sound/sound.cpp
@@ -234,7 +234,7 @@ bool Sound::adlibLoadADL(const char *fileName) {
 		return false;
 
 	if (!_adlPlayer)
-		_adlPlayer = new ADLPlayer(*_vm->_mixer);
+		_adlPlayer = new ADLPlayer();
 
 	debugC(1, kDebugSound, "AdLib: Loading ADL data (\"%s\")", fileName);
 
@@ -256,7 +256,7 @@ bool Sound::adlibLoadADL(byte *data, uint32 size, int index) {
 		return false;
 
 	if (!_adlPlayer)
-		_adlPlayer = new ADLPlayer(*_vm->_mixer);
+		_adlPlayer = new ADLPlayer();
 
 	debugC(1, kDebugSound, "AdLib: Loading ADL data (%d)", index);
 
@@ -749,7 +749,7 @@ void Sound::createMDYPlayer() {
 	delete _adlPlayer;
 	_adlPlayer = 0;
 
-	_mdyPlayer = new MUSPlayer(*_vm->_mixer);
+	_mdyPlayer = new MUSPlayer();
 }
 
 void Sound::createADLPlayer() {
@@ -759,7 +759,7 @@ void Sound::createADLPlayer() {
 	delete _mdyPlayer;
 	_mdyPlayer= 0;
 
-	_adlPlayer = new ADLPlayer(*_vm->_mixer);
+	_adlPlayer = new ADLPlayer();
 }
 
 } // End of namespace Gob


Commit: 4887796888772d1347846ee58227d013afa0e19a
    https://github.com/scummvm/scummvm/commit/4887796888772d1347846ee58227d013afa0e19a
Author: Max Horn (max at quendi.de)
Date: 2015-07-19T17:11:36+02:00

Commit Message:
ACCESS: Avoid use of global constructors

Changed paths:
    engines/access/resources.cpp



diff --git a/engines/access/resources.cpp b/engines/access/resources.cpp
index 4157cdf..0494840 100644
--- a/engines/access/resources.cpp
+++ b/engines/access/resources.cpp
@@ -64,17 +64,17 @@ const int RMOUSE[10][2] = {
 	{ 142, 177 }, { 178, 212 }, { 213, 248 }, { 249, 283 }, { 284, 318 }
 };
 
-const char *const LOOK_MESSAGE = "LOOKING THERE REVEALS NOTHING OF INTEREST.";
-const char *const GET_MESSAGE  = "YOU CAN'T TAKE THAT.";
-const char *const OPEN_MESSAGE = "THAT DOESN'T OPEN.";
-const char *const MOVE_MESSAGE = "THAT WON'T MOVE.";
-const char *const USE_MESSAGE  = "THAT DOESN'T SEEM TO WORK.";
-const char *const GO_MESSAGE   = "YOU CAN'T CLIMB THAT.";
-const char *const HELP_MESSAGE = "THIS OBJECT REQUIRES NO HINTS";
-const char *const TALK_MESSAGE = "THERE SEEMS TO BE NO RESPONSE.";
 const char *const GENERAL_MESSAGES[] = {
-	LOOK_MESSAGE, OPEN_MESSAGE, MOVE_MESSAGE, GET_MESSAGE, USE_MESSAGE,
-	GO_MESSAGE, TALK_MESSAGE, HELP_MESSAGE, HELP_MESSAGE, USE_MESSAGE
+	"LOOKING THERE REVEALS NOTHING OF INTEREST.", // LOOK_MESSAGE
+	"THAT DOESN'T OPEN.",               // OPEN_MESSAGE
+	"THAT WON'T MOVE."                  // MOVE_MESSAGE
+	"YOU CAN'T TAKE THAT.",             // GET_MESSAGE
+	"THAT DOESN'T SEEM TO WORK.",       // USE_MESSAGE
+	"YOU CAN'T CLIMB THAT.",            // GO_MESSAGE
+	"THERE SEEMS TO BE NO RESPONSE.",   // TALK_MESSAGE
+	"THIS OBJECT REQUIRES NO HINTS",    // HELP_MESSAGE
+	"THIS OBJECT REQUIRES NO HINTS",    // HELP_MESSAGE
+	"THAT DOESN'T SEEM TO WORK.",       // USE_MESSAGE
 };
 
 const int INVCOORDS[][4] = {


Commit: ac4360af88d2dfec53fc00677c0284b8ab849b86
    https://github.com/scummvm/scummvm/commit/ac4360af88d2dfec53fc00677c0284b8ab849b86
Author: Max Horn (max at quendi.de)
Date: 2015-07-19T17:12:05+02:00

Commit Message:
SCUMM: Get rid of unused Audio::mixer references

Changed paths:
    engines/scumm/players/player_ad.cpp
    engines/scumm/players/player_ad.h
    engines/scumm/scumm.cpp



diff --git a/engines/scumm/players/player_ad.cpp b/engines/scumm/players/player_ad.cpp
index 5c0d443..4d4be2c 100644
--- a/engines/scumm/players/player_ad.cpp
+++ b/engines/scumm/players/player_ad.cpp
@@ -27,6 +27,7 @@
 #include "scumm/saveload.h"
 
 #include "audio/fmopl.h"
+#include "audio/mixer.h"
 
 #include "common/textconsole.h"
 #include "common/config-manager.h"
@@ -35,8 +36,8 @@ namespace Scumm {
 
 #define AD_CALLBACK_FREQUENCY 472
 
-Player_AD::Player_AD(ScummEngine *scumm, Audio::Mixer *mixer)
-	: _vm(scumm), _mixer(mixer) {
+Player_AD::Player_AD(ScummEngine *scumm)
+	: _vm(scumm) {
 	_opl2 = OPL::Config::create();
 	if (!_opl2->init()) {
 		error("Could not initialize OPL2 emulator");
diff --git a/engines/scumm/players/player_ad.h b/engines/scumm/players/player_ad.h
index b8cd8dc..63fda3c 100644
--- a/engines/scumm/players/player_ad.h
+++ b/engines/scumm/players/player_ad.h
@@ -26,7 +26,6 @@
 #include "scumm/music.h"
 
 #include "audio/audiostream.h"
-#include "audio/mixer.h"
 
 #include "common/mutex.h"
 
@@ -43,7 +42,7 @@ class ScummEngine;
  */
 class Player_AD : public MusicEngine {
 public:
-	Player_AD(ScummEngine *scumm, Audio::Mixer *mixer);
+	Player_AD(ScummEngine *scumm);
 	virtual ~Player_AD();
 
 	// MusicEngine API
@@ -62,7 +61,6 @@ public:
 private:
 	ScummEngine *const _vm;
 	Common::Mutex _mutex;
-	Audio::Mixer *const _mixer;
 
 	void setupVolume();
 	int _musicVolume;
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index c2e0cb2..24d676a 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1905,7 +1905,7 @@ void ScummEngine::setupMusic(int midi) {
 		// EGA/VGA. However, we support multi MIDI for that game and we cannot
 		// support this with the Player_AD code at the moment. The reason here
 		// is that multi MIDI is supported internally by our iMuse output.
-		_musicEngine = new Player_AD(this, _mixer);
+		_musicEngine = new Player_AD(this);
 	} else if (_game.version >= 3 && _game.heversion <= 62) {
 		MidiDriver *nativeMidiDriver = 0;
 		MidiDriver *adlibMidiDriver = 0;


Commit: ac2c01880e7b61a1c21b660ef8ce9afc3a21e3c6
    https://github.com/scummvm/scummvm/commit/ac2c01880e7b61a1c21b660ef8ce9afc3a21e3c6
Author: Max Horn (max at quendi.de)
Date: 2015-07-19T17:12:05+02:00

Commit Message:
SHERLOCK: Avoid non-ASCII characters in string constants

How such string constants are compiled into code depends on the encoding
used for the source file, which easily is changed by accident (e.g.
between UTF-8 and Latin-1 encoding). Better to explicitly encode the
character codes, as is already done for various other text messages.

Changed paths:
    engines/sherlock/scalpel/scalpel_fixed_text.cpp



diff --git a/engines/sherlock/scalpel/scalpel_fixed_text.cpp b/engines/sherlock/scalpel/scalpel_fixed_text.cpp
index 465940c..63f84d6 100644
--- a/engines/sherlock/scalpel/scalpel_fixed_text.cpp
+++ b/engines/sherlock/scalpel/scalpel_fixed_text.cpp
@@ -264,7 +264,7 @@ static const char *const fixedTextDE_ActionPick[] = {
 	"Diese Blumen geh\224ren Penny",
 	"Sie ist doch viel zu jung f\201r Dich!",
 	"Ich denke, Du stehst mehr auf M\204dchen ?",
-	"Staatseigentum - Nur für den Dienstgebrauch !"
+	"Staatseigentum - Nur f\201r den Dienstgebrauch !"
 };
 
 static const char *const fixedTextES_ActionPick[] = {
@@ -291,8 +291,8 @@ static const char *const fixedTextDE_ActionUse[] = {
 	"Nein, das geht wirklich nicht",
 	"Tja keinerlei Wirkung",
 	"Da kommst du nicht dran",
-	"Na gut, die Tür sieht jetzt gr\224\341er aus. Zufrieden?",
-	"Türen sind Nichtraucher!"
+	"Na gut, die T\201r sieht jetzt gr\224\341er aus. Zufrieden?",
+	"T\201ren sind Nichtraucher!"
 };
 
 static const char *const fixedTextES_ActionUse[] = {


Commit: 856475067a0f78449db213afb79390e8fb7c095d
    https://github.com/scummvm/scummvm/commit/856475067a0f78449db213afb79390e8fb7c095d
Author: Max Horn (max at quendi.de)
Date: 2015-07-19T17:13:18+02:00

Commit Message:
MISC: Remove some unused private member variables

Changed paths:
    engines/agos/drivers/accolade/adlib.cpp
    engines/zvision/scripting/actions.h
    engines/zvision/scripting/controls/input_control.cpp
    engines/zvision/scripting/controls/input_control.h
    image/codecs/cinepak.h



diff --git a/engines/agos/drivers/accolade/adlib.cpp b/engines/agos/drivers/accolade/adlib.cpp
index d227106..294be2b 100644
--- a/engines/agos/drivers/accolade/adlib.cpp
+++ b/engines/agos/drivers/accolade/adlib.cpp
@@ -171,9 +171,6 @@ private:
 
 	bool _isOpen;
 
-	// points to a MIDI channel for each of the new voice channels
-	byte _voiceChannelMapping[AGOS_ADLIB_VOICES_COUNT];
-
 	// stores information about all FM voice channels
 	ChannelEntry _channels[AGOS_ADLIB_VOICES_COUNT];
 
diff --git a/engines/zvision/scripting/actions.h b/engines/zvision/scripting/actions.h
index ff19fc5..bde1baa 100644
--- a/engines/zvision/scripting/actions.h
+++ b/engines/zvision/scripting/actions.h
@@ -269,7 +269,6 @@ public:
 	bool execute();
 
 private:
-	uint32 _animationKey;
 	uint32 _controlKey;
 	uint32 _x1;
 	uint32 _y1;
diff --git a/engines/zvision/scripting/controls/input_control.cpp b/engines/zvision/scripting/controls/input_control.cpp
index df0c77b..9525333 100644
--- a/engines/zvision/scripting/controls/input_control.cpp
+++ b/engines/zvision/scripting/controls/input_control.cpp
@@ -43,7 +43,6 @@ InputControl::InputControl(ZVision *engine, uint32 key, Common::SeekableReadStre
 	  _nextTabstop(0),
 	  _focused(false),
 	  _textChanged(false),
-	  _cursorOffset(0),
 	  _enterPressed(false),
 	  _readOnly(false),
 	  _txtWidth(0),
diff --git a/engines/zvision/scripting/controls/input_control.h b/engines/zvision/scripting/controls/input_control.h
index 9b48514..6abdb3c 100644
--- a/engines/zvision/scripting/controls/input_control.h
+++ b/engines/zvision/scripting/controls/input_control.h
@@ -51,15 +51,12 @@ private:
 
 	Common::String _currentInputText;
 	bool _textChanged;
-	uint _cursorOffset;
 	bool _enterPressed;
 	bool _readOnly;
 
 	int16 _txtWidth;
 	int16 _maxTxtWidth;
 	Video::VideoDecoder *_animation;
-	int32 _frameDelay;
-	int16 _frame;
 
 public:
 	void focus() {
diff --git a/image/codecs/cinepak.h b/image/codecs/cinepak.h
index 3ca8f51..4efb119 100644
--- a/image/codecs/cinepak.h
+++ b/image/codecs/cinepak.h
@@ -91,7 +91,6 @@ private:
 
 	byte *_ditherPalette;
 	bool _dirtyPalette;
-	byte *_rgbLookup;
 	byte *_colorMap;
 	DitherType _ditherType;
 


Commit: fad3b425b93f1bd4480847542faf2e97a389c5a5
    https://github.com/scummvm/scummvm/commit/fad3b425b93f1bd4480847542faf2e97a389c5a5
Author: Max Horn (max at quendi.de)
Date: 2015-07-19T17:13:38+02:00

Commit Message:
AGI: Disable unused palettes for compilation

Changed paths:
    engines/agi/graphics.cpp



diff --git a/engines/agi/graphics.cpp b/engines/agi/graphics.cpp
index 32d0fdc..c5cede7 100644
--- a/engines/agi/graphics.cpp
+++ b/engines/agi/graphics.cpp
@@ -72,6 +72,7 @@ static const uint8 egaPalette[16 * 3] = {
  * from Donald Duck's Playground (1986) to Manhunter II (1989).
  * 16 RGB colors. 3 bits per color component.
  */
+#if 0
 static const uint8 atariStAgiPalette[16 * 3] = {
 	0x0, 0x0, 0x0,
 	0x0, 0x0, 0x7,
@@ -90,6 +91,7 @@ static const uint8 atariStAgiPalette[16 * 3] = {
 	0x7, 0x7, 0x4,
 	0x7, 0x7, 0x7
 };
+#endif
 
 /**
  * Second generation Apple IIGS AGI palette.
@@ -109,6 +111,8 @@ static const uint8 atariStAgiPalette[16 * 3] = {
  * 3.001 (Black Cauldron        v1.0O 1989-02-24 (CE))
  * 3.003 (Gold Rush!            v1.0M 1989-02-28 (CE))
  */
+#if 0
+// FIXME: Identical to amigaAgiPaletteV2
 static const uint8 appleIIgsAgiPaletteV2[16 * 3] = {
 	0x0, 0x0, 0x0,
 	0x0, 0x0, 0xF,
@@ -127,6 +131,7 @@ static const uint8 appleIIgsAgiPaletteV2[16 * 3] = {
 	0xE, 0xE, 0x0,
 	0xF, 0xF, 0xF
 };
+#endif
 
 /**
  * First generation Amiga & Apple IIGS AGI palette.


Commit: e1dd57e016bfd9b20e389ecc69f089dfe59b2d86
    https://github.com/scummvm/scummvm/commit/e1dd57e016bfd9b20e389ecc69f089dfe59b2d86
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2015-07-20T20:02:44+02:00

Commit Message:
Merge pull request #603 from fingolfin/fix-warnings

Fix some warnings

Changed paths:
    engines/access/resources.cpp
    engines/agi/graphics.cpp
    engines/agos/drivers/accolade/adlib.cpp
    engines/gob/sound/adlib.cpp
    engines/gob/sound/adlib.h
    engines/gob/sound/adlplayer.cpp
    engines/gob/sound/adlplayer.h
    engines/gob/sound/musplayer.cpp
    engines/gob/sound/musplayer.h
    engines/gob/sound/sound.cpp
    engines/scumm/players/player_ad.cpp
    engines/scumm/players/player_ad.h
    engines/scumm/scumm.cpp
    engines/sherlock/scalpel/scalpel_fixed_text.cpp
    engines/zvision/scripting/actions.h
    engines/zvision/scripting/controls/input_control.cpp
    engines/zvision/scripting/controls/input_control.h
    image/codecs/cinepak.h









More information about the Scummvm-git-logs mailing list