From 8612d6d3687720b7810f470fc2ec6880c8b4b844 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Wed, 3 Jan 2024 11:53:21 +0100 Subject: [PATCH] hudebnibazar --- resources/scripts/scrapers/hudebnibazar.py | 7 +- .../gui/mediaplayer/libmpv/libmpvbackend.cpp | 2 +- .../gui/mediaplayer/mediaplayer.cpp | 6 + src/librssguard/gui/mediaplayer/mediaplayer.h | 3 + .../gui/mediaplayer/mediaplayer.ui | 254 +++++++++--------- 5 files changed, 140 insertions(+), 132 deletions(-) diff --git a/resources/scripts/scrapers/hudebnibazar.py b/resources/scripts/scrapers/hudebnibazar.py index dbbdc096c..d213b70a8 100644 --- a/resources/scripts/scrapers/hudebnibazar.py +++ b/resources/scripts/scrapers/hudebnibazar.py @@ -54,8 +54,13 @@ def processListingDate(string_date: str): def processListingImgs(listing: bs4.Tag): + pics_elems = listing.find("div", class_="InzeratObr") pics = list() - for pic in listing.find("div", class_="InzeratObr").find_all("a"): + + if pics_elems is None: + return pics + + for pic in pics_elems.find_all("a"): pics.append(url_base + pic.get("href")) return pics diff --git a/src/librssguard/gui/mediaplayer/libmpv/libmpvbackend.cpp b/src/librssguard/gui/mediaplayer/libmpv/libmpvbackend.cpp index 43973682c..1b78eca04 100644 --- a/src/librssguard/gui/mediaplayer/libmpv/libmpvbackend.cpp +++ b/src/librssguard/gui/mediaplayer/libmpv/libmpvbackend.cpp @@ -62,7 +62,7 @@ LibMpvBackend::LibMpvBackend(Application* app, QWidget* parent) mpv_set_option_string(m_mpvHandle, "no-resume-playback", "yes"); #if !defined(NDEBUG) - mpv_set_option_string(m_mpvHandle, "terminal", "yes"); + // mpv_set_option_string(m_mpvHandle, "terminal", "yes"); #endif if (!m_customConfigFolder.isEmpty()) { diff --git a/src/librssguard/gui/mediaplayer/mediaplayer.cpp b/src/librssguard/gui/mediaplayer/mediaplayer.cpp index 018099ae1..f95862b01 100644 --- a/src/librssguard/gui/mediaplayer/mediaplayer.cpp +++ b/src/librssguard/gui/mediaplayer/mediaplayer.cpp @@ -233,6 +233,12 @@ void MediaPlayer::switchFullScreen(bool send_event_to_backend) { } } +void MediaPlayer::hideControls() { + // m_ui.m_ +} + +void MediaPlayer::showControls() {} + void MediaPlayer::onFullscreenChanged(bool fullscreen) { if (isFullScreen() != fullscreen) { // Fullscreen was changed via OSC directly from backend. diff --git a/src/librssguard/gui/mediaplayer/mediaplayer.h b/src/librssguard/gui/mediaplayer/mediaplayer.h index c887405f3..a0b73bd9c 100644 --- a/src/librssguard/gui/mediaplayer/mediaplayer.h +++ b/src/librssguard/gui/mediaplayer/mediaplayer.h @@ -42,6 +42,9 @@ class MediaPlayer : public TabContent { void escapeFromFullscreen(); void switchFullScreen(bool send_event_to_backend); + void hideControls(); + void showControls(); + void onFullscreenChanged(bool fullscreen); void onMutedChanged(bool muted); void onSpeedChanged(int speed); diff --git a/src/librssguard/gui/mediaplayer/mediaplayer.ui b/src/librssguard/gui/mediaplayer/mediaplayer.ui index cd6824d9d..ce92d0d4f 100644 --- a/src/librssguard/gui/mediaplayer/mediaplayer.ui +++ b/src/librssguard/gui/mediaplayer/mediaplayer.ui @@ -42,128 +42,130 @@ 0 - - - 9 - - - 0 - - - 9 - - - 9 - - - - - - - - Play/pause - - - - - - - Stop - - - - - - - Speed - - - true - - - QAbstractSpinBox::CorrectToNearestValue - - - % - - - 1 - - - 1000 - - - 10 - - - 100 - - - - - - - Progress - - - Qt::Horizontal - - - - - - - Duration - - - - - - - Mute/unmute - - - - - - - - 0 - 0 - - - - Volume - - - 100 - - - 50 - - - Qt::Horizontal - - - 5 - - - - - - - Download - - - - - - - Switch fullscreen mode - - - - + + + + 2 + + + 2 + + + 2 + + + 4 + + + + + + + + Play/pause + + + + + + + Stop + + + + + + + Speed + + + true + + + QAbstractSpinBox::CorrectToNearestValue + + + % + + + 1 + + + 1000 + + + 10 + + + 100 + + + + + + + Progress + + + Qt::Horizontal + + + + + + + Duration + + + + + + + Mute/unmute + + + + + + + + 0 + 0 + + + + Volume + + + 100 + + + 50 + + + Qt::Horizontal + + + 5 + + + + + + + Download + + + + + + + Switch fullscreen mode + + + + + @@ -183,14 +185,6 @@ 1 - - m_btnPlayPause - m_btnStop - m_spinSpeed - m_slidProgress - m_btnVolume - m_slidVolume -