mirror of
https://github.com/RetroDECK/ES-DE.git
synced 2024-11-22 06:05:38 +00:00
Removed a lot of unnecessary combinations of the virtual and override keywords.
This commit is contained in:
parent
ec0a7ad2f1
commit
dfeddebc66
|
@ -20,11 +20,11 @@ public:
|
|||
MediaViewer();
|
||||
virtual ~MediaViewer();
|
||||
|
||||
virtual bool startMediaViewer(FileData* game) override;
|
||||
virtual void stopMediaViewer() override;
|
||||
bool startMediaViewer(FileData* game) override;
|
||||
void stopMediaViewer() override;
|
||||
|
||||
virtual void update(int deltaTime) override;
|
||||
virtual void render(const glm::mat4& parentTrans) override;
|
||||
void update(int deltaTime) override;
|
||||
void render(const glm::mat4& parentTrans) override;
|
||||
|
||||
private:
|
||||
void initiateViewer();
|
||||
|
@ -33,8 +33,8 @@ private:
|
|||
void playVideo();
|
||||
void showImage(int index);
|
||||
|
||||
virtual void showNext() override;
|
||||
virtual void showPrevious() override;
|
||||
void showNext() override;
|
||||
void showPrevious() override;
|
||||
|
||||
Window* mWindow;
|
||||
FileData* mGame;
|
||||
|
|
|
@ -24,8 +24,8 @@ private:
|
|||
void updateMenu(const std::string& systemName, const std::string& label, bool defaultEmulator);
|
||||
void selectorWindow(SystemData* system);
|
||||
|
||||
virtual bool input(InputConfig* config, Input input) override;
|
||||
virtual std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
bool input(InputConfig* config, Input input) override;
|
||||
std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
HelpStyle getHelpStyle() override;
|
||||
|
||||
MenuComponent mMenu;
|
||||
|
|
|
@ -29,7 +29,7 @@ public:
|
|||
|
||||
bool input(InputConfig* config, Input input) override;
|
||||
|
||||
virtual std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
HelpStyle getHelpStyle() override;
|
||||
|
||||
private:
|
||||
|
|
|
@ -28,9 +28,9 @@ public:
|
|||
GuiGamelistOptions(Window* window, SystemData* system);
|
||||
virtual ~GuiGamelistOptions();
|
||||
|
||||
virtual bool input(InputConfig* config, Input input) override;
|
||||
virtual std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
virtual HelpStyle getHelpStyle() override;
|
||||
bool input(InputConfig* config, Input input) override;
|
||||
std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
HelpStyle getHelpStyle() override;
|
||||
|
||||
private:
|
||||
void openGamelistFilter();
|
||||
|
|
|
@ -24,13 +24,13 @@ public:
|
|||
GuiLaunchScreen();
|
||||
virtual ~GuiLaunchScreen();
|
||||
|
||||
virtual void displayLaunchScreen(FileData* game) override;
|
||||
virtual void closeLaunchScreen() override;
|
||||
void displayLaunchScreen(FileData* game) override;
|
||||
void closeLaunchScreen() override;
|
||||
|
||||
void onSizeChanged() override;
|
||||
|
||||
virtual void update(int deltaTime) override;
|
||||
virtual void render(const glm::mat4& parentTrans) override;
|
||||
void update(int deltaTime) override;
|
||||
void render(const glm::mat4& parentTrans) override;
|
||||
|
||||
private:
|
||||
Window* mWindow;
|
||||
|
|
|
@ -37,7 +37,7 @@ public:
|
|||
bool input(InputConfig* config, Input input) override;
|
||||
void onSizeChanged() override;
|
||||
|
||||
virtual std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
HelpStyle getHelpStyle() override;
|
||||
|
||||
private:
|
||||
|
|
|
@ -29,7 +29,7 @@ private:
|
|||
void onSizeChanged() override;
|
||||
void update(int deltaTime) override;
|
||||
|
||||
virtual std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
HelpStyle getHelpStyle() override;
|
||||
|
||||
std::queue<FileData*> mGameQueue;
|
||||
|
|
|
@ -29,7 +29,7 @@ public:
|
|||
bool input(InputConfig* config, Input input) override;
|
||||
void update(int deltaTime) override;
|
||||
|
||||
virtual std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
HelpStyle getHelpStyle() override;
|
||||
|
||||
private:
|
||||
|
|
|
@ -109,7 +109,7 @@ class ScraperHttpRequest : public ScraperRequest
|
|||
{
|
||||
public:
|
||||
ScraperHttpRequest(std::vector<ScraperSearchResult>& resultsWrite, const std::string& url);
|
||||
virtual void update() override;
|
||||
void update() override;
|
||||
|
||||
protected:
|
||||
virtual void process(const std::unique_ptr<HttpReq>& req,
|
||||
|
|
|
@ -57,8 +57,8 @@ public:
|
|||
SystemView(Window* window);
|
||||
~SystemView();
|
||||
|
||||
virtual void onShow() override { mShowing = true; }
|
||||
virtual void onHide() override { mShowing = false; }
|
||||
void onShow() override { mShowing = true; }
|
||||
void onHide() override { mShowing = false; }
|
||||
|
||||
void goToSystem(SystemData* system, bool animate);
|
||||
|
||||
|
@ -69,13 +69,13 @@ public:
|
|||
void onThemeChanged(const std::shared_ptr<ThemeData>& theme);
|
||||
|
||||
std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
virtual HelpStyle getHelpStyle() override;
|
||||
HelpStyle getHelpStyle() override;
|
||||
|
||||
CarouselType getCarouselType() { return mCarousel.type; }
|
||||
|
||||
protected:
|
||||
void onCursorChanged(const CursorState& state) override;
|
||||
virtual void onScroll() override
|
||||
void onScroll() override
|
||||
{
|
||||
NavigationSounds::getInstance().playThemeNavigationSound(SYSTEMBROWSESOUND);
|
||||
}
|
||||
|
|
|
@ -18,39 +18,36 @@ public:
|
|||
BasicGamelistView(Window* window, FileData* root);
|
||||
|
||||
// Called when a FileData* is added, has its metadata changed, or is removed.
|
||||
virtual void onFileChanged(FileData* file, bool reloadGamelist) override;
|
||||
void onFileChanged(FileData* file, bool reloadGamelist) override;
|
||||
|
||||
virtual void onThemeChanged(const std::shared_ptr<ThemeData>& theme) override;
|
||||
virtual void setCursor(FileData* cursor) override;
|
||||
void onThemeChanged(const std::shared_ptr<ThemeData>& theme) override;
|
||||
void setCursor(FileData* cursor) override;
|
||||
|
||||
virtual FileData* getCursor() override { return mList.getSelected(); }
|
||||
virtual FileData* getNextEntry() override { return mList.getNext(); }
|
||||
virtual FileData* getPreviousEntry() override { return mList.getPrevious(); }
|
||||
virtual FileData* getFirstEntry() override { return mList.getFirst(); }
|
||||
virtual FileData* getLastEntry() override { return mList.getLast(); }
|
||||
virtual FileData* getFirstGameEntry() override { return mFirstGameEntry; }
|
||||
FileData* getCursor() override { return mList.getSelected(); }
|
||||
FileData* getNextEntry() override { return mList.getNext(); }
|
||||
FileData* getPreviousEntry() override { return mList.getPrevious(); }
|
||||
FileData* getFirstEntry() override { return mList.getFirst(); }
|
||||
FileData* getLastEntry() override { return mList.getLast(); }
|
||||
FileData* getFirstGameEntry() override { return mFirstGameEntry; }
|
||||
|
||||
virtual std::string getName() const override { return "basic"; }
|
||||
std::string getName() const override { return "basic"; }
|
||||
|
||||
virtual std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
|
||||
virtual bool isListScrolling() override { return mList.isScrolling(); }
|
||||
virtual void stopListScrolling() override { mList.stopScrolling(); }
|
||||
bool isListScrolling() override { return mList.isScrolling(); }
|
||||
void stopListScrolling() override { mList.stopScrolling(); }
|
||||
|
||||
virtual const std::vector<std::string>& getFirstLetterIndex() override
|
||||
{
|
||||
return mFirstLetterIndex;
|
||||
}
|
||||
const std::vector<std::string>& getFirstLetterIndex() override { return mFirstLetterIndex; }
|
||||
|
||||
virtual void addPlaceholder(FileData* firstEntry = nullptr) override;
|
||||
virtual void launch(FileData* game) override;
|
||||
void addPlaceholder(FileData* firstEntry = nullptr) override;
|
||||
void launch(FileData* game) override;
|
||||
|
||||
protected:
|
||||
virtual std::string getQuickSystemSelectRightButton() override { return "right"; }
|
||||
virtual std::string getQuickSystemSelectLeftButton() override { return "left"; }
|
||||
virtual void populateList(const std::vector<FileData*>& files, FileData* firstEntry) override;
|
||||
virtual void remove(FileData* game, bool deleteFile) override;
|
||||
virtual void removeMedia(FileData* game) override;
|
||||
std::string getQuickSystemSelectRightButton() override { return "right"; }
|
||||
std::string getQuickSystemSelectLeftButton() override { return "left"; }
|
||||
void populateList(const std::vector<FileData*>& files, FileData* firstEntry) override;
|
||||
void remove(FileData* game, bool deleteFile) override;
|
||||
void removeMedia(FileData* game) override;
|
||||
|
||||
TextListComponent<FileData*> mList;
|
||||
// Points to the first game in the list, i.e. the first entry which is of the type 'GAME'.
|
||||
|
|
|
@ -20,15 +20,15 @@ class DetailedGamelistView : public BasicGamelistView
|
|||
public:
|
||||
DetailedGamelistView(Window* window, FileData* root);
|
||||
|
||||
virtual void onShow() override;
|
||||
virtual void onThemeChanged(const std::shared_ptr<ThemeData>& theme) override;
|
||||
virtual std::string getName() const override { return "detailed"; }
|
||||
virtual void launch(FileData* game) override;
|
||||
void onShow() override;
|
||||
void onThemeChanged(const std::shared_ptr<ThemeData>& theme) override;
|
||||
std::string getName() const override { return "detailed"; }
|
||||
void launch(FileData* game) override;
|
||||
|
||||
virtual void preloadGamelist() override { updateInfoPanel(); }
|
||||
void preloadGamelist() override { updateInfoPanel(); }
|
||||
|
||||
protected:
|
||||
virtual void update(int deltaTime) override;
|
||||
void update(int deltaTime) override;
|
||||
|
||||
private:
|
||||
void updateInfoPanel();
|
||||
|
|
|
@ -24,47 +24,44 @@ public:
|
|||
virtual ~GridGamelistView() {}
|
||||
|
||||
// Called when a FileData* is added, has its metadata changed, or is removed.
|
||||
virtual void onFileChanged(FileData* file, bool reloadGamelist) override;
|
||||
void onFileChanged(FileData* file, bool reloadGamelist) override;
|
||||
|
||||
virtual void onShow() override;
|
||||
virtual void onThemeChanged(const std::shared_ptr<ThemeData>& theme) override;
|
||||
virtual void setCursor(FileData* cursor) override;
|
||||
void onShow() override;
|
||||
void onThemeChanged(const std::shared_ptr<ThemeData>& theme) override;
|
||||
void setCursor(FileData* cursor) override;
|
||||
|
||||
virtual FileData* getCursor() override { return mGrid.getSelected(); }
|
||||
virtual FileData* getNextEntry() override { return mGrid.getNext(); }
|
||||
virtual FileData* getPreviousEntry() override { return mGrid.getPrevious(); }
|
||||
virtual FileData* getFirstEntry() override { return mGrid.getFirst(); }
|
||||
virtual FileData* getLastEntry() override { return mGrid.getLast(); }
|
||||
virtual FileData* getFirstGameEntry() override { return firstGameEntry; }
|
||||
FileData* getCursor() override { return mGrid.getSelected(); }
|
||||
FileData* getNextEntry() override { return mGrid.getNext(); }
|
||||
FileData* getPreviousEntry() override { return mGrid.getPrevious(); }
|
||||
FileData* getFirstEntry() override { return mGrid.getFirst(); }
|
||||
FileData* getLastEntry() override { return mGrid.getLast(); }
|
||||
FileData* getFirstGameEntry() override { return firstGameEntry; }
|
||||
|
||||
virtual std::string getName() const override { return "grid"; }
|
||||
std::string getName() const override { return "grid"; }
|
||||
|
||||
virtual bool input(InputConfig* config, Input input) override;
|
||||
bool input(InputConfig* config, Input input) override;
|
||||
|
||||
virtual std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
virtual void launch(FileData* game) override;
|
||||
std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
void launch(FileData* game) override;
|
||||
|
||||
virtual bool isListScrolling() override { return mGrid.isScrolling(); }
|
||||
virtual void stopListScrolling() override
|
||||
bool isListScrolling() override { return mGrid.isScrolling(); }
|
||||
void stopListScrolling() override
|
||||
{
|
||||
mGrid.stopAllAnimations();
|
||||
mGrid.stopScrolling();
|
||||
}
|
||||
|
||||
virtual const std::vector<std::string>& getFirstLetterIndex() override
|
||||
{
|
||||
return mFirstLetterIndex;
|
||||
}
|
||||
const std::vector<std::string>& getFirstLetterIndex() override { return mFirstLetterIndex; }
|
||||
|
||||
virtual void addPlaceholder(FileData* firstEntry = nullptr) override;
|
||||
void addPlaceholder(FileData* firstEntry = nullptr) override;
|
||||
|
||||
protected:
|
||||
virtual std::string getQuickSystemSelectRightButton() override { return "rightshoulder"; }
|
||||
virtual std::string getQuickSystemSelectLeftButton() override { return "leftshoulder"; }
|
||||
virtual void populateList(const std::vector<FileData*>& files, FileData* firstEntry) override;
|
||||
virtual void remove(FileData* game, bool deleteFile) override;
|
||||
virtual void removeMedia(FileData* game) override;
|
||||
virtual void update(int deltaTime) override;
|
||||
std::string getQuickSystemSelectRightButton() override { return "rightshoulder"; }
|
||||
std::string getQuickSystemSelectLeftButton() override { return "leftshoulder"; }
|
||||
void populateList(const std::vector<FileData*>& files, FileData* firstEntry) override;
|
||||
void remove(FileData* game, bool deleteFile) override;
|
||||
void removeMedia(FileData* game) override;
|
||||
void update(int deltaTime) override;
|
||||
|
||||
ImageGridComponent<FileData*> mGrid;
|
||||
// Points to the first game in the list, i.e. the first entry which is of the type 'GAME'.
|
||||
|
|
|
@ -47,14 +47,14 @@ public:
|
|||
virtual void copyCursorHistory(std::vector<FileData*>& cursorHistory) = 0;
|
||||
virtual void populateCursorHistory(std::vector<FileData*>& cursorHistory) = 0;
|
||||
|
||||
virtual bool input(InputConfig* config, Input input) override;
|
||||
bool input(InputConfig* config, Input input) override;
|
||||
virtual void remove(FileData* game, bool deleteFile) = 0;
|
||||
virtual void removeMedia(FileData* game) = 0;
|
||||
|
||||
virtual std::string getName() const = 0;
|
||||
virtual void launch(FileData* game) = 0;
|
||||
|
||||
virtual HelpStyle getHelpStyle() override;
|
||||
HelpStyle getHelpStyle() override;
|
||||
|
||||
void render(const glm::mat4& parentTrans) override;
|
||||
|
||||
|
|
|
@ -22,16 +22,16 @@ public:
|
|||
virtual ~ISimpleGamelistView();
|
||||
|
||||
// Called when a FileData* is added, has its metadata changed, or is removed.
|
||||
virtual void onFileChanged(FileData* file, bool reloadGamelist) override;
|
||||
void onFileChanged(FileData* file, bool reloadGamelist) override;
|
||||
|
||||
// Called whenever the theme changes.
|
||||
virtual void onThemeChanged(const std::shared_ptr<ThemeData>& theme) override;
|
||||
void onThemeChanged(const std::shared_ptr<ThemeData>& theme) override;
|
||||
|
||||
virtual FileData* getCursor() override = 0;
|
||||
virtual void setCursor(FileData*) override = 0;
|
||||
virtual void addPlaceholder(FileData*) override = 0;
|
||||
|
||||
virtual bool input(InputConfig* config, Input input) override;
|
||||
bool input(InputConfig* config, Input input) override;
|
||||
virtual void launch(FileData* game) override = 0;
|
||||
|
||||
virtual const std::vector<std::string>& getFirstLetterIndex() override = 0;
|
||||
|
|
|
@ -23,15 +23,15 @@ public:
|
|||
VideoGamelistView(Window* window, FileData* root);
|
||||
virtual ~VideoGamelistView();
|
||||
|
||||
virtual void onShow() override;
|
||||
virtual void onThemeChanged(const std::shared_ptr<ThemeData>& theme) override;
|
||||
virtual std::string getName() const override { return "video"; }
|
||||
virtual void launch(FileData* game) override;
|
||||
void onShow() override;
|
||||
void onThemeChanged(const std::shared_ptr<ThemeData>& theme) override;
|
||||
std::string getName() const override { return "video"; }
|
||||
void launch(FileData* game) override;
|
||||
|
||||
virtual void preloadGamelist() override { updateInfoPanel(); }
|
||||
void preloadGamelist() override { updateInfoPanel(); }
|
||||
|
||||
protected:
|
||||
virtual void update(int deltaTime) override;
|
||||
void update(int deltaTime) override;
|
||||
|
||||
private:
|
||||
void updateInfoPanel();
|
||||
|
|
|
@ -45,7 +45,7 @@ public:
|
|||
bool input(InputConfig* config, Input input) override;
|
||||
void render(const glm::mat4& parentTrans) override;
|
||||
|
||||
virtual std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
|
||||
private:
|
||||
unsigned int getCurTextColor() const;
|
||||
|
|
|
@ -86,7 +86,7 @@ public:
|
|||
void onFocusLost() override;
|
||||
void onFocusGained() override;
|
||||
|
||||
virtual std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
|
||||
private:
|
||||
class GridEntry
|
||||
|
|
|
@ -74,7 +74,7 @@ public:
|
|||
bool input(InputConfig* config, Input input) override;
|
||||
void update(int deltaTime) override;
|
||||
void render(const glm::mat4& parentTrans) override;
|
||||
virtual std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
|
||||
void onSizeChanged() override;
|
||||
void onFocusGained() override { mFocused = true; }
|
||||
|
|
|
@ -38,10 +38,10 @@ public:
|
|||
void setFormat(const std::string& format);
|
||||
void setDisplayRelative(bool displayRelative);
|
||||
|
||||
virtual void applyTheme(const std::shared_ptr<ThemeData>& theme,
|
||||
const std::string& view,
|
||||
const std::string& element,
|
||||
unsigned int properties) override;
|
||||
void applyTheme(const std::shared_ptr<ThemeData>& theme,
|
||||
const std::string& view,
|
||||
const std::string& element,
|
||||
unsigned int properties) override;
|
||||
|
||||
protected:
|
||||
void onTextChanged() override;
|
||||
|
|
|
@ -58,7 +58,7 @@ public:
|
|||
// Force text to be uppercase when in DISP_RELATIVE_TO_NOW mode.
|
||||
void setUppercase(bool uppercase);
|
||||
|
||||
virtual std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
|
||||
private:
|
||||
std::shared_ptr<Font> getFont() const override;
|
||||
|
|
|
@ -28,10 +28,10 @@ public:
|
|||
GridTileComponent(Window* window);
|
||||
|
||||
void render(const glm::mat4& parentTrans) override;
|
||||
virtual void applyTheme(const std::shared_ptr<ThemeData>& theme,
|
||||
const std::string& view,
|
||||
const std::string& element,
|
||||
unsigned int properties) override;
|
||||
void applyTheme(const std::shared_ptr<ThemeData>& theme,
|
||||
const std::string& view,
|
||||
const std::string& element,
|
||||
unsigned int properties) override;
|
||||
|
||||
// Made this a static function because the ImageGridComponent needs to know the default tile
|
||||
// max size to calculate the grid dimension before it instantiates the GridTileComponents.
|
||||
|
@ -53,7 +53,7 @@ public:
|
|||
|
||||
glm::vec3 getBackgroundPosition();
|
||||
|
||||
virtual void update(int deltaTime) override;
|
||||
void update(int deltaTime) override;
|
||||
|
||||
std::shared_ptr<TextureResource> getTexture();
|
||||
|
||||
|
|
|
@ -91,12 +91,12 @@ public:
|
|||
|
||||
void render(const glm::mat4& parentTrans) override;
|
||||
|
||||
virtual void applyTheme(const std::shared_ptr<ThemeData>& theme,
|
||||
const std::string& view,
|
||||
const std::string& element,
|
||||
unsigned int properties) override;
|
||||
void applyTheme(const std::shared_ptr<ThemeData>& theme,
|
||||
const std::string& view,
|
||||
const std::string& element,
|
||||
unsigned int properties) override;
|
||||
|
||||
virtual std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
|
||||
private:
|
||||
glm::vec2 mTargetSize;
|
||||
|
|
|
@ -76,7 +76,7 @@ public:
|
|||
ImageSource getImageSource() { return mImageSource; }
|
||||
|
||||
protected:
|
||||
virtual void onCursorChanged(const CursorState& state) override;
|
||||
void onCursorChanged(const CursorState& state) override;
|
||||
|
||||
private:
|
||||
// Tiles.
|
||||
|
|
|
@ -75,7 +75,7 @@ public:
|
|||
mGrid.setCursorTo(mButtonGrid);
|
||||
}
|
||||
|
||||
virtual std::vector<HelpPrompt> getHelpPrompts() override { return mGrid.getHelpPrompts(); }
|
||||
std::vector<HelpPrompt> getHelpPrompts() override { return mGrid.getHelpPrompts(); }
|
||||
|
||||
private:
|
||||
void updateSize();
|
||||
|
|
|
@ -40,12 +40,12 @@ public:
|
|||
void setOriginalColor(unsigned int color) override { mColorOriginalValue = color; }
|
||||
void setChangedColor(unsigned int color) override { mColorChangedValue = color; }
|
||||
|
||||
virtual void applyTheme(const std::shared_ptr<ThemeData>& theme,
|
||||
const std::string& view,
|
||||
const std::string& element,
|
||||
unsigned int properties) override;
|
||||
void applyTheme(const std::shared_ptr<ThemeData>& theme,
|
||||
const std::string& view,
|
||||
const std::string& element,
|
||||
unsigned int properties) override;
|
||||
|
||||
virtual std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
|
||||
private:
|
||||
void updateVertices();
|
||||
|
|
|
@ -36,7 +36,7 @@ public:
|
|||
|
||||
void onSizeChanged() override;
|
||||
|
||||
virtual std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
|
||||
private:
|
||||
void onValueChanged();
|
||||
|
|
|
@ -39,7 +39,7 @@ public:
|
|||
|
||||
unsigned int getColorShift() const override { return mImage.getColorShift(); }
|
||||
|
||||
virtual std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
|
||||
private:
|
||||
void onStateChanged();
|
||||
|
|
|
@ -61,12 +61,12 @@ public:
|
|||
|
||||
void setSelectable(bool status) { mSelectable = status; }
|
||||
|
||||
virtual void applyTheme(const std::shared_ptr<ThemeData>& theme,
|
||||
const std::string& view,
|
||||
const std::string& element,
|
||||
unsigned int properties) override;
|
||||
void applyTheme(const std::shared_ptr<ThemeData>& theme,
|
||||
const std::string& view,
|
||||
const std::string& element,
|
||||
unsigned int properties) override;
|
||||
|
||||
virtual std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
|
||||
unsigned int getColor() const override { return mColor; }
|
||||
std::shared_ptr<Font> getFont() const override { return mFont; }
|
||||
|
|
|
@ -43,7 +43,7 @@ public:
|
|||
|
||||
void setCursor(size_t pos);
|
||||
|
||||
virtual std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
|
||||
private:
|
||||
void onTextChanged();
|
||||
|
|
|
@ -95,12 +95,12 @@ public:
|
|||
void setLineSpacing(float lineSpacing) { mLineSpacing = lineSpacing; }
|
||||
|
||||
protected:
|
||||
virtual void onScroll() override
|
||||
void onScroll() override
|
||||
{
|
||||
if (!NavigationSounds::getInstance().isPlayingThemeNavigationSound(SCROLLSOUND))
|
||||
NavigationSounds::getInstance().playThemeNavigationSound(SCROLLSOUND);
|
||||
}
|
||||
virtual void onCursorChanged(const CursorState& state) override;
|
||||
void onCursorChanged(const CursorState& state) override;
|
||||
|
||||
private:
|
||||
int mLoopOffset;
|
||||
|
|
|
@ -45,17 +45,17 @@ public:
|
|||
// Set the opacity for the embedded static image.
|
||||
void setOpacity(unsigned char opacity) override { mOpacity = opacity; }
|
||||
|
||||
virtual void onShow() override;
|
||||
virtual void onHide() override;
|
||||
virtual void onStopVideo() override;
|
||||
virtual void onPauseVideo() override;
|
||||
virtual void onUnpauseVideo() override;
|
||||
virtual bool isVideoPaused() override { return mPause; }
|
||||
virtual void onScreensaverActivate() override;
|
||||
virtual void onScreensaverDeactivate() override;
|
||||
virtual void onGameLaunchedActivate() override;
|
||||
virtual void onGameLaunchedDeactivate() override;
|
||||
virtual void topWindow(bool isTop) override;
|
||||
void onShow() override;
|
||||
void onHide() override;
|
||||
void onStopVideo() override;
|
||||
void onPauseVideo() override;
|
||||
void onUnpauseVideo() override;
|
||||
bool isVideoPaused() override { return mPause; }
|
||||
void onScreensaverActivate() override;
|
||||
void onScreensaverDeactivate() override;
|
||||
void onGameLaunchedActivate() override;
|
||||
void onGameLaunchedDeactivate() override;
|
||||
void topWindow(bool isTop) override;
|
||||
|
||||
// These functions update the embedded static image.
|
||||
void onOriginChanged() override { mStaticImage.setOrigin(mOrigin); }
|
||||
|
@ -65,14 +65,14 @@ public:
|
|||
void render(const glm::mat4& parentTrans) override;
|
||||
void renderSnapshot(const glm::mat4& parentTrans);
|
||||
|
||||
virtual void applyTheme(const std::shared_ptr<ThemeData>& theme,
|
||||
const std::string& view,
|
||||
const std::string& element,
|
||||
unsigned int properties) override;
|
||||
void applyTheme(const std::shared_ptr<ThemeData>& theme,
|
||||
const std::string& view,
|
||||
const std::string& element,
|
||||
unsigned int properties) override;
|
||||
|
||||
virtual std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
std::vector<HelpPrompt> getHelpPrompts() override;
|
||||
|
||||
virtual void update(int deltaTime) override;
|
||||
void update(int deltaTime) override;
|
||||
|
||||
// Resize the video to fit this size. If one axis is zero, scale that axis to maintain
|
||||
// aspect ratio. If both are non-zero, potentially break the aspect ratio. If both are
|
||||
|
|
|
@ -52,7 +52,7 @@ private:
|
|||
void resize();
|
||||
|
||||
void render(const glm::mat4& parentTrans) override;
|
||||
virtual void updatePlayer() override;
|
||||
void updatePlayer() override;
|
||||
|
||||
// This will run the frame processing in a separate thread.
|
||||
void frameProcessing();
|
||||
|
@ -75,13 +75,13 @@ private:
|
|||
bool decoderInitHW();
|
||||
|
||||
// Start the video immediately.
|
||||
virtual void startVideo() override;
|
||||
void startVideo() override;
|
||||
// Stop the video.
|
||||
virtual void stopVideo() override;
|
||||
void stopVideo() override;
|
||||
// Pause the video when a game has been launched.
|
||||
virtual void pauseVideo() override;
|
||||
void pauseVideo() override;
|
||||
// Handle looping the video. Must be called periodically.
|
||||
virtual void handleLooping() override;
|
||||
void handleLooping() override;
|
||||
|
||||
static enum AVHWDeviceType sDeviceType;
|
||||
static enum AVPixelFormat sPixelFormat;
|
||||
|
|
Loading…
Reference in a new issue