fix: don't sleep while playing.

Change-Id: I0e35356fe91b0f6cf159325ba7c68731584ed961

Author: rekols

src/common/mainwindow.cpp

@@ -628,8 +628,30 @@ MainWindow::MainWindow(QWidget *parent)
         qDebug() << __func__ << _engine->state();
         if (_engine->state() == PlayerEngine::CoreState::Playing) {
             _miniPlayBtn->setObjectName("MiniPauseBtn");
+
+            if (_lastCookie > 0) {
+                utils::UnInhibitStandby(_lastCookie);
+                qDebug() << "uninhibit cookie" << _lastCookie;
+                _lastCookie = 0;
+            }
+            if (_powerCookie > 0) {
+                utils::UnInhibitPower(_powerCookie);
+                _powerCookie = 0;
+            }
+            _lastCookie = utils::InhibitStandby();
+            _powerCookie = utils::InhibitPower();
         } else {
             _miniPlayBtn->setObjectName("MiniPlayBtn");
+
+            if (_lastCookie > 0) {
+                utils::UnInhibitStandby(_lastCookie);
+                qDebug() << "uninhibit cookie" << _lastCookie;
+                _lastCookie = 0;
+            }
+            if (_powerCookie > 0) {
+                utils::UnInhibitPower(_powerCookie);
+                _powerCookie = 0;
+            }
         }
         _miniPlayBtn->setStyleSheet(_miniPlayBtn->styleSheet());
     });
@@ -851,26 +873,26 @@ void MainWindow::onWindowStateChanged()
 {
     qDebug() << windowState();
 
-    if (!isFullScreen()) {
-        qApp->restoreOverrideCursor();
-        if (_lastCookie > 0) {
-            utils::UnInhibitStandby(_lastCookie);
-            qDebug() << "uninhibit cookie" << _lastCookie;
-            _lastCookie = 0;
-        }
-        if (_listener) _listener->setEnabled(!isMaximized() && !_miniMode);
-    } else {
-        qApp->setOverrideCursor(Qt::BlankCursor);
-
-        if (_lastCookie > 0) {
-            utils::UnInhibitStandby(_lastCookie);
-            qDebug() << "uninhibit cookie" << _lastCookie;
-            _lastCookie = 0;
-        }
-        _lastCookie = utils::InhibitStandby();
-        qDebug() << "inhibit cookie" << _lastCookie;
-        if (_listener) _listener->setEnabled(false);
-    }
+//    if (!isFullScreen()) {
+//        qApp->restoreOverrideCursor();
+//        if (_lastCookie > 0) {
+//            utils::UnInhibitStandby(_lastCookie);
+//            qDebug() << "uninhibit cookie" << _lastCookie;
+//            _lastCookie = 0;
+//        }
+//        if (_listener) _listener->setEnabled(!isMaximized() && !_miniMode);
+//    } else {
+//        qApp->setOverrideCursor(Qt::BlankCursor);
+
+//        if (_lastCookie > 0) {
+//            utils::UnInhibitStandby(_lastCookie);
+//            qDebug() << "uninhibit cookie" << _lastCookie;
+//            _lastCookie = 0;
+//        }
+//        _lastCookie = utils::InhibitStandby();
+//        qDebug() << "inhibit cookie" << _lastCookie;
+//        if (_listener) _listener->setEnabled(false);
+//    }
     if (!_miniMode && !isFullScreen()) {
         _titlebar->setVisible(_toolbox->isVisible());
     } else {
@@ -969,6 +991,16 @@ MainWindow::~MainWindow()
     disconnect(_engine, 0, 0, 0);
     disconnect(&_engine->playlist(), 0, 0, 0);
 
+    if (_lastCookie > 0) {
+        utils::UnInhibitStandby(_lastCookie);
+        qDebug() << "uninhibit cookie" << _lastCookie;
+        _lastCookie = 0;
+    }
+    if (_powerCookie > 0) {
+        utils::UnInhibitPower(_powerCookie);
+        _powerCookie = 0;
+    }
+
 #ifdef USE_DXCB
     if (_evm) {
         disconnect(_evm, 0, 0, 0);

src/common/mainwindow.h

@@ -216,6 +216,7 @@ protected slots:
     Qt::WindowStates _lastWindowState {Qt::WindowNoState};
 
     uint32_t _lastCookie {0};
+    uint32_t _powerCookie {0};
 
     MainWindowEventListener *_listener {nullptr};
     NotificationWidget *_nwShot {nullptr};

src/libdmr/utils.cpp

@@ -292,9 +292,11 @@ QPixmap MakeRoundedPixmap(QSize sz, QPixmap pm, qreal rx, qreal ry, qint64 time)
 
 uint32_t InhibitStandby()
 {
-    QDBusInterface iface("org.freedesktop.ScreenSaver", "/org/freedesktop/ScreenSaver",
-            "org.freedesktop.ScreenSaver");
+    QDBusInterface iface("org.freedesktop.ScreenSaver",
+                         "/org/freedesktop/ScreenSaver",
+                         "org.freedesktop.ScreenSaver");
     QDBusReply<uint32_t> reply = iface.call("Inhibit", "deepin-movie", "playing in fullscreen");
+
     if (reply.isValid()) {
         return reply.value();
     }
@@ -305,8 +307,32 @@ uint32_t InhibitStandby()
 
 void UnInhibitStandby(uint32_t cookie)
 {
-    QDBusInterface iface("org.freedesktop.ScreenSaver", "/org/freedesktop/ScreenSaver",
-            "org.freedesktop.ScreenSaver");
+    QDBusInterface iface("org.freedesktop.ScreenSaver",
+                         "/org/freedesktop/ScreenSaver",
+                         "org.freedesktop.ScreenSaver");
+    iface.call("UnInhibit", cookie);
+}
+
+uint32_t InhibitPower()
+{
+    QDBusInterface iface("org.freedesktop.PowerManagement",
+                         "/org/freedesktop/PowerManagement",
+                         "org.freedesktop.PowerManagement");
+    QDBusReply<uint32_t> reply = iface.call("Inhibit", "deepin-movie", "playing in fullscreen");
+
+    if (reply.isValid()) {
+        return reply.value();
+    }
+
+    qDebug() << reply.error().message();
+    return 0;
+}
+
+void UnInhibitPower(uint32_t cookie)
+{
+    QDBusInterface iface("org.freedesktop.PowerManagement",
+                         "/org/freedesktop/PowerManagement",
+                         "org.freedesktop.PowerManagement");
     iface.call("UnInhibit", cookie);
 }
 

src/libdmr/utils.h

@@ -50,6 +50,9 @@ namespace utils {
     uint32_t InhibitStandby();
     void UnInhibitStandby(uint32_t cookie);
 
+    uint32_t InhibitPower();
+    void UnInhibitPower(uint32_t cookie);
+
     void MoveToCenter(QWidget* w);
 
     QString Time2str(qint64 seconds);