Hello community,

here is the log from the commit of package dragonplayer for openSUSE:Factory 
checked in at 2014-07-16 16:18:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dragonplayer (Old)
 and      /work/SRC/openSUSE:Factory/.dragonplayer.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "dragonplayer"

Changes:
--------
--- /work/SRC/openSUSE:Factory/dragonplayer/dragonplayer.changes        
2014-06-19 13:16:45.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.dragonplayer.new/dragonplayer.changes   
2014-07-16 16:19:40.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Jul 10 22:16:15 UTC 2014 - cgiboude...@gmx.com
+
+- Update to 4.13.80
+   * KDE 4.14 Beta 1 release
+   * See http://www.kde.org/announcements/announce-4.14-beta1.php
+
+-------------------------------------------------------------------

Old:
----
  dragon-4.13.2.tar.xz

New:
----
  dragon-4.13.80.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ dragonplayer.spec ++++++
--- /var/tmp/diff_new_pack.1XGgnJ/_old  2014-07-16 16:19:41.000000000 +0200
+++ /var/tmp/diff_new_pack.1XGgnJ/_new  2014-07-16 16:19:41.000000000 +0200
@@ -23,7 +23,7 @@
 License:        GPL-2.0+
 Group:          Productivity/Multimedia/Video/Players
 Url:            http://dragonplayer.org/
-Version:        4.13.2
+Version:        4.13.80
 Release:        0
 Source0:        dragon-%{version}.tar.xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

++++++ dragon-4.13.2.tar.xz -> dragon-4.13.80.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/dragon-4.13.2/src/app/mainWindow.cpp 
new/dragon-4.13.80/src/app/mainWindow.cpp
--- old/dragon-4.13.2/src/app/mainWindow.cpp    2014-05-04 09:34:39.000000000 
+0200
+++ new/dragon-4.13.80/src/app/mainWindow.cpp   2014-06-25 06:28:36.000000000 
+0200
@@ -865,9 +865,9 @@
 {
     if (m_stopSleepCookie == -1)
         m_stopSleepCookie = 
Solid::PowerManagement::beginSuppressingSleep(QLatin1String( "watching a film" 
));
-    if (m_stopScreenPowerMgmtCookie == -1)
+    if (m_stopScreenPowerMgmtCookie == -1 && TheStream::hasVideo())
         m_stopScreenPowerMgmtCookie = 
Solid::PowerManagement::beginSuppressingScreenPowerManagement(QLatin1String( 
"watching a film" ));
-    if (!m_stopScreenSaver)
+    if (!m_stopScreenSaver && TheStream::hasVideo())
         m_stopScreenSaver = new 
KNotificationRestrictions(KNotificationRestrictions::ScreenSaver);
 }
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/dragon-4.13.2/src/app/stateChange.cpp 
new/dragon-4.13.80/src/app/stateChange.cpp
--- old/dragon-4.13.2/src/app/stateChange.cpp   2014-05-04 09:34:39.000000000 
+0200
+++ new/dragon-4.13.80/src/app/stateChange.cpp  2014-06-25 06:28:36.000000000 
+0200
@@ -99,7 +99,7 @@
     /// turn off screensaver
     if( state == Phonon::PlayingState )
         inhibitPowerSave();
-    else if( Phonon::StoppedState || !TheStream::hasMedia() )
+    else if( state == Phonon::StoppedState || !TheStream::hasMedia() )
         releasePowerSave();
 
     updateTitleBarText();
@@ -191,6 +191,14 @@
     m_mainView->setCurrentWidget(m_audioView);
     m_currentWidget = m_audioView;
   }
+
+  if (TheStream::hasVideo()) {
+    inhibitPowerSave();
+    // Assumption: since we have no playlist the only way to release 
suppression
+    // is through going into stopped state. This also means that should there
+    // ever be a playlist playing video and then audio will possibly not
+    // release video specific inhibitions.
+  }
 }
 
 }//namespace
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/dragon-4.13.2/src/mpris2/mpris2.cpp 
new/dragon-4.13.80/src/mpris2/mpris2.cpp
--- old/dragon-4.13.2/src/mpris2/mpris2.cpp     2014-05-04 09:34:39.000000000 
+0200
+++ new/dragon-4.13.80/src/mpris2/mpris2.cpp    2014-06-25 06:28:36.000000000 
+0200
@@ -59,12 +59,9 @@
     QDBusMessage msg = QDBusMessage::createSignal("/org/mpris/MediaPlayer2",
         "org.freedesktop.DBus.Properties", "PropertiesChanged" );
 
-    QVariantList args;
-    args << adaptor->metaObject()->classInfo(0).value();
-    args << properties;
-    args << QStringList();
-
-    msg.setArguments(args);
+    msg << adaptor->metaObject()->classInfo(0).value();
+    msg << properties;
+    msg << QStringList();
 
     QDBusConnection::sessionBus().send(msg);
 }

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to