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

[bluegr]

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:
f4776255b0 VIDEO: Add missing override keywords to the PSX video decoder


Commit: f4776255b06adbf7ebdaff8dba61a5ddbd2a72fc
    https://github.com/scummvm/scummvm/commit/f4776255b06adbf7ebdaff8dba61a5ddbd2a72fc
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-02-02T20:29:33+02:00

Commit Message:
VIDEO: Add missing override keywords to the PSX video decoder

Changed paths:
    video/psx_decoder.h


diff --git a/video/psx_decoder.h b/video/psx_decoder.h
index f4914f3c913..0199fb91862 100644
--- a/video/psx_decoder.h
+++ b/video/psx_decoder.h
@@ -65,30 +65,33 @@ public:
 	};
 
 	PSXStreamDecoder(CDSpeed speed, uint32 frameCount = 0);
-	virtual ~PSXStreamDecoder();
+	virtual ~PSXStreamDecoder() override;
 
-	bool loadStream(Common::SeekableReadStream *stream);
-	void close();
+	bool loadStream(Common::SeekableReadStream *stream) override;
+	void close() override;
 
 protected:
-	void readNextPacket();
-	bool useAudioSync() const;
+	void readNextPacket() override;
+	bool useAudioSync() const override;
 
 private:
 	class PSXVideoTrack : public VideoTrack {
 	public:
 		PSXVideoTrack(Common::SeekableReadStream *firstSector, CDSpeed speed, int frameCount);
-		~PSXVideoTrack();
-
-		uint16 getWidth() const { return _width; }
-		uint16 getHeight() const { return _height; }
-		Graphics::PixelFormat getPixelFormat() const { return _pixelFormat; }
-		bool setOutputPixelFormat(const Graphics::PixelFormat &format) { _pixelFormat = format; return true; }
-		bool endOfTrack() const { return _endOfTrack; }
-		int getCurFrame() const { return _curFrame; }
-		int getFrameCount() const { return _frameCount; }
-		uint32 getNextFrameStartTime() const;
-		const Graphics::Surface *decodeNextFrame();
+		~PSXVideoTrack() override;
+
+		uint16 getWidth() const override { return _width; }
+		uint16 getHeight() const override { return _height; }
+		Graphics::PixelFormat getPixelFormat() const override { return _pixelFormat; }
+		bool setOutputPixelFormat(const Graphics::PixelFormat &format) override {
+			_pixelFormat = format;
+			return true;
+		}
+		bool endOfTrack() const override { return _endOfTrack; }
+		int getCurFrame() const override { return _curFrame; }
+		int getFrameCount() const override { return _frameCount; }
+		uint32 getNextFrameStartTime() const override;
+		const Graphics::Surface *decodeNextFrame() override;
 
 		void setEndOfTrack() { _endOfTrack = true; }
 		void decodeFrame(Common::BitStreamMemoryStream *frame, uint sectorCount);
@@ -131,15 +134,15 @@ private:
 	class PSXAudioTrack : public AudioTrack {
 	public:
 		PSXAudioTrack(Common::SeekableReadStream *sector, Audio::Mixer::SoundType soundType);
-		~PSXAudioTrack();
+		~PSXAudioTrack() override;
 
-		bool endOfTrack() const;
+		bool endOfTrack() const override;
 
 		void setEndOfTrack() { _endOfTrack = true; }
 		void queueAudioFromSector(Common::SeekableReadStream *sector);
 
 	private:
-		Audio::AudioStream *getAudioStream() const;
+		Audio::AudioStream *getAudioStream() const override;
 
 		Audio::QueuingAudioStream *_audStream;