[Scummvm-git-logs] scummvm master -> cb7c6fb83e3b3180cfa3fc8689f452a85c9c95ea

bluegr bluegr at gmail.com
Tue Mar 16 00:44:39 UTC 2021


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

Summary:
cb7c6fb83e DRAGONS: Remove unused private member


Commit: cb7c6fb83e3b3180cfa3fc8689f452a85c9c95ea
    https://github.com/scummvm/scummvm/commit/cb7c6fb83e3b3180cfa3fc8689f452a85c9c95ea
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-03-16T02:44:37+02:00

Commit Message:
DRAGONS: Remove unused private member

Reported by Clang.

Changed paths:
    engines/dragons/midimusicplayer.cpp
    engines/dragons/midimusicplayer.h
    engines/dragons/sound.cpp


diff --git a/engines/dragons/midimusicplayer.cpp b/engines/dragons/midimusicplayer.cpp
index 5b4769be62..3559d75d6c 100644
--- a/engines/dragons/midimusicplayer.cpp
+++ b/engines/dragons/midimusicplayer.cpp
@@ -31,7 +31,7 @@
 
 namespace Dragons {
 
-MidiMusicPlayer::MidiMusicPlayer(BigfileArchive *bigFileArchive, VabSound *musicVab): _musicVab(musicVab), _midiDataSize(0) {
+MidiMusicPlayer::MidiMusicPlayer(BigfileArchive *bigFileArchive): _midiDataSize(0) {
 	_midiData = nullptr;
 	MidiPlayer::createDriver(MDT_PREFER_FLUID | MDT_MIDI);
 
diff --git a/engines/dragons/midimusicplayer.h b/engines/dragons/midimusicplayer.h
index fa6d450c0e..878ca97460 100644
--- a/engines/dragons/midimusicplayer.h
+++ b/engines/dragons/midimusicplayer.h
@@ -30,10 +30,9 @@ namespace Dragons {
 
 class MidiMusicPlayer : public Audio::MidiPlayer {
 private:
-	VabSound *_musicVab;
 	uint32 _midiDataSize;
 public:
-	MidiMusicPlayer(BigfileArchive *bigFileArchive, VabSound *musicVab);
+	MidiMusicPlayer(BigfileArchive *bigFileArchive);
 	~MidiMusicPlayer();
 
 	void setVolume(int volume) override;
diff --git a/engines/dragons/sound.cpp b/engines/dragons/sound.cpp
index 4a3c4aa82c..093a214556 100644
--- a/engines/dragons/sound.cpp
+++ b/engines/dragons/sound.cpp
@@ -293,7 +293,7 @@ SoundManager::SoundManager(DragonsEngine *vm, BigfileArchive *bigFileArchive, Dr
 
 	SomeInitSound_FUN_8003f64c();
 	initVabData();
-	_midiPlayer = new MidiMusicPlayer(_bigFileArchive, _vabMusx);
+	_midiPlayer = new MidiMusicPlayer(_bigFileArchive);
 
 	syncSoundSettings();
 }




More information about the Scummvm-git-logs mailing list