Skip to content
Extraits de code Groupes Projets
Vérifiée Valider b0b9461f rédigé par Kubat's avatar Kubat
Parcourir les fichiers

MPV: Try to fix the reload of the MPV context (not working...)

parent a1e3719b
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!26MPV: Fix the MPV controls
Pipeline #2505 réussi
......@@ -91,7 +91,7 @@ MpvContainer::registerMpvDurationCallback(std::function<void(double)> callback)
void
MpvContainer::closeMpv() noexcept
{
RETURN_IF_NULLPTR(mpv);
if (mpv) {
logDebug() << "Closing the MPV context";
asyncCommand(AsyncCmdType::None, { "quit", nullptr });
registerMpvTimeCallback(nullptr);
......@@ -100,6 +100,7 @@ MpvContainer::closeMpv() noexcept
mpv_wait_async_requests(mpv);
mpv_destroy(mpv);
mpv = nullptr; // Stop all other callbacks here
}
isMpvAlreadyInitialized = false; // De-init
}
......@@ -108,8 +109,6 @@ MpvContainer::~MpvContainer() noexcept { closeMpv(); }
void
MpvContainer::handleMpvEvent(const mpv_event *const event) noexcept
{
RETURN_IF_NULLPTR(mpv);
// Declare here variables that can be used in the switch-case statements
double time;
QString msgText;
......@@ -210,8 +209,6 @@ MpvContainer::getAssSid() const noexcept
void
MpvContainer::handleMpvEventCommandReply(const AsyncCmdType type) noexcept
{
RETURN_IF_NULLPTR(mpv);
switch (type) {
case AsyncCmdType::None: break;
......
......@@ -9,7 +9,6 @@ MpvControls::MpvControls(MpvContainer *passedContainer, QWidget *parent) noexcep
{
auto *progressBar = new QSlider(this);
auto *togglePlaybackButton = new QPushButton(playIcon, "", this); // Be default MPV is paused
auto *reCreateMpvButton = new QPushButton(reCreateMpvIcon, "", this);
progressBar->setTracking(false);
progressBar->setOrientation(Qt::Horizontal);
......@@ -55,7 +54,6 @@ MpvControls::MpvControls(MpvContainer *passedContainer, QWidget *parent) noexcep
});
connect(togglePlaybackButton, &QAbstractButton::clicked, mpv, &MpvContainer::mpvTogglePlayback);
connect(reCreateMpvButton, &QAbstractButton::clicked, mpv, &MpvContainer::reCreateMpvContext);
connect(mpv, &MpvContainer::mpvPlaybackToggled, this,
[this, togglePlaybackButton](bool isPlay) noexcept -> void {
togglePlaybackButton->setIcon(isPlay ? pauseIcon : playIcon);
......@@ -63,7 +61,6 @@ MpvControls::MpvControls(MpvContainer *passedContainer, QWidget *parent) noexcep
auto *centralLayout = new QHBoxLayout(this);
centralLayout->addWidget(togglePlaybackButton);
centralLayout->addWidget(reCreateMpvButton);
centralLayout->addWidget(progressBar, 1);
setLayout(centralLayout);
}
......@@ -23,7 +23,6 @@ private:
const QIcon playIcon{ VIVY_ICON_PLAY };
const QIcon pauseIcon{ VIVY_ICON_PAUSE };
const QIcon reCreateMpvIcon{ VIVY_ICON_RUN };
public:
explicit MpvControls(MpvContainer *mpv, QWidget *parent) noexcept;
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter