From e070845a2fec37b52cfedc40ae609d68ca4a5a63 Mon Sep 17 00:00:00 2001 From: Kevron Rees Date: Thu, 8 Aug 2013 13:50:17 -0700 Subject: fix reexport of certain properties to dbus --- plugins/dbus/custompropertyinterface.cpp | 2 +- plugins/dbus/dbusplugin.cpp | 2 +- plugins/dbus/dbusplugin.h | 2 +- plugins/dbus/uncategorizedproperty.cpp | 2 +- plugins/dbus/varianttype.cpp | 4 ++-- plugins/dbus/varianttype.h | 2 +- plugins/dbus/vehicleinfo.h | 4 ++-- plugins/wheel/wheelplugin.cpp | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/plugins/dbus/custompropertyinterface.cpp b/plugins/dbus/custompropertyinterface.cpp index a808b77b..b2ef92fb 100644 --- a/plugins/dbus/custompropertyinterface.cpp +++ b/plugins/dbus/custompropertyinterface.cpp @@ -19,7 +19,7 @@ CustomPropertyInterface::CustomPropertyInterface(VehicleProperty::Property prop, std::string signature = g_variant_get_type_string(temp->toVariant()); - propertyDBusMap[prop] = new VariantType(re, signature, prop, VariantType::ReadWrite, this); + propertyDBusMap[prop] = new VariantType(re, signature, prop, prop, VariantType::ReadWrite, this); delete temp; } diff --git a/plugins/dbus/dbusplugin.cpp b/plugins/dbus/dbusplugin.cpp index b0969071..da0e1a0d 100644 --- a/plugins/dbus/dbusplugin.cpp +++ b/plugins/dbus/dbusplugin.cpp @@ -72,5 +72,5 @@ std::string DBusSink::uuid() DBusSinkManager::DBusSinkManager(AbstractRoutingEngine *engine, map config) :AbstractSinkManager(engine, config) { - DBusInterfaceManager* manager = new DBusInterfaceManager(engine); + DBusInterfaceManager* manager = new DBusInterfaceManager(engine, config); } diff --git a/plugins/dbus/dbusplugin.h b/plugins/dbus/dbusplugin.h index ea8cd963..45e238b7 100644 --- a/plugins/dbus/dbusplugin.h +++ b/plugins/dbus/dbusplugin.h @@ -54,7 +54,7 @@ protected: void wantPropertyVariant(VehicleProperty::Property property, std::string propertyName, std::string signature, AbstractProperty::Access access) { - propertyDBusMap[property] = new VariantType(routingEngine, signature, property, access, this); + propertyDBusMap[property] = new VariantType(routingEngine, signature, property, propertyName, access, this); } PropertyDBusMap propertyDBusMap; diff --git a/plugins/dbus/uncategorizedproperty.cpp b/plugins/dbus/uncategorizedproperty.cpp index fdbbe8b4..6e7ef6e1 100644 --- a/plugins/dbus/uncategorizedproperty.cpp +++ b/plugins/dbus/uncategorizedproperty.cpp @@ -15,7 +15,7 @@ UncategorizedPropertyInterface::UncategorizedPropertyInterface(VehicleProperty:: std::string signature = g_variant_get_type_string(temp->toVariant()); - propertyDBusMap[prop] = new VariantType(re, signature, prop, VariantType::ReadWrite, this); + propertyDBusMap[prop] = new VariantType(re, signature, prop, prop, VariantType::ReadWrite, this); delete temp; diff --git a/plugins/dbus/varianttype.cpp b/plugins/dbus/varianttype.cpp index 5f568534..a47aefc0 100644 --- a/plugins/dbus/varianttype.cpp +++ b/plugins/dbus/varianttype.cpp @@ -2,12 +2,12 @@ #include "abstractroutingengine.h" #include "debugout.h" -VariantType::VariantType(AbstractRoutingEngine* re, std::string signature, std::string propertyName, Access access, AbstractDBusInterface *interface) +VariantType::VariantType(AbstractRoutingEngine* re, std::string signature, std::string propertyName, string ambPropName, Access access, AbstractDBusInterface *interface) :AbstractProperty(propertyName, signature, access, interface),routingEngine(re) { //set default value: setValue(VehicleProperty::getPropertyTypeForPropertyNameValue(propertyName)); - + mAmbPropertyName = ambPropName; AsyncPropertyRequest request; request.property = mPropertyName; diff --git a/plugins/dbus/varianttype.h b/plugins/dbus/varianttype.h index ad26dd98..7a290897 100644 --- a/plugins/dbus/varianttype.h +++ b/plugins/dbus/varianttype.h @@ -8,7 +8,7 @@ class VariantType: public AbstractProperty { public: - VariantType(AbstractRoutingEngine* re, string signature, string propertyName, Access access, AbstractDBusInterface* interface); + VariantType(AbstractRoutingEngine* re, string signature, string propertyName, string ambPropName, Access access, AbstractDBusInterface* interface); GVariant* toGVariant(); void fromGVariant(GVariant *value); diff --git a/plugins/dbus/vehicleinfo.h b/plugins/dbus/vehicleinfo.h index 65e8958e..a5f0904f 100644 --- a/plugins/dbus/vehicleinfo.h +++ b/plugins/dbus/vehicleinfo.h @@ -19,14 +19,14 @@ public: * @attributeComment \brief MUST return World Manufacturer Identifier (WMI) * @attributeComment WMI is defined by SAE ISO 3780:2009. 3 characters. **/ - wantPropertyString(VehicleProperty::WMI, "WMI", "s", AbstractProperty::Read); + wantPropertyVariant(VehicleProperty::WMI, "WMI", "s", AbstractProperty::Read); /** @attributeName VIN * @type DOMString * @access readonly * @attributeComment \brief MUST return Vehicle Identification Number (VIN) as defined by ISO 3779. 17 characters. **/ - wantPropertyString(VehicleProperty::VIN, "VIN", "s", AbstractProperty::Read); + wantPropertyVariant(VehicleProperty::VIN, "VIN", "s", AbstractProperty::Read); supportedChanged(re->supported()); } diff --git a/plugins/wheel/wheelplugin.cpp b/plugins/wheel/wheelplugin.cpp index e06f69f4..40e7f6a5 100644 --- a/plugins/wheel/wheelplugin.cpp +++ b/plugins/wheel/wheelplugin.cpp @@ -331,10 +331,10 @@ void WheelPrivate::newButtonValue(char number, bool val) checkButtonEvents(); break; case 4: //Right paddle shifter - this->changeMachineGuns(val); + this->changeGear(Transmission::TransmissionPositions(this->currentGear+1)); break; case 5: //Left paddle shifter - this->changeMachineGuns(val); + this->changeGear(Transmission::TransmissionPositions(this->currentGear-1)); break; case 6: //Right upper wheel button this->changeTurnSignal(TurnSignals::Right, val); -- cgit v1.2.1