Separate the ScreenSaver base class from the ScreenSaverController.

This is a preliminary step to allow multiple screen saver control methods to be utilized at the same time. Refs #12438 Refs #12414
MythTV · May 1, 2015 · b1c3c35 · b1c3c35
1 parent 70ae25d
commit b1c3c35
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 16 deletions.
diff --git a/mythtv/libs/libmythui/mythuihelper.cpp b/mythtv/libs/libmythui/mythuihelper.cpp
@@ -202,7 +202,7 @@ MythUIHelperPrivate::~MythUIHelperPrivate()
 
 void MythUIHelperPrivate::Init(void)
 {
-    screensaver = ScreenSaverControl::get();
+    screensaver = new ScreenSaverControl();
     GetScreenBounds();
     StoreGUIsettings();
     screenSetup = true;

diff --git a/mythtv/libs/libmythui/screensaver-dbus.h b/mythtv/libs/libmythui/screensaver-dbus.h
@@ -4,7 +4,7 @@
 #include "screensaver.h"
 #include "QDBusConnection"
 
-class ScreenSaverDBus : public ScreenSaverControl
+class ScreenSaverDBus : public ScreenSaver
 {
   public:
     ScreenSaverDBus();

diff --git a/mythtv/libs/libmythui/screensaver-null.h b/mythtv/libs/libmythui/screensaver-null.h
@@ -3,7 +3,7 @@
 
 #include "screensaver.h"
 
-class ScreenSaverNull : public ScreenSaverControl
+class ScreenSaverNull : public ScreenSaver
 {
 public:
     ScreenSaverNull();

diff --git a/mythtv/libs/libmythui/screensaver-osx.h b/mythtv/libs/libmythui/screensaver-osx.h
@@ -3,7 +3,7 @@
 
 #include "screensaver.h"
 
-class ScreenSaverOSX : public ScreenSaverControl
+class ScreenSaverOSX : public ScreenSaver
 {
 public:
     ScreenSaverOSX();

diff --git a/mythtv/libs/libmythui/screensaver-x11.h b/mythtv/libs/libmythui/screensaver-x11.h
@@ -5,7 +5,7 @@
 
 #include "screensaver.h"
 
-class ScreenSaverX11 : public QObject, public ScreenSaverControl
+class ScreenSaverX11 : public QObject, public ScreenSaver
 {
     Q_OBJECT
 

diff --git a/mythtv/libs/libmythui/screensaver.cpp b/mythtv/libs/libmythui/screensaver.cpp
@@ -17,13 +17,12 @@
 QEvent::Type ScreenSaverEvent::kEventType =
     (QEvent::Type) QEvent::registerEventType();
 
-ScreenSaverControl* ScreenSaverSingleton = NULL;
+ScreenSaver* ScreenSaverSingleton = NULL;
 
-ScreenSaverControl* ScreenSaverControl::get(void)
+ScreenSaverControl::ScreenSaverControl()
 {
     if (!ScreenSaverSingleton)
     {
-
 #if defined(USING_DBUS)
         ScreenSaverSingleton = new ScreenSaverDBus();
 #elif defined(USING_X11)
@@ -34,6 +33,24 @@ ScreenSaverControl* ScreenSaverControl::get(void)
         ScreenSaverSingleton = new ScreenSaverNull();
 #endif
     }
+}
+
+ScreenSaverControl::~ScreenSaverControl() {
+    delete ScreenSaverSingleton;
+}
+
+void ScreenSaverControl::Disable(void) {
+    ScreenSaverSingleton->Disable();
+}
+
+void ScreenSaverControl::Restore(void) {
+    ScreenSaverSingleton->Restore();
+}
+
+void ScreenSaverControl::Reset(void) {
+    ScreenSaverSingleton->Reset();
+}
 
-    return ScreenSaverSingleton;
+bool ScreenSaverControl::Asleep(void) {
+    return ScreenSaverSingleton->Asleep();
 }
diff --git a/mythtv/libs/libmythui/screensaver.h b/mythtv/libs/libmythui/screensaver.h
@@ -24,20 +24,30 @@ class ScreenSaverEvent : public QEvent
     ScreenSaverEventKind sset;
 };
 
-class ScreenSaverControl
+/// Base Class for screensavers
+class ScreenSaver
 {
   public:
-    // creates one of the concrete subsclasses
-    static ScreenSaverControl* get(void);
-
-    ScreenSaverControl() { };
-    virtual ~ScreenSaverControl() { };
+    ScreenSaver() { };
+    virtual ~ScreenSaver() { };
 
     virtual void Disable(void) = 0;
     virtual void Restore(void) = 0;
     virtual void Reset(void) = 0;
-
     virtual bool Asleep(void) = 0;
 };
 
+/// Controls all instances of the screensaver
+class ScreenSaverControl
+{
+  public:
+    ScreenSaverControl();
+    ~ScreenSaverControl();
+
+    void Disable(void);
+    void Restore(void);
+    void Reset(void);
+    bool Asleep(void);
+};
+
 #endif // MYTH_SCREENSAVER_H