Skip to content

Commit

Permalink
Revert "reconfig MLT consumer if audio output device changes on Windows"
Browse files Browse the repository at this point in the history
This reverts commit 4994348.
  • Loading branch information
ddennedy committed Apr 26, 2023
1 parent 69e77f8 commit 500f129
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 12 deletions.
6 changes: 2 additions & 4 deletions src/mltcontroller.cpp
Expand Up @@ -573,10 +573,8 @@ int Controller::consumerChanged()
if (m_consumer) {
bool jackEnabled = !m_jackFilter.isNull();
m_consumer->stop();
if (!Settings.playerGPU()) {
m_consumer.reset();
m_jackFilter.reset();
}
m_consumer.reset();
m_jackFilter.reset();
error = reconfigure(false);
if (m_consumer) {
enableJack(jackEnabled);
Expand Down
8 changes: 0 additions & 8 deletions src/videowidget.cpp
Expand Up @@ -21,9 +21,6 @@
#include <QOpenGLContext>
#include <QtQml>
#include <QQuickItem>
#ifdef Q_OS_WIN
#include <QMediaDevices>
#endif
#include <Mlt.h>
#include <Logger.h>
#include "videowidget.h"
Expand Down Expand Up @@ -69,11 +66,6 @@ VideoWidget::VideoWidget(QObject *parent)
Qt::QueuedConnection);
connect(&m_refreshTimer, &QTimer::timeout, this, &VideoWidget::onRefreshTimeout);
connect(this, &VideoWidget::rectChanged, this, &VideoWidget::zoomChanged);
#ifdef Q_OS_WIN
connect(new QMediaDevices(this), &QMediaDevices::audioOutputsChanged, this, [ = ] () {
consumerChanged();
});
#endif
LOG_DEBUG() << "end";
}

Expand Down

0 comments on commit 500f129

Please sign in to comment.