Hello community, here is the log from the commit of package QMPlay2 for openSUSE:Factory checked in at 2020-12-17 17:05:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/QMPlay2 (Old) and /work/SRC/openSUSE:Factory/.QMPlay2.new.5145 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "QMPlay2" Thu Dec 17 17:05:49 2020 rev:49 rq:856628 version:20.12.16 Changes: -------- --- /work/SRC/openSUSE:Factory/QMPlay2/QMPlay2.changes 2020-12-11 20:17:03.772669381 +0100 +++ /work/SRC/openSUSE:Factory/.QMPlay2.new.5145/QMPlay2.changes 2020-12-17 17:09:14.121966712 +0100 @@ -0,0 +1,8 @@ +Wed Dec 16 16:37:44 UTC 2020 - Simon Vogl <simon.v...@gmx.net> + +- Removed 0002-fix-youtube-offset.patch as it is merged upstream +- Update to version 20.12.16 + * fix playback of some network streams, + * change CDDB server to gnudb.org. + +------------------------------------------------------------------- Old: ---- 0002-fix-youtube-offset.patch QMPlay2-src-20.12.07.tar.xz New: ---- QMPlay2-src-20.12.16.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ QMPlay2.spec ++++++ --- /var/tmp/diff_new_pack.iOUJqa/_old 2020-12-17 17:09:14.745967332 +0100 +++ /var/tmp/diff_new_pack.iOUJqa/_new 2020-12-17 17:09:14.749967335 +0100 @@ -19,7 +19,7 @@ %define __builder Ninja Name: QMPlay2 -Version: 20.12.07 +Version: 20.12.16 Release: 0 Summary: A Qt based media player, streamer and downloader License: LGPL-3.0-or-later @@ -28,8 +28,6 @@ Source: https://github.com/zaps166/QMPlay2/releases/download/%{version}/QMPlay2-src-%{version}.tar.xz # PATCH-FIX-OPENSUSE Patch1: 0001-fix-broken-python-detection.patch -# PATCH-FIX-UPSTREAM -Patch2: 0002-fix-youtube-offset.patch BuildRequires: cmake >= 3.5 BuildRequires: gcc-c++ BuildRequires: ninja ++++++ QMPlay2-src-20.12.07.tar.xz -> QMPlay2-src-20.12.16.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-20.12.07/CMakeLists.txt new/QMPlay2-src-20.12.16/CMakeLists.txt --- old/QMPlay2-src-20.12.07/CMakeLists.txt 2020-07-05 15:16:44.000000000 +0200 +++ new/QMPlay2-src-20.12.16/CMakeLists.txt 2020-12-16 00:37:48.000000000 +0100 @@ -94,6 +94,9 @@ add_definitions(-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DQT_USE_FAST_OPERATOR_PLUS) +option(USE_UPDATES "Build with software updates" ON) +add_feature_info(Updates USE_UPDATES "Build with software updates") + if(WIN32) option(USE_CMD "Show CMD when running QMPlay2" OFF) mark_as_advanced(USE_CMD) @@ -127,15 +130,6 @@ add_feature_info("Freedesktop notifications" USE_FREEDESKTOP_NOTIFICATIONS "Use Freedesktop notifications") endif() -option(USE_MEDIABROWSER "Build with MediaBrowser support" ON) -add_feature_info(MediaBrowser USE_MEDIABROWSER "Build with MediaBrowser support") - -option(USE_LASTFM "Build with LastFM support" ON) -add_feature_info(LastFM USE_LASTFM "Build with LastFM support") - -option(USE_LYRICS "Build with lyrics support" ON) -add_feature_info(Lyrics USE_LYRICS "Build with lyrics support") - option(USE_LIBASS "Build with libass support" ON) add_feature_info(libass USE_LIBASS "Build with libass support") @@ -148,6 +142,30 @@ option(USE_EXTENSIONS "Build with Extensions module" ON) add_feature_info(Extensions USE_EXTENSIONS "Build with Extensions module") +if(USE_EXTENSIONS) + option(USE_MEDIABROWSER "Build with MediaBrowser support" ON) + add_feature_info(MediaBrowser USE_MEDIABROWSER "Build with MediaBrowser support") + + option(USE_LASTFM "Build with LastFM support" ON) + add_feature_info(LastFM USE_LASTFM "Build with LastFM support") + + option(USE_LYRICS "Build with lyrics support" ON) + add_feature_info(Lyrics USE_LYRICS "Build with lyrics support") + + option(USE_RADIO "Build with Radio Browser support" ON) + add_feature_info(Radio USE_RADIO "Build with Radio Browser support") + + option(USE_YOUTUBE "Build with YouTube support" ON) + add_feature_info(YouTube USE_YOUTUBE "Build with YouTube support") +endif() + +if(USE_YOUTUBE OR USE_MEDIABROWSER) + set(USE_YOUTUBEDL ON) + add_definitions(-DUSE_YOUTUBEDL) +else() + set(USE_YOUTUBEDL OFF) +endif() + if(USE_EXTENSIONS AND NOT WIN32 AND NOT APPLE AND NOT ANDROID) option(USE_MPRIS2 "Build Extensions with MPRIS2 support" ON) add_feature_info(MPRIS2 USE_MPRIS2 "Build Extensions with MPRIS2 support") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-20.12.07/ChangeLog new/QMPlay2-src-20.12.16/ChangeLog --- old/QMPlay2-src-20.12.07/ChangeLog 2020-12-07 17:37:58.000000000 +0100 +++ new/QMPlay2-src-20.12.16/ChangeLog 2020-12-16 00:37:56.000000000 +0100 @@ -1,8 +1,12 @@ +Changes in QMPlay2 20.12.16: + - fix playback of some network streams, + - change CDDB server to gnudb.org, + Changes in QMPlay2 20.12.07: - fix displaying of subtitles from media file in some rare cases, - load fonts from media file when using subtitles from file, - fix inactive streams text color in Information panel, - - add japanese language file (harujisaku), + - add Japanese language file (harujisaku), - fix CUVID/Vulkan on some hardware, - improve CMake files for Windows, - fix "wmalossless" audio time, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-20.12.07/README.md new/QMPlay2-src-20.12.16/README.md --- old/QMPlay2-src-20.12.07/README.md 2020-09-30 10:52:51.000000000 +0200 +++ new/QMPlay2-src-20.12.16/README.md 2020-12-16 00:37:48.000000000 +0100 @@ -158,10 +158,10 @@ In Linux/BSD, you must associate keys with commands: - using QMPlay2 binary, see: `QMPlay2 -h`, - using MPRIS2: - - Toggle play/pause: `dbus-send --print-reply --dest=org.mpris.MediaPlayer2.QMPlay2 /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.PlayPause`. - - Next: `dbus-send --print-reply --dest=org.mpris.MediaPlayer2.QMPlay2 /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Next` - - Prev: `dbus-send --print-reply --dest=org.mpris.MediaPlayer2.QMPlay2 /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Previous` - - Stop: `dbus-send --print-reply --dest=org.mpris.MediaPlayer2.QMPlay2 /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Stop` + - Toggle play/pause: `dbus-send --print-reply --dest=org.mpris.MediaPlayer2.QMPlay2 /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.PlayPause`. + - Next: `dbus-send --print-reply --dest=org.mpris.MediaPlayer2.QMPlay2 /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Next` + - Prev: `dbus-send --print-reply --dest=org.mpris.MediaPlayer2.QMPlay2 /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Previous` + - Stop: `dbus-send --print-reply --dest=org.mpris.MediaPlayer2.QMPlay2 /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Stop` ## Installation from sources @@ -175,17 +175,17 @@ #### Necessary: - Qt5 >= 5.6.0 (>= 5.6.3; >= 5.9.1 recommended; >= 5.10 for Vulkan): - - Qt5DBus - Linux/BSD only, - - Qt5Svg - for SVG icons, - - Qt5Qml - for MediaBrowser, - - Qt5WinExtras - for Windows, + - Qt5DBus - Linux/BSD only, + - Qt5Svg - for SVG icons, + - Qt5Qml - for MediaBrowser, + - Qt5WinExtras - for Windows, - FFmpeg >= 3.3 (>= 4.0 is recommended at compilation time for VA-API and VDPAU deinterlacing filters): - - libavformat - requires OpenSSL or GnuTLS for https support, - - libavcodec - for FFmpeg module only, - - libswscale, - - libavutil, - - libswresample, - - libavdevice - for FFmpeg module only, optional (enabled on Linux as default), + - libavformat - requires OpenSSL or GnuTLS for https support, + - libavcodec - for FFmpeg module only, + - libswscale, + - libavutil, + - libswresample, + - libavdevice - for FFmpeg module only, optional (enabled on Linux as default), #### Important: - TagLib >= 1.7 (>= 1.9 recommended), @@ -214,52 +214,55 @@ - Install all needed packages and dependencies (in devel version) using package manager or compile it from sources. - You can use `cmake-gui` for graphical configuration. Otherwise follow the instructions below: - - create a "build" directory and go to it: `mkdir build && cd build`, - - run CMake (also you can run with arguments which you want): `cmake ..`, - - check the summary - which features are enabled - you can set/force them manually, - - if CMake finishes without errors, run: `make -j8` (replace 8 with numbers of CPU threads), - - if compiling finishes without errors, install it: `sudo make -j8 install`. + - create a "build" directory and go to it: `mkdir build && cd build`, + - run CMake (also you can run with arguments which you want): `cmake ..`, + - check the summary - which features are enabled - you can set/force them manually, + - if CMake finishes without errors, run: `make -j8` (replace 8 with numbers of CPU threads), + - if compiling finishes without errors, install it: `sudo make -j8 install`. CMake options (option - default value: description): - CMake options and the default settings: - - `CMAKE_INSTALL_PREFIX` - mostly it is `/usr/local`: installation directory. - - `CMAKE_BUILD_TYPE` - `Release`. - - `LANGUAGES` - `All` - a space-separated list of translations to compile into QMPlay2. - - `SOLID_ACTIONS_INSTALL_PATH` - Linux/BSD only, autodetect: you can specify the path manually. - - `SET_INSTALL_RPATH` - non-Windows only, `ON` on macOS, `OFF` anywhere else: sets RPATH after installation. - - `USE_FFMPEG` - ON: enable/disable FFmpeg module. - - `USE_FFMPEG_VAAPI`: autodetect: enabled if libva, libva-drm, and egl exist. - - `USE_FFMPEG_VDPAU`: autodetect: enabled on X11 if libvdpau exists. - - `USE_FFMPEG_AVDEVICE` - autodetect on Linux, `OFF` on non-Linux OS: it allows to use e.g. V4L2 devices. - - `USE_INPUTS` - ON: enable/disable Inputs module. - - `USE_MODPLUG` - ON: enable/disable Modplug module. - - `USE_EXTENSIONS` - ON: enable/disable Extensions module. - - `USE_MPRIS2` - Linux/BSD only, `ON`: enable/disable MPRIS2 in Extensions module. - - `USE_VISUALIZATIONS` - ON: enable/disable Visualizations module. - - `USE_AUDIOFILTERS` - ON: enable/disable AudioFilters module. - - `USE_VIDEOFILTERS` - ON: enable/disable VideoFilters module. - - `USE_OPENGL` - `ON`: enable/disable OpenGL support. - - `USE_VULKAN` - autodetect: enable/disable Vulkan support. - - `USE_GLSLC` - `OFF`: enable/disable GLSL -> SPIR-V shader compilation when building QMPlay2. - - `USE_AUDIOCD` - autodetect: enabled if libcdio and libcddb exist: enable/disable AudioCD module. - - `USE_ALSA` - `ON` on Linux: enable/disable ALSA module. - - `USE_PORTAUDIO` - `ON` on non-Linux OS: enable/disable PortAudio module. - - `USE_PULSEAUDIO` - autodetect on Linux/BSD, `OFF` anywhere else: enable/disable PulseAudio module. - - `USE_XVIDEO` - autodetect on X11: enabled if libxv exists: enable/disable XVideo module. - - `USE_CHIPTUNE_GME` - autodetect: enabled if libgme exists. - - `USE_CHIPTUNE_SID` - autodetect: enabled if libsidplayfp exists. - - `USE_TAGLIB` - `ON`: enable/disable tag editor. - - `USE_CMD` - Windows only, `OFF`. - - `USE_LASTFM` - `ON`: enable/disable LastFM in Extensions module. - - `USE_LIBASS` - `ON`: enable/disable libass (subtitles engine) dependency. - - `USE_CUVID` - `ON`: enable/disable CUVID module. - - `USE_LYRICS` - `ON`: enable/disable lyrics module. - - `USE_MEDIABROWSER` - `ON`: enable/disable MediaBrowser module. - - `USE_ASAN` - `OFF`: enable/disable address sanitizer. - - `USE_UBSAN` - `OFF`: enable/disable undefined behavior sanitizer. - - `USE_LINK_TIME_OPTIMIZATION` - `OFF`: enable/disable Link Time Optimization for release builds. - - `USE_GIT_VERSION` - `ON`: append Git HEAD to QMPlay2 version (if exists). - - `FIND_HWACCEL_DRIVERS_PATH` - `OFF`: Find drivers path for hwaccel, useful for universal package. + - `CMAKE_INSTALL_PREFIX` - mostly it is `/usr/local`: installation directory. + - `CMAKE_BUILD_TYPE` - `Release`. + - `LANGUAGES` - `All` - a space-separated list of translations to compile into QMPlay2. + - `SOLID_ACTIONS_INSTALL_PATH` - Linux/BSD only, autodetect: you can specify the path manually. + - `SET_INSTALL_RPATH` - non-Windows only, `ON` on macOS, `OFF` anywhere else: sets RPATH after installation. + - `USE_FFMPEG` - ON: enable/disable FFmpeg module. + - `USE_FFMPEG_VAAPI`: autodetect: enabled if libva, libva-drm, and egl exist. + - `USE_FFMPEG_VDPAU`: autodetect: enabled on X11 if libvdpau exists. + - `USE_FFMPEG_AVDEVICE` - autodetect on Linux, `OFF` on non-Linux OS: it allows to use e.g. V4L2 devices. + - `USE_INPUTS` - ON: enable/disable Inputs module. + - `USE_MODPLUG` - ON: enable/disable Modplug module. + - `USE_EXTENSIONS` - ON: enable/disable Extensions module. + - `USE_MPRIS2` - Linux/BSD only, `ON`: enable/disable MPRIS2 in Extensions module. + - `USE_VISUALIZATIONS` - ON: enable/disable Visualizations module. + - `USE_AUDIOFILTERS` - ON: enable/disable AudioFilters module. + - `USE_VIDEOFILTERS` - ON: enable/disable VideoFilters module. + - `USE_OPENGL` - `ON`: enable/disable OpenGL support. + - `USE_VULKAN` - autodetect: enable/disable Vulkan support. + - `USE_GLSLC` - `OFF`: enable/disable GLSL -> SPIR-V shader compilation when building QMPlay2. + - `USE_AUDIOCD` - autodetect: enabled if libcdio and libcddb exist: enable/disable AudioCD module. + - `USE_ALSA` - `ON` on Linux: enable/disable ALSA module. + - `USE_PORTAUDIO` - `ON` on non-Linux OS: enable/disable PortAudio module. + - `USE_PULSEAUDIO` - autodetect on Linux/BSD, `OFF` anywhere else: enable/disable PulseAudio module. + - `USE_XVIDEO` - autodetect on X11: enabled if libxv exists: enable/disable XVideo module. + - `USE_CHIPTUNE_GME` - autodetect: enabled if libgme exists. + - `USE_CHIPTUNE_SID` - autodetect: enabled if libsidplayfp exists. + - `USE_TAGLIB` - `ON`: enable/disable tag editor. + - `USE_CMD` - Windows only, `OFF`. + - `USE_LASTFM` - `ON`: enable/disable LastFM in Extensions module. + - `USE_LIBASS` - `ON`: enable/disable libass (subtitles engine) dependency. + - `USE_CUVID` - `ON`: enable/disable CUVID module. + - `USE_LYRICS` - `ON`: enable/disable lyrics module. + - `USE_MEDIABROWSER` - `ON`: enable/disable MediaBrowser module. + - `USE_RADIO` - `ON`: enable/disable Radio Browser module. + - `USE_YOUTUBE` - `ON`: enable/disable YouTube module. + - `USE_ASAN` - `OFF`: enable/disable address sanitizer. + - `USE_UBSAN` - `OFF`: enable/disable undefined behavior sanitizer. + - `USE_LINK_TIME_OPTIMIZATION` - `OFF`: enable/disable Link Time Optimization for release builds. + - `USE_GIT_VERSION` - `ON`: append Git HEAD to QMPlay2 version (if exists). + - `USE_UPDATES` - `ON`: enable/disable software updates. + - `FIND_HWACCEL_DRIVERS_PATH` - `OFF`: Find drivers path for hwaccel, useful for universal package. Using other Qt installation of CMake: - `Qt5Widgets_DIR`: path to the Qt5Widgets cmake directory (e.g. `~/qtbase/lib/cmake/Qt5Widgets`). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-20.12.07/src/gui/CMakeLists.txt new/QMPlay2-src-20.12.16/src/gui/CMakeLists.txt --- old/QMPlay2-src-20.12.07/src/gui/CMakeLists.txt 2020-07-05 15:18:22.000000000 +0200 +++ new/QMPlay2-src-20.12.16/src/gui/CMakeLists.txt 2020-12-16 00:37:48.000000000 +0100 @@ -32,7 +32,6 @@ ScreenSaver.hpp ShortcutHandler.hpp KeyBindingsDialog.hpp - Updater.hpp RepeatMode.hpp PanGestureEventFilter.hpp EventFilterWorkarounds.hpp @@ -64,7 +63,6 @@ VolWidget.cpp ShortcutHandler.cpp KeyBindingsDialog.cpp - Updater.cpp EventFilterWorkarounds.cpp ) @@ -99,6 +97,12 @@ qt5_wrap_ui(GUI_FORM_HDR ${GUI_FORMS}) set_property(SOURCE ${GUI_FORM_HDR} PROPERTY SKIP_AUTOMOC ON) +if(USE_UPDATES) + list(APPEND GUI_HDR Updater.hpp) + list(APPEND GUI_SRC Updater.cpp) + add_definitions(-DUPDATES) +endif() + if(USE_TAGLIB) find_package(TagLib REQUIRED) include_directories(${TAGLIB_INCLUDE_DIRS}) @@ -131,7 +135,9 @@ list(APPEND GUI_SRC Windows/icons.rc) # updater - add_definitions(-DUPDATER) + if(USE_UPDATES) + add_definitions(-DUPDATER) + endif() # additional Windows sources list(APPEND GUI_SRC diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-20.12.07/src/gui/MainWidget.cpp new/QMPlay2-src-20.12.16/src/gui/MainWidget.cpp --- old/QMPlay2-src-20.12.07/src/gui/MainWidget.cpp 2020-07-23 23:32:44.000000000 +0200 +++ new/QMPlay2-src-20.12.16/src/gui/MainWidget.cpp 2020-12-16 00:37:48.000000000 +0100 @@ -113,8 +113,10 @@ #endif /* MainWidget */ -MainWidget::MainWidget(QList<QPair<QString, QString>> &arguments) : - updater(this) +MainWidget::MainWidget(QList<QPair<QString, QString>> &arguments) +#ifdef UPDATES + : updater(this) +#endif { QMPlay2GUI.videoAdjustment = new VideoAdjustmentW; QMPlay2GUI.shortcutHandler = new ShortcutHandler(this); @@ -453,8 +455,10 @@ QMPlay2MacExtensions::registerMacOSMediaKeys(std::bind(&MainWidget::processParam, this, std::placeholders::_1, QString())); #endif +#ifdef UPDATES if (settings.getBool("AutoUpdates")) updater.downloadUpdate(); +#endif } MainWidget::~MainWidget() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-20.12.07/src/gui/MainWidget.hpp new/QMPlay2-src-20.12.16/src/gui/MainWidget.hpp --- old/QMPlay2-src-20.12.07/src/gui/MainWidget.hpp 2020-03-18 22:58:30.000000000 +0100 +++ new/QMPlay2-src-20.12.16/src/gui/MainWidget.hpp 2020-12-08 12:32:37.000000000 +0100 @@ -187,7 +187,9 @@ #endif QAction *lockWidgetsAct; +#ifdef UPDATES Updater updater; +#endif #ifdef Q_OS_WIN QWinTaskbarProgress *m_taskBarProgress = nullptr; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-20.12.07/src/gui/SettingsWidget.cpp new/QMPlay2-src-20.12.16/src/gui/SettingsWidget.cpp --- old/QMPlay2-src-20.12.07/src/gui/SettingsWidget.cpp 2020-04-28 10:10:29.000000000 +0200 +++ new/QMPlay2-src-20.12.16/src/gui/SettingsWidget.cpp 2020-12-08 13:10:39.000000000 +0100 @@ -22,7 +22,9 @@ #include <OtherVFiltersW.hpp> #include <OSDSettingsW.hpp> #include <Functions.hpp> -#include <YouTubeDL.hpp> +#ifdef USE_YOUTUBEDL +# include <YouTubeDL.hpp> +#endif #include <Notifies.hpp> #include <Main.hpp> #ifdef USE_VULKAN @@ -151,8 +153,10 @@ QMPSettings.init("ShowDirCovers", true); QMPSettings.init("AutoOpenVideoWindow", true); QMPSettings.init("AutoRestoreMainWindowOnVideo", true); +#ifdef UPDATES if (!QMPSettings.contains("AutoUpdates")) QMPSettings.init("AutoUpdates", !QFile::exists(QMPlay2Core.getShareDir() + "noautoupdates")); +#endif QMPSettings.init("MainWidget/TabPositionNorth", false); #ifdef QMPLAY2_ALLOW_ONLY_ONE_INSTANCE QMPSettings.init("AllowOnlyOneInstance", false); @@ -383,9 +387,14 @@ generalSettingsPage->autoOpenVideoWindowB->setChecked(QMPSettings.getBool("AutoOpenVideoWindow")); generalSettingsPage->autoRestoreMainWindowOnVideoB->setChecked(QMPSettings.getBool("AutoRestoreMainWindowOnVideo")); +#ifdef UPDATES generalSettingsPage->autoUpdatesB->setChecked(QMPSettings.getBool("AutoUpdates")); -#ifndef UPDATER +# ifndef UPDATER generalSettingsPage->autoUpdatesB->setText(tr("Automatically check for updates")); +# endif +#else + delete generalSettingsPage->autoUpdatesB; + generalSettingsPage->autoUpdatesB = nullptr; #endif if (Notifies::hasBoth()) @@ -423,8 +432,13 @@ const QIcon viewRefresh = QMPlay2Core.getIconFromTheme("view-refresh"); generalSettingsPage->clearCoversCache->setIcon(viewRefresh); connect(generalSettingsPage->clearCoversCache, SIGNAL(clicked()), this, SLOT(clearCoversCache())); +#ifdef USE_YOUTUBEDL generalSettingsPage->removeYtDlB->setIcon(QMPlay2Core.getIconFromTheme("list-remove")); connect(generalSettingsPage->removeYtDlB, SIGNAL(clicked()), this, SLOT(removeYouTubeDl())); +#else + generalSettingsPage->removeYtDlB->deleteLater(); + generalSettingsPage->removeYtDlB = nullptr; +#endif generalSettingsPage->resetSettingsB->setIcon(viewRefresh); connect(generalSettingsPage->resetSettingsB, SIGNAL(clicked()), this, SLOT(resetSettings())); } @@ -1120,7 +1134,9 @@ QMPSettings.set("EnlargeCovers", generalSettingsPage->enlargeSmallCoversB->isChecked()); QMPSettings.set("AutoOpenVideoWindow", generalSettingsPage->autoOpenVideoWindowB->isChecked()); QMPSettings.set("AutoRestoreMainWindowOnVideo", generalSettingsPage->autoRestoreMainWindowOnVideoB->isChecked()); +#ifdef UPDATES QMPSettings.set("AutoUpdates", generalSettingsPage->autoUpdatesB->isChecked()); +#endif QMPSettings.set("MainWidget/TabPositionNorth", generalSettingsPage->tabsNorths->isChecked()); #ifdef QMPLAY2_ALLOW_ONLY_ONE_INSTANCE QMPSettings.set("AllowOnlyOneInstance", generalSettingsPage->allowOnlyOneInstance->isChecked()); @@ -1398,6 +1414,7 @@ } } } +#ifdef USE_YOUTUBEDL void SettingsWidget::removeYouTubeDl() { const QString filePath = YouTubeDL::getFilePath(); @@ -1408,6 +1425,7 @@ QFile::remove(filePath); } } +#endif void SettingsWidget::resetSettings() { if (QMessageBox::question(this, tr("Confirm settings deletion"), tr("Do you really want to clear all settings?"), QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-20.12.07/src/gui/SettingsWidget.hpp new/QMPlay2-src-20.12.16/src/gui/SettingsWidget.hpp --- old/QMPlay2-src-20.12.07/src/gui/SettingsWidget.hpp 2020-03-18 23:43:12.000000000 +0100 +++ new/QMPlay2-src-20.12.16/src/gui/SettingsWidget.hpp 2020-12-08 13:10:39.000000000 +0100 @@ -94,7 +94,9 @@ void setAppearance(); void setKeyBindings(); void clearCoversCache(); +#ifdef USE_YOUTUBEDL void removeYouTubeDl(); +#endif void resetSettings(); void profileListIndexChanged(int index); void removeProfile(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-20.12.07/src/modules/AudioCD/AudioCDDemux.cpp new/QMPlay2-src-20.12.16/src/modules/AudioCD/AudioCDDemux.cpp --- old/QMPlay2-src-20.12.07/src/modules/AudioCD/AudioCDDemux.cpp 2020-03-18 22:58:30.000000000 +0100 +++ new/QMPlay2-src-20.12.16/src/modules/AudioCD/AudioCDDemux.cpp 2020-12-16 00:37:56.000000000 +0100 @@ -366,8 +366,6 @@ cddb_disc_add_track(cddb_disc, pcddb_track); } - bool useNetwork = false; - cddb_disc_calc_discid(cddb_disc); if (cddb_disc_get_discid(cddb_disc) == discID) cddb_cache_only(cddb); @@ -376,8 +374,8 @@ discID = cddb_disc_get_discid(cddb_disc); cddb_set_timeout(cddb, 3); - cddb_http_enable(cddb); - cddb_set_server_port(cddb, 80); + cddb_set_server_name(cddb, "gnudb.gnudb.org"); + cddb_set_server_port(cddb, 8880); Settings sets("QMPlay2"); if (sets.getBool("Proxy/Use")) @@ -391,23 +389,16 @@ cddb_set_http_proxy_password(cddb, QString(QByteArray::fromBase64(sets.getByteArray("Proxy/Password"))).toLocal8Bit()); } } - - useNetwork = true; } - for (int i = 0; i <= useNetwork; ++i) + if (cddb_query(cddb, cddb_disc) > 0) { - if (cddb_query(cddb, cddb_disc) > 0) + do if (cddb_disc_get_discid(cddb_disc) == discID) { - do if (cddb_disc_get_discid(cddb_disc) == discID) - { - cddb_read(cddb, cddb_disc); - cddb_destroy(cddb); - return true; - } while (cddb_query_next(cddb, cddb_disc)); - } - if (useNetwork && !i) - cddb_set_server_name(cddb, "freedb.musicbrainz.org"); + cddb_read(cddb, cddb_disc); + cddb_destroy(cddb); + return true; + } while (cddb_query_next(cddb, cddb_disc)); } cddb_disc_destroy(cddb_disc); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-20.12.07/src/modules/Extensions/CMakeLists.txt new/QMPlay2-src-20.12.16/src/modules/Extensions/CMakeLists.txt --- old/QMPlay2-src-20.12.07/src/modules/Extensions/CMakeLists.txt 2020-03-18 22:58:30.000000000 +0100 +++ new/QMPlay2-src-20.12.16/src/modules/Extensions/CMakeLists.txt 2020-12-16 00:37:48.000000000 +0100 @@ -3,27 +3,16 @@ set(Extensions_HDR Extensions.hpp - YouTube.hpp Downloader.hpp - Radio.hpp - Radio/RadioBrowserModel.hpp ) set(Extensions_SRC Extensions.cpp - YouTube.cpp Downloader.cpp - Radio.cpp - Radio/RadioBrowserModel.cpp -) - -set(Extensions_FORMS - Radio/Radio.ui ) set(Extensions_RESOURCES icons.qrc - js.qrc ) if(USE_MPRIS2) @@ -48,6 +37,7 @@ if(USE_MEDIABROWSER) list(APPEND Extensions_HDR MediaBrowser.hpp MediaBrowserJS.hpp) list(APPEND Extensions_SRC MediaBrowser.cpp MediaBrowserJS.cpp) + list(APPEND Extensions_RESOURCES js.qrc) add_definitions(-DUSE_MEDIABROWSER) if(JS_SKIP_SSE2_CHECK) add_definitions(-DJS_SKIP_SSE2_CHECK) @@ -55,6 +45,27 @@ set(QML Qt5::Qml) endif() +if(USE_RADIO) + list(APPEND Extensions_HDR + Radio.hpp + Radio/RadioBrowserModel.hpp + ) + list(APPEND Extensions_SRC + Radio.cpp + Radio/RadioBrowserModel.cpp + ) + set(Extensions_FORMS + Radio/Radio.ui + ) + add_definitions(-DUSE_RADIO) +endif() + +if(USE_YOUTUBE) + list(APPEND Extensions_HDR YouTube.hpp) + list(APPEND Extensions_SRC YouTube.cpp) + add_definitions(-DUSE_YOUTUBE) +endif() + qt5_wrap_ui(Extensions_FORM_HDR ${Extensions_FORMS}) set_property(SOURCE ${Extensions_FORM_HDR} PROPERTY SKIP_AUTOMOC ON) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-20.12.07/src/modules/Extensions/Extensions.cpp new/QMPlay2-src-20.12.16/src/modules/Extensions/Extensions.cpp --- old/QMPlay2-src-20.12.07/src/modules/Extensions/Extensions.cpp 2020-03-18 22:58:30.000000000 +0100 +++ new/QMPlay2-src-20.12.16/src/modules/Extensions/Extensions.cpp 2020-12-08 12:20:15.000000000 +0100 @@ -19,11 +19,15 @@ #include <Extensions.hpp> #include <Downloader.hpp> -#include <YouTube.hpp> +#ifdef USE_YOUTUBE + #include <YouTube.hpp> +#endif #ifdef USE_LASTFM #include <LastFM.hpp> #endif -#include <Radio.hpp> +#ifdef USE_RADIO + #include <Radio.hpp> +#endif #ifdef USE_MPRIS2 #include <MPRIS2.hpp> #endif @@ -39,17 +43,25 @@ Extensions::Extensions() : Module("Extensions"), - downloader(":/downloader.svgz"), youtube(":/youtube.svgz"), radio(":/radio.svgz") + downloader(":/downloader.svgz") { m_icon = QIcon(":/Extensions.svgz"); #ifdef USE_LASTFM lastfm = QIcon(":/lastfm.svgz"); #endif +#ifdef USE_YOUTUBE + youtube = QIcon(":/youtube.svgz"); +#endif +#ifdef USE_RADIO + radio = QIcon(":/radio.svgz"); +#endif +#ifdef USE_YOUTUBE init("YouTube/ShowUserName", false); init("YouTube/Subtitles", true); init("YouTube/SortBy", 0); +#endif #ifdef USE_LASTFM init("LastFM/DownloadCovers", true); @@ -68,11 +80,15 @@ { QList<Info> modulesInfo; modulesInfo += Info(DownloaderName, QMPLAY2EXTENSION, downloader); +#ifdef USE_YOUTUBE modulesInfo += Info(YouTubeName, QMPLAY2EXTENSION, youtube); +#endif #ifdef USE_LASTFM modulesInfo += Info(LastFMName, QMPLAY2EXTENSION, lastfm); #endif +#ifdef USE_RADIO modulesInfo += Info(RadioName, QMPLAY2EXTENSION, radio); +#endif #ifdef USE_LYRICS modulesInfo += Info(LyricsName, QMPLAY2EXTENSION); #endif @@ -88,14 +104,18 @@ { if (name == DownloaderName) return static_cast<QMPlay2Extensions *>(new Downloader(*this)); +#ifdef USE_YOUTUBE else if (name == YouTubeName) return static_cast<QMPlay2Extensions *>(new YouTube(*this)); +#endif #ifdef USE_LASTFM else if (name == LastFMName) return static_cast<QMPlay2Extensions *>(new LastFM(*this)); #endif +#ifdef USE_RADIO else if (name == RadioName) return static_cast<QMPlay2Extensions *>(new Radio(*this)); +#endif #ifdef USE_LYRICS else if (name == LyricsName) return static_cast<QMPlay2Extensions *>(new Lyrics(*this)); @@ -141,6 +161,7 @@ MPRIS2B->setChecked(sets().getBool("MPRIS2/Enabled")); #endif +#ifdef USE_YOUTUBE QGroupBox *youTubeB = new QGroupBox("YouTube"); userNameB = new QCheckBox(tr("Show user name in search results")); @@ -162,6 +183,7 @@ layout->addWidget(new QLabel(tr("Preferred quality") + ": "), 2, 0, 1, 1); layout->addWidget(qualityPreset, 2, 1, 1, 1); layout->setMargin(2); +#endif #ifdef USE_LASTFM QGroupBox *lastFMB = new QGroupBox("LastFM"); @@ -206,7 +228,9 @@ #ifdef USE_MPRIS2 mainLayout->addWidget(MPRIS2B); #endif +#ifdef USE_YOUTUBE mainLayout->addWidget(youTubeB); +#endif #ifdef USE_LASTFM mainLayout->addWidget(lastFMB); #endif @@ -230,9 +254,11 @@ sets().set("MPRIS2/Enabled", MPRIS2B->isChecked()); #endif +#ifdef USE_YOUTUBE sets().set("YouTube/ShowUserName", userNameB->isChecked()); sets().set("YouTube/Subtitles", subtitlesB->isChecked()); sets().set("YouTube/QualityPreset", qualityPreset->currentText()); +#endif #ifdef USE_LASTFM sets().set("LastFM/DownloadCovers", downloadCoversGB->isChecked()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-20.12.07/src/modules/Extensions/Extensions.hpp new/QMPlay2-src-20.12.16/src/modules/Extensions/Extensions.hpp --- old/QMPlay2-src-20.12.07/src/modules/Extensions/Extensions.hpp 2020-03-18 22:58:30.000000000 +0100 +++ new/QMPlay2-src-20.12.16/src/modules/Extensions/Extensions.hpp 2020-12-08 12:16:53.000000000 +0100 @@ -30,7 +30,13 @@ SettingsWidget *getSettingsWidget() override; - QIcon downloader, youtube, radio; + QIcon downloader; +#ifdef USE_YOUTUBE + QIcon youtube; +#endif +#ifdef USE_RADIO + QIcon radio; +#endif #ifdef USE_LASTFM QIcon lastfm; #endif @@ -62,8 +68,10 @@ QCheckBox *MPRIS2B; #endif +#ifdef USE_YOUTUBE QCheckBox *userNameB, *subtitlesB; QComboBox *qualityPreset; +#endif #ifdef USE_LASTFM QGroupBox *downloadCoversGB; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-20.12.07/src/modules/FFmpeg/FormatContext.cpp new/QMPlay2-src-20.12.16/src/modules/FFmpeg/FormatContext.cpp --- old/QMPlay2-src-20.12.07/src/modules/FFmpeg/FormatContext.cpp 2020-12-06 14:32:53.000000000 +0100 +++ new/QMPlay2-src-20.12.16/src/modules/FFmpeg/FormatContext.cpp 2020-12-16 00:37:48.000000000 +0100 @@ -743,9 +743,6 @@ formatCtx->flags |= AVFMT_FLAG_FAST_SEEK; //This should be set before "avformat_open_input", but seems to be working for MP3... } - if (!isLocal) - formatCtx->flags |= AVFMT_FLAG_NOBUFFER; - if (avformat_find_stream_info(formatCtx, nullptr) < 0) return false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-20.12.07/src/qmplay2/CMakeLists.txt new/QMPlay2-src-20.12.16/src/qmplay2/CMakeLists.txt --- old/QMPlay2-src-20.12.07/src/qmplay2/CMakeLists.txt 2020-07-05 15:19:00.000000000 +0200 +++ new/QMPlay2-src-20.12.16/src/qmplay2/CMakeLists.txt 2020-12-16 00:37:48.000000000 +0100 @@ -42,7 +42,6 @@ CPU.hpp Version.hpp VideoAdjustment.hpp - YouTubeDL.hpp Notifies.hpp NotifiesTray.hpp MkvMuxer.hpp @@ -88,7 +87,6 @@ PacketBuffer.cpp NetworkAccess.cpp Version.cpp - YouTubeDL.cpp Notifies.cpp NotifiesTray.cpp MkvMuxer.cpp @@ -265,6 +263,15 @@ set(QML Qt5::Qml) endif() +if(USE_YOUTUBEDL) + list(APPEND QMPLAY2_HDR + YouTubeDL.hpp + ) + list(APPEND QMPLAY2_SRC + YouTubeDL.cpp + ) +endif() + set(QMPLAY2_RESOURCES languages.qrc ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-20.12.07/src/qmplay2/Version.cpp new/QMPlay2-src-20.12.16/src/qmplay2/Version.cpp --- old/QMPlay2-src-20.12.07/src/qmplay2/Version.cpp 2020-12-07 17:38:09.000000000 +0100 +++ new/QMPlay2-src-20.12.16/src/qmplay2/Version.cpp 2020-12-16 00:37:56.000000000 +0100 @@ -25,7 +25,7 @@ #ifndef QMPlay2GitHEAD #define QMPlay2GitHEAD #endif -#define QMPlay2Version "20.12.07" QMPlay2GitHEAD +#define QMPlay2Version "20.12.16" QMPlay2GitHEAD QByteArray Version::get() { _______________________________________________ openSUSE Commits mailing list -- commit@lists.opensuse.org To unsubscribe, email commit-le...@lists.opensuse.org List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
