Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-22 06:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

The media viewer now always loads all images upfront.

Browse source
This commit is contained in:
Leon Styhre 2022-09-08 20:38:47 +02:00
parent a58153f08d
commit ed412174e3
2 changed files with 53 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

144
es-app/src/MediaViewer.cpp
View file

@ -14,24 +14,10 @@
MediaViewer::MediaViewer()
: mRenderer {Renderer::getInstance()}
, mVideo {nullptr}
, mImage {nullptr}
{
Window::getInstance()->setMediaViewer(this);
}
MediaViewer::~MediaViewer()
{
if (mVideo) {
delete mVideo;
mVideo = nullptr;
}
if (mImage) {
delete mImage;
mImage = nullptr;
}
}
bool MediaViewer::startMediaViewer(FileData* game)
{
mHasVideo = false;
@ -55,18 +41,10 @@ void MediaViewer::stopMediaViewer()
NavigationSounds::getInstance().playThemeNavigationSound(SCROLLSOUND);
ViewController::getInstance()->stopViewVideos();
if (mVideo) {
delete mVideo;
mVideo = nullptr;
}
if (mImage) {
delete mImage;
mImage = nullptr;
}
mVideoFile = "";
mVideo.reset();
mImageFiles.clear();
mImages.clear();
}
void MediaViewer::update(int deltaTime)
@ -115,8 +93,9 @@ void MediaViewer::render(const glm::mat4& /*parentTrans*/)
if (shaders != 0)
mRenderer->shaderPostprocessing(shaders, videoParameters);
}
else if (mImage && mImage->hasImage() && mImage->getSize() != glm::vec2 {}) {
mImage->render(trans);
else if (mImages[mCurrentImageIndex]->hasImage() &&
mImages[mCurrentImageIndex]->getSize() != glm::vec2 {0.0f, 0.0f}) {
mImages[mCurrentImageIndex]->render(trans);
if (mCurrentImageIndex == mScreenshotIndex &&
Settings::getInstance()->getBool("MediaViewerScreenshotScanlines"))
@ -138,14 +117,13 @@ void MediaViewer::initiateViewer()
return;
findMedia();
loadImages();
if (!mHasVideo && !mHasImages)
return;
if (mHasVideo)
playVideo();
else
showImage(0);
}
void MediaViewer::findMedia()
@ -188,63 +166,16 @@ void MediaViewer::findMedia()
mHasImages = true;
}
void MediaViewer::showNext()
void MediaViewer::loadImages()
{
if (mHasImages && mCurrentImageIndex != static_cast<int>(mImageFiles.size()) - 1)
NavigationSounds::getInstance().playThemeNavigationSound(SCROLLSOUND);
bool showedVideo = false;
if (mVideo && !mHasImages) {
return;
for (auto& file : mImageFiles) {
mImages.emplace_back(std::make_unique<ImageComponent>(false, false));
mImages.back()->setOrigin(0.5f, 0.5f);
mImages.back()->setPosition(Renderer::getScreenWidth() / 2.0f,
Renderer::getScreenHeight() / 2.0f);
mImages.back()->setMaxSize(Renderer::getScreenWidth(), Renderer::getScreenHeight());
mImages.back()->setImage(file);
}
else if (mVideo && !Settings::getInstance()->getBool("MediaViewerKeepVideoRunning")) {
delete mVideo;
mVideo = nullptr;
showedVideo = true;
}
if (mImage) {
delete mImage;
mImage = nullptr;
}
if ((mVideo || showedVideo) && !mDisplayingImage)
mCurrentImageIndex = 0;
else if (static_cast<int>(mImageFiles.size()) > mCurrentImageIndex + 1)
++mCurrentImageIndex;
if (mVideo)
mDisplayingImage = true;
showImage(mCurrentImageIndex);
}
void MediaViewer::showPrevious()
{
if ((mHasVideo && mDisplayingImage) || (!mHasVideo && mCurrentImageIndex != 0))
NavigationSounds::getInstance().playThemeNavigationSound(SCROLLSOUND);
if (mCurrentImageIndex == 0 && !mHasVideo) {
return;
}
else if (mCurrentImageIndex == 0 && mHasVideo) {
if (mImage) {
delete mImage;
mImage = nullptr;
}
mDisplayingImage = false;
playVideo();
return;
}
if (mImage) {
delete mImage;
mImage = nullptr;
}
--mCurrentImageIndex;
showImage(mCurrentImageIndex);
}
void MediaViewer::playVideo()
@ -255,7 +186,7 @@ void MediaViewer::playVideo()
mDisplayingImage = false;
ViewController::getInstance()->pauseViewVideos();
mVideo = new VideoFFmpegComponent;
mVideo = std::make_unique<VideoFFmpegComponent>();
mVideo->setOrigin(0.5f, 0.5f);
mVideo->setPosition(Renderer::getScreenWidth() / 2.0f, Renderer::getScreenHeight() / 2.0f);
@ -269,18 +200,43 @@ void MediaViewer::playVideo()
mVideo->startVideoPlayer();
}
void MediaViewer::showImage(int index)
void MediaViewer::showNext()
{
if (mImage)
if (mHasImages && ((mCurrentImageIndex != static_cast<int>(mImageFiles.size()) - 1) ||
(!mDisplayingImage && mCurrentImageIndex == 0 && mImageFiles.size() == 1)))
NavigationSounds::getInstance().playThemeNavigationSound(SCROLLSOUND);
bool showedVideo {false};
if (mVideo && !mHasImages) {
return;
}
else if (mVideo && !Settings::getInstance()->getBool("MediaViewerKeepVideoRunning")) {
mVideo.reset();
showedVideo = true;
}
if ((mVideo || showedVideo) && !mDisplayingImage)
mCurrentImageIndex = 0;
else if (static_cast<int>(mImageFiles.size()) > mCurrentImageIndex + 1)
++mCurrentImageIndex;
mDisplayingImage = true;
if (!mImageFiles.empty() && static_cast<int>(mImageFiles.size()) >= index) {
mImage = new ImageComponent(false, false);
mImage->setOrigin(0.5f, 0.5f);
mImage->setPosition(Renderer::getScreenWidth() / 2.0f, Renderer::getScreenHeight() / 2.0f);
mImage->setMaxSize(Renderer::getScreenWidth(), Renderer::getScreenHeight());
mImage->setImage(mImageFiles[index]);
}
}
void MediaViewer::showPrevious()
{
if ((mHasVideo && mDisplayingImage) || (!mHasVideo && mCurrentImageIndex != 0))
NavigationSounds::getInstance().playThemeNavigationSound(SCROLLSOUND);
if (mCurrentImageIndex == 0 && !mHasVideo) {
return;
}
else if (mCurrentImageIndex == 0 && mHasVideo) {
mDisplayingImage = false;
playVideo();
return;
}
--mCurrentImageIndex;
}

8
es-app/src/MediaViewer.h
View file

@ -18,7 +18,6 @@ class MediaViewer : public Window::MediaViewer
{
public:
MediaViewer();
virtual ~MediaViewer();
bool startMediaViewer(FileData* game) override;
void stopMediaViewer() override;
@ -29,9 +28,9 @@ public:
private:
void initiateViewer();
void findMedia();
void loadImages();
void playVideo();
void showImage(int index);
void showNext() override;
void showPrevious() override;
@ -48,10 +47,9 @@ private:
int mTitleScreenIndex;
std::string mVideoFile;
std::unique_ptr<VideoComponent> mVideo;
std::vector<std::string> mImageFiles;
VideoComponent* mVideo;
ImageComponent* mImage;
std::vector<std::unique_ptr<ImageComponent>> mImages;
};
#endif // ES_APP_MEDIA_VIEWER_H