Hello community,
here is the log from the commit of package QMPlay2 for openSUSE:Factory checked in at 2016-05-10 09:27:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/QMPlay2 (Old)
and /work/SRC/openSUSE:Factory/.QMPlay2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "QMPlay2"
Changes:
--------
--- /work/SRC/openSUSE:Factory/QMPlay2/QMPlay2.changes 2016-05-05 08:12:59.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.QMPlay2.new/QMPlay2.changes 2016-05-10 09:27:55.000000000 +0200
@@ -1,0 +2,8 @@
+Sat May 7 17:11:47 UTC 2016 - dap.darkness@gmail.com
+
+- Update to 16.05.06:
+ * split muted icon to muted and not muted,
+ * bugfix.
+- Updated QMPlay2-no-prostopleer.diff.
+
+-------------------------------------------------------------------
Old:
----
QMPlay2-src-16.05.02.tar.xz
New:
----
QMPlay2-src-16.05.06.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ QMPlay2.spec ++++++
--- /var/tmp/diff_new_pack.nRj6Kp/_old 2016-05-10 09:27:56.000000000 +0200
+++ /var/tmp/diff_new_pack.nRj6Kp/_new 2016-05-10 09:27:56.000000000 +0200
@@ -17,7 +17,7 @@
Name: QMPlay2
-Version: 16.05.02
+Version: 16.05.06
Release: 0
Summary: A Qt based media player, streamer and downloader
License: LGPL-3.0+
++++++ QMPlay2-no-prostopleer.diff ++++++
--- /var/tmp/diff_new_pack.nRj6Kp/_old 2016-05-10 09:27:56.000000000 +0200
+++ /var/tmp/diff_new_pack.nRj6Kp/_new 2016-05-10 09:27:56.000000000 +0200
@@ -52,10 +52,9 @@
/**/
--- src/modules/Extensions/icons.qrc.orig 2016-02-29 21:17:29.000000000 +0300
+++ src/modules/Extensions/icons.qrc 2016-03-12 13:04:34.278846080 +0300
-@@ -1,7 +1,6 @@
+@@ -1,6 +1,5 @@
<RCC>
<qresource>
- <file alias="browserengine">browserengine.png</file>
- <file alias="prostopleer">prostopleer.png</file>
<file alias="downloader">downloader.png</file>
<file alias="youtube">youtube.png</file>
++++++ QMPlay2-src-16.05.02.tar.xz -> QMPlay2-src-16.05.06.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-16.05.02/ChangeLog new/QMPlay2-src-16.05.06/ChangeLog
--- old/QMPlay2-src-16.05.02/ChangeLog 2016-05-02 15:24:43.000000000 +0200
+++ new/QMPlay2-src-16.05.06/ChangeLog 2016-05-06 13:59:07.000000000 +0200
@@ -1,3 +1,7 @@
+Changes in QMPlay2 build 16.05.06:
+ - split muted icon to muted and not muted,
+ - bugfix,
+
Changes in QMPlay2 build 16.05.02:
- fixed command line argument processing (now is possible to properly open or enqueue multiple files on Linux),
- playlist uses floating-point variables for storing length (accurate group length information),
Files old/QMPlay2-src-16.05.02/src/gui/Icons/audio-volume-high.png and new/QMPlay2-src-16.05.06/src/gui/Icons/audio-volume-high.png differ
Files old/QMPlay2-src-16.05.02/src/gui/Icons/audio-volume-muted.png and new/QMPlay2-src-16.05.06/src/gui/Icons/audio-volume-muted.png differ
Files old/QMPlay2-src-16.05.02/src/gui/Icons/media-playback-pause.png and new/QMPlay2-src-16.05.06/src/gui/Icons/media-playback-pause.png differ
Files old/QMPlay2-src-16.05.02/src/gui/Icons/media-playback-start.png and new/QMPlay2-src-16.05.06/src/gui/Icons/media-playback-start.png differ
Files old/QMPlay2-src-16.05.02/src/gui/Icons/media-playback-stop.png and new/QMPlay2-src-16.05.06/src/gui/Icons/media-playback-stop.png differ
Files old/QMPlay2-src-16.05.02/src/gui/Icons/media-skip-backward.png and new/QMPlay2-src-16.05.06/src/gui/Icons/media-skip-backward.png differ
Files old/QMPlay2-src-16.05.02/src/gui/Icons/media-skip-forward.png and new/QMPlay2-src-16.05.06/src/gui/Icons/media-skip-forward.png differ
Files old/QMPlay2-src-16.05.02/src/gui/Icons/view-fullscreen.png and new/QMPlay2-src-16.05.06/src/gui/Icons/view-fullscreen.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-16.05.02/src/gui/MainWidget.cpp new/QMPlay2-src-16.05.06/src/gui/MainWidget.cpp
--- old/QMPlay2-src-16.05.02/src/gui/MainWidget.cpp 2016-05-02 15:24:43.000000000 +0200
+++ new/QMPlay2-src-16.05.06/src/gui/MainWidget.cpp 2016-05-05 15:00:45.000000000 +0200
@@ -471,6 +471,11 @@
else if (sender() == menuBar->player->volDown)
volW->changeVolume(-5);
}
+void MainWidget::toggleMuteIcon()
+{
+ if (QAction *toggleMuteAct = qobject_cast(sender()))
+ toggleMuteAct->setIcon(QMPlay2Core.getIconFromTheme(toggleMuteAct->isChecked() ? "audio-volume-muted" : "audio-volume-high"));
+}
void MainWidget::actionSeek()
{
int seekTo = 0;
@@ -671,6 +676,7 @@
connect(menuBar->player->volUp, SIGNAL(triggered()), this, SLOT(volUpDown()));
connect(menuBar->player->volDown, SIGNAL(triggered()), this, SLOT(volUpDown()));
connect(menuBar->player->toggleMute, SIGNAL(triggered()), &playC, SLOT(toggleMute()));
+ connect(menuBar->player->toggleMute, SIGNAL(triggered()), this, SLOT(toggleMuteIcon()));
if (menuBar->player->suspend)
connect(menuBar->player->suspend, SIGNAL(triggered(bool)), &playC, SLOT(suspendWhenFinished(bool)));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-16.05.02/src/gui/MainWidget.hpp new/QMPlay2-src-16.05.06/src/gui/MainWidget.hpp
--- old/QMPlay2-src-16.05.02/src/gui/MainWidget.hpp 2016-05-02 15:24:43.000000000 +0200
+++ new/QMPlay2-src-16.05.06/src/gui/MainWidget.hpp 2016-05-05 14:59:16.000000000 +0200
@@ -52,6 +52,7 @@
void playStateChanged(bool);
void volUpDown();
+ void toggleMuteIcon();
void actionSeek();
void switchARatio();
void resetARatio();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-16.05.02/src/gui/MenuBar.cpp new/QMPlay2-src-16.05.06/src/gui/MenuBar.cpp
--- old/QMPlay2-src-16.05.02/src/gui/MenuBar.cpp 2016-05-02 15:24:43.000000000 +0200
+++ new/QMPlay2-src-16.05.06/src/gui/MenuBar.cpp 2016-05-05 15:06:11.000000000 +0200
@@ -167,7 +167,7 @@
addSeparator();
newAction(Player::tr("Volume &up"), this, QKeySequence("*"), volUp, true, QIcon(), false);
newAction(Player::tr("Volume &down"), this, QKeySequence("/"), volDown, true, QIcon(), false);
- newAction(Player::tr("&Mute"), this, QKeySequence("M"), toggleMute, false, QMPlay2Core.getIconFromTheme("audio-volume-muted"), true);
+ newAction(Player::tr("&Mute"), this, QKeySequence("M"), toggleMute, false, QMPlay2Core.getIconFromTheme("audio-volume-high"), true);
if (!QMPlay2CoreClass::canSuspend())
suspend = NULL;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-16.05.02/src/gui/PlayClass.cpp new/QMPlay2-src-16.05.06/src/gui/PlayClass.cpp
--- old/QMPlay2-src-16.05.02/src/gui/PlayClass.cpp 2016-05-02 15:24:43.000000000 +0200
+++ new/QMPlay2-src-16.05.06/src/gui/PlayClass.cpp 2016-05-05 00:51:18.000000000 +0200
@@ -1095,7 +1095,7 @@
{
if (tag.first.toInt() == QMPLAY2_TAG_LANGUAGE)
{
- if (tag.second == lang)
+ if (tag.second == lang || QMPlay2Core.getLanguagesMap().key(tag.second) == lang)
choosenLangStream = i;
break;
}
Files old/QMPlay2-src-16.05.02/src/gui/Windows/QMPlay2.ico and new/QMPlay2-src-16.05.06/src/gui/Windows/QMPlay2.ico differ
Files old/QMPlay2-src-16.05.02/src/gui/Windows/QMPlay2File.ico and new/QMPlay2-src-16.05.06/src/gui/Windows/QMPlay2File.ico differ
Files old/QMPlay2-src-16.05.02/src/gui/Windows/QMPlay2List.ico and new/QMPlay2-src-16.05.06/src/gui/Windows/QMPlay2List.ico differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-16.05.02/src/gui/resources.qrc new/QMPlay2-src-16.05.06/src/gui/resources.qrc
--- old/QMPlay2-src-16.05.02/src/gui/resources.qrc 2016-05-02 15:24:44.000000000 +0200
+++ new/QMPlay2-src-16.05.06/src/gui/resources.qrc 2016-05-05 15:04:08.000000000 +0200
@@ -19,6 +19,7 @@
<file>Icons/folder-open.png</file>
<file>Icons/view-refresh.png</file>
<file>Icons/audio-volume-muted.png</file>
+ <file>Icons/audio-volume-high.png</file>
<file>Icons/view-fullscreen.png</file>
<file>Icons/configure.png</file>
<file>Icons/application-exit.png</file>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-16.05.02/src/modules/Extensions/ProstoPleer.cpp new/QMPlay2-src-16.05.06/src/modules/Extensions/ProstoPleer.cpp
--- old/QMPlay2-src-16.05.02/src/modules/Extensions/ProstoPleer.cpp 2016-05-02 15:24:44.000000000 +0200
+++ new/QMPlay2-src-16.05.06/src/modules/Extensions/ProstoPleer.cpp 2016-05-06 15:07:41.000000000 +0200
@@ -143,7 +143,7 @@
searchB = new QToolButton;
connect(searchB, SIGNAL(clicked()), this, SLOT(search()));
- searchB->setIcon(QIcon(":/browserengine"));
+ searchB->setIcon(QIcon(":/search"));
searchB->setToolTip(tr("Search"));
searchB->setAutoRaise(true);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-16.05.02/src/modules/Extensions/YouTube.cpp new/QMPlay2-src-16.05.06/src/modules/Extensions/YouTube.cpp
--- old/QMPlay2-src-16.05.02/src/modules/Extensions/YouTube.cpp 2016-05-02 15:52:25.000000000 +0200
+++ new/QMPlay2-src-16.05.06/src/modules/Extensions/YouTube.cpp 2016-05-06 15:07:37.000000000 +0200
@@ -496,7 +496,7 @@
searchB = new QToolButton;
connect(searchB, SIGNAL(clicked()), this, SLOT(search()));
- searchB->setIcon(QIcon(":/browserengine"));
+ searchB->setIcon(QIcon(":/search"));
searchB->setToolTip(tr("Search"));
searchB->setAutoRaise(true);
Files old/QMPlay2-src-16.05.02/src/modules/Extensions/browserengine.png and new/QMPlay2-src-16.05.06/src/modules/Extensions/browserengine.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-16.05.02/src/modules/Extensions/icons.qrc new/QMPlay2-src-16.05.06/src/modules/Extensions/icons.qrc
--- old/QMPlay2-src-16.05.02/src/modules/Extensions/icons.qrc 2016-05-02 15:24:44.000000000 +0200
+++ new/QMPlay2-src-16.05.06/src/modules/Extensions/icons.qrc 2016-05-06 15:07:10.000000000 +0200
@@ -1,10 +1,10 @@
<RCC>
<qresource>
- <file alias="browserengine">browserengine.png</file>
<file alias="prostopleer">prostopleer.png</file>
<file alias="downloader">downloader.png</file>
<file alias="youtube">youtube.png</file>
<file alias="lastfm">lastfm.png</file>
+ <file alias="search">search.png</file>
<file alias="radio">radio.png</file>
<file alias="video">video.png</file>
</qresource>
Files old/QMPlay2-src-16.05.02/src/modules/Extensions/search.png and new/QMPlay2-src-16.05.06/src/modules/Extensions/search.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-16.05.02/src/modules/OpenGL2/OpenGL2Common.cpp new/QMPlay2-src-16.05.06/src/modules/OpenGL2/OpenGL2Common.cpp
--- old/QMPlay2-src-16.05.02/src/modules/OpenGL2/OpenGL2Common.cpp 2016-05-02 15:24:44.000000000 +0200
+++ new/QMPlay2-src-16.05.06/src/modules/OpenGL2/OpenGL2Common.cpp 2016-05-06 01:45:14.000000000 +0200
@@ -98,7 +98,12 @@
}
doReset = true;
if (canUpdate)
- updateGL(!isPaused);
+ {
+ if (isPaused)
+ updateGL(false);
+ else if (!updateTimer.isActive())
+ updateTimer.start(40);
+ }
}
void OpenGL2Common::clearImg()
{
@@ -413,6 +418,9 @@
osdMutex.unlock();
glBindTexture(GL_TEXTURE_2D, 0);
+
+ if (updateTimer.isActive())
+ updateTimer.stop();
}
void OpenGL2Common::testGLInternal()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-16.05.02/src/modules/OpenGL2/OpenGL2Common.hpp new/QMPlay2-src-16.05.06/src/modules/OpenGL2/OpenGL2Common.hpp
--- old/QMPlay2-src-16.05.02/src/modules/OpenGL2/OpenGL2Common.hpp 2016-05-02 15:24:44.000000000 +0200
+++ new/QMPlay2-src-16.05.06/src/modules/OpenGL2/OpenGL2Common.hpp 2016-05-06 01:30:54.000000000 +0200
@@ -14,6 +14,7 @@
#include <QCoreApplication>
#include <QImage>
#include <QMutex>
+#include <QTimer>
#if !defined OPENGL_ES2 && !defined Q_OS_MAC
#include
@@ -128,6 +129,8 @@
QList<QByteArray> osdChecksums;
QImage osdImg;
+ QTimer updateTimer;
+
/* Spherical view */
bool sphericalView, buttonPressed, hasVbo, mouseWrapped, canWrapMouse;
RotAnimation rotAnimation;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-16.05.02/src/modules/OpenGL2/OpenGL2OldWidget.cpp new/QMPlay2-src-16.05.06/src/modules/OpenGL2/OpenGL2OldWidget.cpp
--- old/QMPlay2-src-16.05.02/src/modules/OpenGL2/OpenGL2OldWidget.cpp 2016-05-02 15:24:44.000000000 +0200
+++ new/QMPlay2-src-16.05.06/src/modules/OpenGL2/OpenGL2OldWidget.cpp 2016-05-06 01:37:17.000000000 +0200
@@ -4,6 +4,8 @@
OpenGL2OldWidget::OpenGL2OldWidget()
{
+ connect(&updateTimer, SIGNAL(timeout()), this, SLOT(updateGL())); //updateGL() from the base class
+
#ifdef Q_OS_WIN
preventFullscreen = true;
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-16.05.02/src/modules/OpenGL2/OpenGL2Widget.cpp new/QMPlay2-src-16.05.06/src/modules/OpenGL2/OpenGL2Widget.cpp
--- old/QMPlay2-src-16.05.02/src/modules/OpenGL2/OpenGL2Widget.cpp 2016-05-02 15:24:44.000000000 +0200
+++ new/QMPlay2-src-16.05.06/src/modules/OpenGL2/OpenGL2Widget.cpp 2016-05-06 01:35:10.000000000 +0200
@@ -1,5 +1,10 @@
#include "OpenGL2Widget.hpp"
+OpenGL2Widget::OpenGL2Widget()
+{
+ connect(&updateTimer, SIGNAL(timeout()), this, SLOT(update()));
+}
+
QWidget *OpenGL2Widget::widget()
{
return this;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-16.05.02/src/modules/OpenGL2/OpenGL2Widget.hpp new/QMPlay2-src-16.05.06/src/modules/OpenGL2/OpenGL2Widget.hpp
--- old/QMPlay2-src-16.05.02/src/modules/OpenGL2/OpenGL2Widget.hpp 2016-05-02 15:24:44.000000000 +0200
+++ new/QMPlay2-src-16.05.06/src/modules/OpenGL2/OpenGL2Widget.hpp 2016-05-06 01:34:59.000000000 +0200
@@ -9,6 +9,8 @@
class OpenGL2Widget : public QOpenGLWidget, public OpenGL2CommonQt5
{
public:
+ OpenGL2Widget();
+
QWidget *widget();
bool setVSync(bool enable);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-16.05.02/src/modules/OpenGL2/OpenGL2Window.cpp new/QMPlay2-src-16.05.06/src/modules/OpenGL2/OpenGL2Window.cpp
--- old/QMPlay2-src-16.05.02/src/modules/OpenGL2/OpenGL2Window.cpp 2016-05-02 15:24:44.000000000 +0200
+++ new/QMPlay2-src-16.05.06/src/modules/OpenGL2/OpenGL2Window.cpp 2016-05-06 01:40:44.000000000 +0200
@@ -7,6 +7,8 @@
OpenGL2Window::OpenGL2Window() :
visible(true)
{
+ connect(&updateTimer, SIGNAL(timeout()), this, SLOT(doUpdateGL()));
+
#ifndef PASS_EVENTS_TO_PARENT
setFlags(Qt::WindowTransparentForInput);
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-16.05.02/src/modules/OpenGL2/OpenGL2Window.hpp new/QMPlay2-src-16.05.06/src/modules/OpenGL2/OpenGL2Window.hpp
--- old/QMPlay2-src-16.05.02/src/modules/OpenGL2/OpenGL2Window.hpp 2016-05-02 15:24:44.000000000 +0200
+++ new/QMPlay2-src-16.05.06/src/modules/OpenGL2/OpenGL2Window.hpp 2016-05-06 01:33:45.000000000 +0200
@@ -28,7 +28,7 @@
private slots:
void resetClearCounter();
- void doUpdateGL(bool queued);
+ void doUpdateGL(bool queued = false);
void videoVisible1(bool v);
void videoVisible2(bool v);
private:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-16.05.02/src/qmplay2/headers/Version.hpp new/QMPlay2-src-16.05.06/src/qmplay2/headers/Version.hpp
--- old/QMPlay2-src-16.05.02/src/qmplay2/headers/Version.hpp 2016-05-02 15:24:44.000000000 +0200
+++ new/QMPlay2-src-16.05.06/src/qmplay2/headers/Version.hpp 2016-05-06 13:59:26.000000000 +0200
@@ -1,7 +1,7 @@
#ifndef VERSION_HPP
#define VERSION_HPP
-#define QMPlay2Version "16.05.02"
+#define QMPlay2Version "16.05.06"
#define QMPlay2UserAgent ("QMPlay2/" QMPlay2Version)
#endif // VERSION_HPP
Files old/QMPlay2-src-16.05.02/src/svg/QMPlay2.svgz and new/QMPlay2-src-16.05.06/src/svg/QMPlay2.svgz differ
Files old/QMPlay2-src-16.05.02/src/svg/QMPlay2File.svgz and new/QMPlay2-src-16.05.06/src/svg/QMPlay2File.svgz differ
Files old/QMPlay2-src-16.05.02/src/svg/QMPlay2List.svgz and new/QMPlay2-src-16.05.06/src/svg/QMPlay2List.svgz differ
Files old/QMPlay2-src-16.05.02/src/svg/browserengine.svgz and new/QMPlay2-src-16.05.06/src/svg/browserengine.svgz differ
Files old/QMPlay2-src-16.05.02/src/svg/downloader.svgz and new/QMPlay2-src-16.05.06/src/svg/downloader.svgz differ
Files old/QMPlay2-src-16.05.02/src/svg/filters.svgz and new/QMPlay2-src-16.05.06/src/svg/filters.svgz differ
Files old/QMPlay2-src-16.05.02/src/svg/media-playback-pause.svgz and new/QMPlay2-src-16.05.06/src/svg/media-playback-pause.svgz differ
Files old/QMPlay2-src-16.05.02/src/svg/media-playback-start.svgz and new/QMPlay2-src-16.05.06/src/svg/media-playback-start.svgz differ
Files old/QMPlay2-src-16.05.02/src/svg/media-playback-stop.svgz and new/QMPlay2-src-16.05.06/src/svg/media-playback-stop.svgz differ
Files old/QMPlay2-src-16.05.02/src/svg/media-skip-backward.svgz and new/QMPlay2-src-16.05.06/src/svg/media-skip-backward.svgz differ
Files old/QMPlay2-src-16.05.02/src/svg/media-skip-forward.svgz and new/QMPlay2-src-16.05.06/src/svg/media-skip-forward.svgz differ
Files old/QMPlay2-src-16.05.02/src/svg/search.svgz and new/QMPlay2-src-16.05.06/src/svg/search.svgz differ