From a3b8b2cd77abb7971675961913dd495ce7fa27f1 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Thu, 7 Dec 2023 13:55:29 +0100 Subject: [PATCH] fix some build errors --- CMakeLists.txt | 4 ++++ resources/text/CHANGELOG | 6 ++++++ src/librssguard/gui/dialogs/formmain.cpp | 6 +++++- src/librssguard/gui/tabwidget.cpp | 3 +++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ebc2b5baf..d7bd97c4a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -154,6 +154,10 @@ if(NOT OS2) list(APPEND QT_COMPONENTS Multimedia) endif() +if(ENABLE_MEDIAPLAYER_QTMULTIMEDIA AND ENABLE_MEDIAPLAYER_LIBMPV) + message(FATAL_ERROR "You can only enable 1 media player backend.") +endif() + if(ENABLE_MEDIAPLAYER_QTMULTIMEDIA) message(STATUS "Enabling QtMultimedia media player backend.") diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG index 88c86ea31..070690372 100644 --- a/resources/text/CHANGELOG +++ b/resources/text/CHANGELOG @@ -1,3 +1,9 @@ +4.6.1 +----- + +Fixed: +* Fixed some compilation problems and related issues. + 4.6.0 ----- diff --git a/src/librssguard/gui/dialogs/formmain.cpp b/src/librssguard/gui/dialogs/formmain.cpp index e10440adb..344f7074a 100644 --- a/src/librssguard/gui/dialogs/formmain.cpp +++ b/src/librssguard/gui/dialogs/formmain.cpp @@ -868,10 +868,14 @@ void FormMain::createConnections() { &QAction::triggered, tabWidget()->feedMessageViewer()->messagesView(), &MessagesView::openSelectedSourceMessagesExternally); - connect(m_ui->m_actionOpenSelectedSourceArticlesExternally, + +#if defined(ENABLE_MEDIAPLAYER) + connect(m_ui->m_actionPlaySelectedArticlesInMediaPlayer, &QAction::triggered, tabWidget()->feedMessageViewer()->messagesView(), &MessagesView::playSelectedArticleInMediaPlayer); +#endif + connect(m_ui->m_actionOpenSelectedMessagesInternally, &QAction::triggered, tabWidget()->feedMessageViewer()->messagesView(), diff --git a/src/librssguard/gui/tabwidget.cpp b/src/librssguard/gui/tabwidget.cpp index 1dd16d42b..b6db39713 100644 --- a/src/librssguard/gui/tabwidget.cpp +++ b/src/librssguard/gui/tabwidget.cpp @@ -130,9 +130,12 @@ void TabWidget::createConnections() { &MessagesView::openSingleMessageInNewTab, this, &TabWidget::addSingleMessageView); + +#if defined(ENABLE_MEDIAPLAYER) connect(feedMessageViewer()->messagesView(), &MessagesView::playLinkInMediaPlayer, this, [this](const QString& url) { addMediaPlayer(url, true); }); +#endif } void TabWidget::initializeTabs() {