Changeset c35be6

Timestamp:

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

Author:

Micke Prag <micke.prag@…>

Branches:

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

Children:

5f1d6e7fe54aba7fe19fecb3800e50322165b5ea

Parents:

e69f7abba82ffdcb5f6bc755d4eb4f009cbfe0d1

git-author:

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

git-committer:

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

Message:

pid=0 and vid=0 means all. This way we can easily disconnect all controllers or initiate a rescan

File:

• telldus-core/service/ControllerManager.cpp (modified) (1 diff)

telldus-core/service/ControllerManager.cpp

@@ -34 +34 @@
 
 void ControllerManager::deviceInsertedOrRemoved(int vid, int pid, const std::string &serial, bool inserted) {
+        if (vid == 0x0 && pid == 0x0) { //All
+                if (inserted) {
+                        loadControllers();
+                } else {
+                        //Disconnect all
+                        TelldusCore::MutexLocker locker(&d->mutex);
+                        while(d->controllers.size()) {
+                                ControllerMap::iterator it = d->controllers.begin();
+                                delete it->second;
+                                d->controllers.erase(it);
+                        }
+                }
+                return;
+        }
         if (vid != 0x1781) {
                 return;