Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-29 09:35:39 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Added theme support for disabling audio playback for each defined video.

Browse source
This commit is contained in:
Leon Styhre 2022-02-19 21:45:31 +01:00
parent 29514d4db9
commit f803e23fd2
4 changed files with 42 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
es-core/src/ThemeData.cpp
View file

@ -111,6 +111,7 @@ std::map<std::string, std::map<std::string, ThemeData::ElementPropertyType>>
{"defaultImage", PATH}, {"defaultImage", PATH},
{"imageType", STRING}, {"imageType", STRING},
{"gameselector", STRING}, {"gameselector", STRING},
{"audio", BOOLEAN},
{"interpolation", STRING}, {"interpolation", STRING},
{"pillarboxes", BOOLEAN}, {"pillarboxes", BOOLEAN},
{"scanlines", BOOLEAN}, {"scanlines", BOOLEAN},

4
es-core/src/components/VideoComponent.cpp
View file

@ -32,6 +32,7 @@ VideoComponent::VideoComponent()
, mMediaViewerMode {false} , mMediaViewerMode {false}
, mScreensaverMode {false} , mScreensaverMode {false}
, mTargetIsMax {false} , mTargetIsMax {false}
, mPlayAudio {true}
, mDrawPillarboxes {true} , mDrawPillarboxes {true}
, mRenderScanlines {false} , mRenderScanlines {false}
, mLegacyTheme {false} , mLegacyTheme {false}
@ -132,6 +133,9 @@ void VideoComponent::applyTheme(const std::shared_ptr<ThemeData>& theme,
mVideoAreaPos = elem->get<glm::vec2>("pos") * scale; mVideoAreaPos = elem->get<glm::vec2>("pos") * scale;
} }
if (elem->has("audio"))
mPlayAudio = elem->get<bool>("audio");
if (elem->has("interpolation")) { if (elem->has("interpolation")) {
const std::string interpolation {elem->get<std::string>("interpolation")}; const std::string interpolation {elem->get<std::string>("interpolation")};
if (interpolation == "linear") { if (interpolation == "linear") {

1
es-core/src/components/VideoComponent.h
View file

@ -121,6 +121,7 @@ protected:
bool mMediaViewerMode; bool mMediaViewerMode;
bool mScreensaverMode; bool mScreensaverMode;
bool mTargetIsMax; bool mTargetIsMax;
bool mPlayAudio;
bool mDrawPillarboxes; bool mDrawPillarboxes;
bool mRenderScanlines; bool mRenderScanlines;
bool mLegacyTheme; bool mLegacyTheme;

7
es-core/src/components/VideoFFmpegComponent.cpp
View file

@ -1351,7 +1351,9 @@ void VideoFFmpegComponent::startVideoStream()
} }
// Audio stream setup, optional as some videos do not have any audio tracks. // Audio stream setup, optional as some videos do not have any audio tracks.
// Audio can also be disabled per video via the theme configuration.
if (mPlayAudio) {
mAudioStreamIndex = mAudioStreamIndex =
av_find_best_stream(mFormatContext, AVMEDIA_TYPE_AUDIO, -1, -1, nullptr, 0); av_find_best_stream(mFormatContext, AVMEDIA_TYPE_AUDIO, -1, -1, nullptr, 0);
@ -1366,8 +1368,8 @@ void VideoFFmpegComponent::startVideoStream()
const_cast<AVCodec*>(avcodec_find_decoder(mAudioStream->codecpar->codec_id)); const_cast<AVCodec*>(avcodec_find_decoder(mAudioStream->codecpar->codec_id));
if (!mAudioCodec) { if (!mAudioCodec) {
LOG(LogError) << "Couldn't find a suitable audio codec for file \"" << mVideoPath LOG(LogError) << "Couldn't find a suitable audio codec for file \""
<< "\""; << mVideoPath << "\"";
return; return;
} }
@ -1394,6 +1396,7 @@ void VideoFFmpegComponent::startVideoStream()
return; return;
} }
} }
}
mVideoTimeBase = 1.0l / av_q2d(mVideoStream->avg_frame_rate); mVideoTimeBase = 1.0l / av_q2d(mVideoStream->avg_frame_rate);