diff options
| author | Kevron Rees <tripzero.kev@gmail.com> | 2013-03-16 01:30:30 -0700 |
|---|---|---|
| committer | Kevron Rees <tripzero.kev@gmail.com> | 2013-03-16 01:30:30 -0700 |
| commit | b009ae7fbc57ac43228cd47fc8ae3c85f90aa083 (patch) | |
| tree | 42905bf6a89152ece2744b7af3019b59ef56ded0 | |
| parent | d8bb595551c6120b7f9458132dcf907958b5aa1f (diff) | |
| parent | 269d19cc9f079ec398be9020301cfa86c85692f9 (diff) | |
| download | automotive-message-broker-b009ae7fbc57ac43228cd47fc8ae3c85f90aa083.tar.gz | |
Merge branch 'master' of https://github.com/otcshare/automotive-message-broker
| -rw-r--r-- | plugins/dbus/amb.idl | 6 | ||||
| -rw-r--r-- | plugins/dbus/parking.h | 4 | ||||
| -rw-r--r-- | plugins/websocketsourceplugin/websocketsource.cpp | 5 |
3 files changed, 6 insertions, 9 deletions
diff --git a/plugins/dbus/amb.idl b/plugins/dbus/amb.idl index 707aa67b..7b81b912 100644 --- a/plugins/dbus/amb.idl +++ b/plugins/dbus/amb.idl @@ -195,7 +195,7 @@ interface ParkingLight { }; [NoInterfaceObject] -interface ParkingLight { +interface HazardLight { readonly attribute boolean HazardLight; }; @@ -213,8 +213,8 @@ interface VehiclePropertyType { [NoInterfaceObject] interface Vehicle { sequence<DOMString> getSupported(); - VehiclePropertyType get(DOMString event); - void set(DOMString event, object value); + object get(DOMString property); + void set(DOMString property, object value); sequence<VehiclePropertyTypes> getHistory(DOMString type, Date startTime, Date endTime); }; diff --git a/plugins/dbus/parking.h b/plugins/dbus/parking.h index 9a060367..18337f51 100644 --- a/plugins/dbus/parking.h +++ b/plugins/dbus/parking.h @@ -58,12 +58,12 @@ public: } }; -/** @interface ParkingLight **/ +/** @interface HazardLight **/ class HazardLightProperty: public DBusSink { public: HazardLightProperty(AbstractRoutingEngine* re, GDBusConnection* connection) - :DBusSink("org.automotive.ParkingLight","/org/automotive/parking/ParkingLight", re, connection, map<string, string>()) + :DBusSink("org.automotive.HazardLight","/org/automotive/parking/HazardLight", re, connection, map<string, string>()) { /** @attributeName HazardLight * @type boolean diff --git a/plugins/websocketsourceplugin/websocketsource.cpp b/plugins/websocketsourceplugin/websocketsource.cpp index a7550613..c2428dec 100644 --- a/plugins/websocketsourceplugin/websocketsource.cpp +++ b/plugins/websocketsourceplugin/websocketsource.cpp @@ -235,9 +235,6 @@ static int callback_http_only(libwebsocket_context *context,struct libwebsocket DebugOut(2)<<"websocket source pre-json parse time: "<<prejsonparsetime<<endl; - for(int i=0;i<1000;i++) - { - //Incoming JSON reqest. GError* error = nullptr; JsonParser* parser = json_parser_new(); @@ -494,7 +491,7 @@ static int callback_http_only(libwebsocket_context *context,struct libwebsocket g_object_unref(parser); break; - } + } case LWS_CALLBACK_CLIENT_CONFIRM_EXTENSION_SUPPORTED: { |