diff options
author | Jens Lorenz <jlorenz@de.adit-jv.com> | 2014-06-11 18:14:58 +0200 |
---|---|---|
committer | Christian Linke <christian.linke@bmw.de> | 2014-06-23 14:05:37 +0200 |
commit | 20491c0f31d70e254c56f171c69b95f3d4ad2813 (patch) | |
tree | 5409ce980ecf4285a21cf0f1b38ba19dafe3129a /PluginCommandInterfaceDbus | |
parent | b0bc6ede2d23dde9a177483aa9470871422fe9aa (diff) | |
download | audiomanager-20491c0f31d70e254c56f171c69b95f3d4ad2813.tar.gz |
* Bug #100 - removed projecttypes.h which causes compiling conflicts5.1
Signed-off-by: Jens Lorenz <jlorenz@de.adit-jv.com>
Diffstat (limited to 'PluginCommandInterfaceDbus')
3 files changed, 12 insertions, 12 deletions
diff --git a/PluginCommandInterfaceDbus/include/CommandInterface.xml b/PluginCommandInterfaceDbus/include/CommandInterface.xml index 87cb6a2..bab2604 100644 --- a/PluginCommandInterfaceDbus/include/CommandInterface.xml +++ b/PluginCommandInterfaceDbus/include/CommandInterface.xml @@ -69,13 +69,13 @@ <method name="GetListMainSinkSoundProperties">
<arg type="q" name="sinkID" direction="in"/>
<arg type="n" name="result" direction="out"/> <!-- method return code (am_Error_e) -->
- <arg type="a(nn)" name="listSoundProperties" direction="out"/> <!-- am_MainSoundPropertyType_e type; int16_t value; -->
+ <arg type="a(nn)" name="listSoundProperties" direction="out"/> <!-- am_CustomMainSoundPropertyType_t type; int16_t value; --> </method>
<method name="GetListMainSourceSoundProperties">
<arg type="q" name="sourceID" direction="in"/>
<arg type="n" name="result" direction="out"/> <!-- method return code (am_Error_e) -->
- <arg type="a(nn)" name="listSourceProperties" direction="out"/> <!-- am_MainSoundPropertyType_e type; int16_t value; -->
+ <arg type="a(nn)" name="listSourceProperties" direction="out"/> <!-- am_CustomMainSoundPropertyType_t type; int16_t value; --> </method>
<method name="GetListSourceClasses">
@@ -194,13 +194,13 @@ <signal name="SinkUpdated">
<arg type="q" name="sinkID" direction="out"/>
<arg type="q" name="sinkClassID" direction="out"/>
- <arg type="a(nn)" name="listMainSinkProperties" direction="out"/> <!-- am_MainSoundPropertyType_e type; int16_t value; -->
+ <arg type="a(nn)" name="listMainSinkProperties" direction="out"/> <!-- am_CustomMainSoundPropertyType_t type; int16_t value; --> </signal>
<signal name="SourceUpdated">
<arg type="q" name="sourceID" direction="out"/>
<arg type="q" name="sourceClassID" direction="out"/>
- <arg type="a(nn)" name="listMainSinkProperties" direction="out"/> <!-- am_MainSoundPropertyType_e type; int16_t value; -->
+ <arg type="a(nn)" name="listMainSinkProperties" direction="out"/> <!-- am_CustomMainSoundPropertyType_t type; int16_t value; --> </signal>
<signal name="SourceNotification">
diff --git a/PluginCommandInterfaceDbus/src/IAmCommandReceiverShadow.cpp b/PluginCommandInterfaceDbus/src/IAmCommandReceiverShadow.cpp index 4dcc0f1..11cacb4 100644 --- a/PluginCommandInterfaceDbus/src/IAmCommandReceiverShadow.cpp +++ b/PluginCommandInterfaceDbus/src/IAmCommandReceiverShadow.cpp @@ -142,7 +142,7 @@ void IAmCommandReceiverShadow::setMainSinkSoundProperty(DBusConnection *conn, DB dbus_int16_t value = 0; mDBUSMessageHandler.getProperty(type, value); am_MainSoundProperty_s mainSoundProperty; - mainSoundProperty.type = (am_MainSoundPropertyType_e) type; + mainSoundProperty.type = (am_CustomMainSoundPropertyType_t) type; mainSoundProperty.value = (int32_t) value; am_Error_e returnCode = mpIAmCommandReceive->setMainSinkSoundProperty(mainSoundProperty, sinkID); mDBUSMessageHandler.initReply(msg); @@ -163,7 +163,7 @@ void IAmCommandReceiverShadow::setMainSourceSoundProperty(DBusConnection *conn, dbus_int16_t value = 0; mDBUSMessageHandler.getProperty(type, value); am_MainSoundProperty_s mainSoundProperty; - mainSoundProperty.type = (am_MainSoundPropertyType_e) type; + mainSoundProperty.type = (am_CustomMainSoundPropertyType_t) type; mainSoundProperty.value = (int32_t) value; am_Error_e returnCode = mpIAmCommandReceive->setMainSourceSoundProperty(mainSoundProperty, sourceID); mDBUSMessageHandler.initReply(msg); @@ -183,7 +183,7 @@ void IAmCommandReceiverShadow::setSystemProperty(DBusConnection *conn, DBusMessa dbus_int16_t value = 0; mDBUSMessageHandler.getProperty(type, value); am_SystemProperty_s systemProperty; - systemProperty.type = (am_SystemPropertyType_e) type; + systemProperty.type = (am_CustomSystemPropertyType_t) type; systemProperty.value = (int32_t) value; am_Error_e returnCode = mpIAmCommandReceive->setSystemProperty(systemProperty); mDBUSMessageHandler.initReply(msg); @@ -465,7 +465,7 @@ void am::IAmCommandReceiverShadow::setSinkMainNotificationConfiguration(DBusConn dbus_int16_t parameter = 0; mDBUSMessageHandler.getNotificationConfiguration(type, status, parameter); am_NotificationConfiguration_s mainNotificationConfiguration; - mainNotificationConfiguration.type = static_cast<am_NotificationType_e> (type); + mainNotificationConfiguration.type = static_cast<am_CustomNotificationType_t> (type); mainNotificationConfiguration.status = static_cast<am_NotificationStatus_e> (status); mainNotificationConfiguration.parameter = static_cast<int16_t>(parameter); am_Error_e returnCode = mpIAmCommandReceive->setMainSinkNotificationConfiguration(sinkID,mainNotificationConfiguration); @@ -488,7 +488,7 @@ void am::IAmCommandReceiverShadow::setSourceMainNotificationConfiguration(DBusCo dbus_int16_t parameter = 0; mDBUSMessageHandler.getNotificationConfiguration(type, status, parameter); am_NotificationConfiguration_s mainNotificationConfiguration; - mainNotificationConfiguration.type = static_cast<am_NotificationType_e> (type); + mainNotificationConfiguration.type = static_cast<am_CustomNotificationType_t> (type); mainNotificationConfiguration.status = static_cast<am_NotificationStatus_e> (status); mainNotificationConfiguration.parameter = static_cast<int16_t>(parameter); am_Error_e returnCode = mpIAmCommandReceive->setMainSourceNotificationConfiguration(sourceID,mainNotificationConfiguration); diff --git a/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.cpp b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.cpp index 59b0b25..9aaa766 100644 --- a/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.cpp +++ b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.cpp @@ -109,7 +109,7 @@ arg0=list; ACTION(returnListMainSinkSoundProperties){ std::vector<am::am_MainSoundProperty_s> list; am::am_MainSoundProperty_s listItem; -listItem.type=MSP_EXAMPLE_MID; +listItem.type=MSP_GENIVI_MID; listItem.value=223; list.push_back(listItem); listItem.type=MSP_UNKNOWN; @@ -122,7 +122,7 @@ ACTION(returnListSourceClasses){ std::vector<am::am_SourceClass_s> list; am::am_SourceClass_s listItem; am::am_ClassProperty_s property; -property.classProperty=static_cast<am_ClassProperty_e>(2); +property.classProperty=static_cast<am_CustomClassProperty_t>(2); property.value=12; listItem.name="FirstCLass"; listItem.sourceClassID=23; @@ -139,7 +139,7 @@ ACTION(returnListSinkClasses){ std::vector<am::am_SinkClass_s> list; am::am_SinkClass_s listItem; am::am_ClassProperty_s property; -property.classProperty=static_cast<am_ClassProperty_e>(1); +property.classProperty=static_cast<am_CustomClassProperty_t>(1); property.value=122; listItem.name="FirstCLass"; listItem.sinkClassID=2123; |