Changeset 5f1d6e

Timestamp:

01/25/12 17:42:41 (4 months ago)

Author:

Micke Prag <micke.prag@…>

Branches:

('master', 'deebf2045e7119c339412580f37a1e653f7d5715')('controller-upgrade', '00f95d22e12d96ef089e0902ef62ae8ce841dc6f')

Children:

bf72debefba5c47023afd5993290995c613e4185

Parents:

c35be687c0ce2285842ccc1521a247b06c284b88

git-author:

Micke Prag <micke.prag@telldus.se>2012-01-25 17:42:41+01:00

git-committer:

Micke Prag <micke.prag@telldus.se>2012-01-25 17:42:41+01:00

Message:

Listen for suspend/resume signals and disconnect all usb-devices. This closes #171

Location:

telldus-core/service

Files:

• TelldusMain.cpp (modified) (1 diff)
• TelldusMain.h (modified) (1 diff)
• TelldusWinService_win.cpp (modified) (2 diffs)

telldus-core/service/TelldusMain.cpp

@@ -36 +36 @@
         data->pid = pid;
         data->inserted = inserted;
+        d->controllerChangeEvent->signal(data);
+}
+
+void TelldusMain::resume() {
+        Log::notice("Came back from suspend");
+        ControllerChangeEventData *data = new ControllerChangeEventData;
+        data->vid = 0x0;
+        data->pid = 0x0;
+        data->inserted = true;
+        d->controllerChangeEvent->signal(data);
+}
+
+void TelldusMain::suspend() {
+        Log::notice("Preparing for suspend");
+        ControllerChangeEventData *data = new ControllerChangeEventData;
+        data->vid = 0x0;
+        data->pid = 0x0;
+        data->inserted = false;
         d->controllerChangeEvent->signal(data);
 }

telldus-core/service/TelldusMain.h

@@ -13 +13 @@
         //Thread safe!
         void deviceInsertedOrRemoved(int vid, int pid, bool inserted);
+        void resume();
+        void suspend();
 
 private:

telldus-core/service/TelldusWinService_win.cpp

@@ -41 +41 @@
                         SetServiceStatus( serviceStatusHandle, &serviceStatus );
 
+                        return NO_ERROR;
+                case SERVICE_CONTROL_POWEREVENT:
+                        if (dwEventType == PBT_APMSUSPEND) {
+                                tm->suspend();
+                        } else if (dwEventType == PBT_APMRESUMEAUTOMATIC) {
+                                tm->resume();
+                        }
                         return NO_ERROR;
         }
@@ -138 +145 @@
                 // running
                 instance.serviceStatus.dwControlsAccepted |= (SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN);
+                // Register for power management notification
+                instance.serviceStatus.dwControlsAccepted |= SERVICE_ACCEPT_POWEREVENT;
                 instance.serviceStatus.dwCurrentState = SERVICE_RUNNING;
                 SetServiceStatus( instance.serviceStatusHandle, &instance.serviceStatus );