A bit of cleanup

Author: electricbrass

client/sdl/i_musicsystem_adlmidi.h

@@ -36,7 +36,7 @@ struct AdlMidiHookData
 /**
  * @brief Plays music utilizing the libADLMIDI music library.
  */
-class AdlMidiMusicSystem : public MidiMusicSystem
+class AdlMidiMusicSystem : public MusicSystem
 {
   public:
 	AdlMidiMusicSystem();
@@ -54,13 +54,9 @@ class AdlMidiMusicSystem : public MidiMusicSystem
 
 	void applyCVars();
 
-	// TODO: actually see if these need real implementations
-	void writeVolume(int time, byte channel, byte volume) override {};
-	void writeControl(int time, byte channel, byte control, byte value) override {};
-	void writeChannel(int time, byte channel, byte status, byte param1, byte param2 = 0) override {};
-	void writeSysEx(int time, const byte *data, size_t length) override {};
-	void allNotesOff() override {};
-	void allSoundOff() override {};
+	// Only plays midi-type music
+	bool isMusCapable() const override { return true; }
+	bool isMidiCapable() const override { return true; }
 
   private:
 	bool m_isInitialized = false;

client/sdl/i_musicsystem_au.h

@@ -41,20 +41,20 @@ class AuMusicSystem : public MusicSystem
 {
   public:
 	AuMusicSystem();
-	virtual ~AuMusicSystem();
+	~AuMusicSystem() override;
 
-	virtual void startSong(byte* data, size_t length, bool loop);
-	virtual void stopSong();
-	virtual void pauseSong();
-	virtual void resumeSong();
-	virtual void playChunk() { }
-	virtual void setVolume(float volume);
+	void startSong(byte* data, size_t length, bool loop) override;
+	void stopSong() override;
+	void pauseSong() override;
+	void resumeSong() override;
+	void playChunk() override { }
+	void setVolume(float volume) override;
 
-	virtual bool isInitialized() const { return m_isInitialized; }
+	bool isInitialized() const override { return m_isInitialized; }
 
 	// Only plays midi-type music
-	virtual bool isMusCapable() const { return true; }
-	virtual bool isMidiCapable() const { return true; }
+	bool isMusCapable() const override { return true; }
+	bool isMidiCapable() const override { return true; }
 
   private:
 	bool m_isInitialized;

client/sdl/i_musicsystem_sdl.h

@@ -35,23 +35,23 @@ class SdlMixerMusicSystem : public MusicSystem
 {
   public:
 	SdlMixerMusicSystem();
-	virtual ~SdlMixerMusicSystem();
-
-	virtual void startSong(byte* data, size_t length, bool loop);
-	virtual void stopSong();
-	virtual void pauseSong();
-	virtual void resumeSong();
-	virtual void playChunk() { }
-	virtual void setVolume(float volume);
-
-	virtual bool isInitialized() const { return m_isInitialized; }
-
-	virtual bool isMusCapable() const { return true; }
-	virtual bool isMidiCapable() const { return true; }
-	virtual bool isOggCapable() const { return true; }
-	virtual bool isMp3Capable() const { return true; }
-	virtual bool isModCapable() const { return true; }
-	virtual bool isWaveCapable() const { return true; }
+	~SdlMixerMusicSystem() override;
+
+	void startSong(byte* data, size_t length, bool loop) override ;
+	void stopSong() override ;
+	void pauseSong() override ;
+	void resumeSong() override ;
+	void playChunk()  override { }
+	void setVolume(float volume) override ;
+
+	bool isInitialized() const override { return m_isInitialized; }
+
+	bool isMusCapable() const override { return true; }
+	bool isMidiCapable() const override { return true; }
+	bool isOggCapable() const override { return true; }
+	bool isMp3Capable() const override { return true; }
+	bool isModCapable() const override { return true; }
+	bool isWaveCapable() const override { return true; }
 
   private:
 	bool m_isInitialized;