Changeset 584bc7

Timestamp:

08/16/09 16:03:18 (4 years ago)

Author:

Micke Prag <micke.prag@…>

Branches:

('master', 'a231b56d57a69513303d0061f5fa3e3cd51c85c1')('controller-upgrade', '72b31cc86eeeef18f1371a3067b6e8a5ca21abfc')('windows_service_fixes', 'df6bd2788365991d36d5af2a75833b8de2a5860f')

Children:

528598e862013bc08845c43f10f0e9908711cce4

Parents:

c41e5de4f761799a4d41bb05ea8a84d14d0ef9d7

git-author:

Micke Prag <micke.prag@telldus.se>2009-08-16 14:03:18+00:00

git-committer:

Micke Prag <micke.prag@telldus.se>2009-08-16 14:03:18+00:00

Message:

Made telldus-core report back when the state of a device changes

File:

• telldus-core/driver/libtelldus-core/Manager.cpp (modified) (3 diffs)

telldus-core/driver/libtelldus-core/Manager.cpp

@@ -36 +36 @@
 #define strcasecmp _stricmp
 #endif
+
+//Defined in telldus-core.cpp
+extern char *wrapStdString( const std::string &string);
+
 
 using namespace TelldusCore;
@@ -179 +183 @@
 bool Manager::setDeviceState( int intDeviceId, int intDeviceState, const std::string &strDeviceStateValue ) {
         if (intDeviceState != TELLSTICK_BELL) {
-                return settings.setDeviceState(intDeviceId, intDeviceState, strDeviceStateValue);
+                bool retval = settings.setDeviceState(intDeviceId, intDeviceState, strDeviceStateValue);
+                for(CallbackList::const_iterator callback_it = callbacks.begin(); callback_it != callbacks.end(); ++callback_it) {
+                        (*callback_it).event(intDeviceId, intDeviceState, wrapStdString(strDeviceStateValue), (*callback_it).id, (*callback_it).context);
+                }
+                
+                return retval;
         }
         return true;
@@ -240 +249 @@
                 }
                 if (found) {
-                        //First save the last sent command
+                        //First save the last sent command, this also triggers the callback to the client
                         setDeviceState(it->first, method, "");
-                        for(CallbackList::const_iterator callback_it = callbacks.begin(); callback_it != callbacks.end(); ++callback_it) {
-                                (*callback_it).event(it->first, method, message.c_str(), (*callback_it).id, (*callback_it).context);
-                        }
                 }
         }