Merge pull request #540 from lioncash/banner

Centralize some common banner loader class members.

Source/Core/DiscIO/BannerLoader.h

@@ -17,23 +17,29 @@ class IVolume;
 
 class IBannerLoader
 {
-	public:
+public:
-
 	IBannerLoader()
+		: m_pBannerFile(nullptr)
+		, m_IsValid(false)
 	{}
 
-
 	virtual ~IBannerLoader()
 	{}
 
-
-		virtual bool IsValid() = 0;
-
 	virtual std::vector<u32> GetBanner(int* pWidth, int* pHeight) = 0;
 
 	virtual std::vector<std::string> GetNames() = 0;
 	virtual std::string GetCompany() = 0;
 	virtual std::vector<std::string> GetDescriptions() = 0;
+
+	bool IsValid()
+	{
+		return m_IsValid;
+	}
+
+protected:
+	bool m_IsValid;
+	u8* m_pBannerFile;
 };
 
 IBannerLoader* CreateBannerLoader(DiscIO::IFileSystem& _rFileSystem, DiscIO::IVolume *pVolume);

Source/Core/DiscIO/BannerLoaderGC.cpp

@@ -16,9 +16,7 @@
 namespace DiscIO
 {
 CBannerLoaderGC::CBannerLoaderGC(DiscIO::IFileSystem& _rFileSystem, DiscIO::IVolume* volume)
-	: m_pBannerFile(nullptr)
+	: m_country(volume->GetCountry())
-	, m_IsValid(false)
-	, m_country(volume->GetCountry())
 {
 	// load the opening.bnr
 	size_t FileSize = (size_t) _rFileSystem.GetFileSize("opening.bnr");
@@ -49,12 +47,6 @@ CBannerLoaderGC::~CBannerLoaderGC()
 	}
 }
 
-
-bool CBannerLoaderGC::IsValid()
-{
-	return m_IsValid;
-}
-
 std::vector<u32> CBannerLoaderGC::GetBanner(int* pWidth, int* pHeight)
 {
 	std::vector<u32> Buffer;

Source/Core/DiscIO/BannerLoaderGC.h

@@ -22,19 +22,17 @@ class IFileSystem;
 class CBannerLoaderGC
 	: public IBannerLoader
 {
-	public:
+public:
 	CBannerLoaderGC(DiscIO::IFileSystem& _rFileSystem, DiscIO::IVolume* volume);
 	virtual ~CBannerLoaderGC();
 
-		virtual bool IsValid() override;
-
 	virtual std::vector<u32> GetBanner(int* pWidth, int* pHeight) override;
 
 	virtual std::vector<std::string> GetNames() override;
 	virtual std::string GetCompany() override;
 	virtual std::vector<std::string> GetDescriptions() override;
 
-	private:
+private:
 	enum
 	{
 		DVD_BANNER_WIDTH  = 96,
@@ -79,10 +77,7 @@ class CBannerLoaderGC
 		return string_decoder(std::string(data, strnlen(data, sizeof(data))));
 	}
 
-		u8* m_pBannerFile;
-		bool m_IsValid;
 	BANNER_TYPE m_BNRType;
-
 	BANNER_TYPE getBannerType();
 
 	DiscIO::IVolume::ECountry const m_country;

Source/Core/DiscIO/BannerLoaderWii.cpp

@@ -21,8 +21,6 @@ namespace DiscIO
 {
 
 CBannerLoaderWii::CBannerLoaderWii(DiscIO::IVolume *pVolume)
-	: m_pBannerFile(nullptr)
-	, m_IsValid(false)
 {
 	u64 TitleID;
 	pVolume->GetTitleID((u8*)&TitleID);
@@ -95,11 +93,6 @@ CBannerLoaderWii::~CBannerLoaderWii()
 	}
 }
 
-bool CBannerLoaderWii::IsValid()
-{
-	return m_IsValid;
-}
-
 std::vector<u32> CBannerLoaderWii::GetBanner(int* pWidth, int* pHeight)
 {
 	SWiiBanner* pBanner = (SWiiBanner*)m_pBannerFile;

Source/Core/DiscIO/BannerLoaderWii.h

@@ -18,22 +18,18 @@ class IVolume;
 class CBannerLoaderWii
 	: public IBannerLoader
 {
-	public:
+public:
-
 	CBannerLoaderWii(DiscIO::IVolume *pVolume);
 
 	virtual ~CBannerLoaderWii();
 
-		virtual bool IsValid() override;
-
 	virtual std::vector<u32> GetBanner(int* pWidth, int* pHeight) override;
 
 	virtual std::vector<std::string> GetNames() override;
 	virtual std::string GetCompany() override;
 	virtual std::vector<std::string> GetDescriptions() override;
 
-	private:
+private:
-
 	enum
 	{
 		TEXTURE_SIZE = 192 * 64 * 2,
@@ -59,11 +55,7 @@ class CBannerLoaderWii
 		u16 m_Comment[2][COMMENT_SIZE];
 		u8  m_BannerTexture[TEXTURE_SIZE];
 		u8  m_IconTexture[8][ICON_SIZE];
-		} ;
+	};
-
-		u8* m_pBannerFile;
-
-		bool m_IsValid;
 
 	bool GetStringFromComments(const CommentIndex index, std::string& s);
 };