From dd7740c3da7400d7e51544a686888441971ba4f0 Mon Sep 17 00:00:00 2001 From: asanoaozora Date: Thu, 20 Apr 2017 16:56:34 +0200 Subject: GT-3501: Inconsistency of scaleID format --- .../genivi_mapviewer_mapviewercontrol.cxx | 16 ++++++++-------- src/speech/CMakeLists.txt | 15 +++++++-------- src/speech/main.cpp | 10 ++++------ 3 files changed, 19 insertions(+), 22 deletions(-) (limited to 'src') diff --git a/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx b/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx index c637c82..f85d187 100644 --- a/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx +++ b/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx @@ -151,8 +151,8 @@ class MapViewerControlObj void SetCameraHeadingTrackUp(uint32_t sessionHandle); void SetMapViewPerspective(uint32_t SessionHandle, uint16_t MapViewPerspectiveMode); void GetMapViewPerspective(uint16_t &MapViewPerspectiveMode); - void GetScaleList(std::vector< ::DBus::Struct< uint16_t, uint16_t, DBusCommonAPIEnumeration, uint32_t > >& ScalesList); - void SetMapViewScale(uint32_t SessionHandle, uint32_t ScaleID); + void GetScaleList(std::vector< ::DBus::Struct< uint8_t, uint16_t, DBusCommonAPIEnumeration, uint32_t > >& ScalesList); + void SetMapViewScale(uint32_t SessionHandle, uint8_t ScaleID); void SetMapViewScaleByDelta(uint32_t SessionHandle, int16_t ScaleDelta); void GetMapViewScale(uint8_t& ScaleID, DBusCommonAPIEnumeration &IsMinMax); void GetMapViewType(uint16_t& MapViewType); @@ -409,7 +409,7 @@ class MapViewerControl } void - SetMapViewScale(const uint32_t& SessionHandle, const uint32_t& MapViewInstanceHandle, const uint16_t& ScaleID) + SetMapViewScale(const uint32_t& SessionHandle, const uint32_t& MapViewInstanceHandle, const uint8_t& ScaleID) { dbg(lvl_debug,"enter\n"); MapViewerControlObj *obj=handles[MapViewInstanceHandle]; @@ -687,10 +687,10 @@ class MapViewerControl return ret; } - std::vector< ::DBus::Struct< uint16_t, uint16_t, DBusCommonAPIEnumeration, uint32_t > > + std::vector< ::DBus::Struct< uint8_t, uint16_t, DBusCommonAPIEnumeration, uint32_t > > GetScaleList(const uint32_t& mapViewInstanceHandle) { - std::vector< ::DBus::Struct< uint16_t, uint16_t, DBusCommonAPIEnumeration, uint32_t > > ret; + std::vector< ::DBus::Struct< uint8_t, uint16_t, DBusCommonAPIEnumeration, uint32_t > > ret; MapViewerControlObj *obj=handles[mapViewInstanceHandle]; if (!obj) throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle"); @@ -966,9 +966,9 @@ MapViewerControlObj::GetMapViewPerspective(uint16_t& MapViewPerspectiveMode) } void -MapViewerControlObj::GetScaleList(std::vector< ::DBus::Struct< uint16_t, uint16_t, DBusCommonAPIEnumeration, uint32_t > >& ScalesList) +MapViewerControlObj::GetScaleList(std::vector< ::DBus::Struct< uint8_t, uint16_t, DBusCommonAPIEnumeration, uint32_t > >& ScalesList) { - ::DBus::Struct< uint16_t, uint16_t, DBusCommonAPIEnumeration, uint32_t > scale; + ::DBus::Struct< uint8_t, uint16_t, DBusCommonAPIEnumeration, uint32_t > scale; uint32_t basisPixel = ZOOM_ZERO_METER_WIDTH/m_width; scale._1=0; @@ -1054,7 +1054,7 @@ MapViewerControlObj::GetScaleList(std::vector< ::DBus::Struct< uint16_t, uint16_ } void -MapViewerControlObj::SetMapViewScale(uint32_t SessionHandle, uint32_t ScaleID) +MapViewerControlObj::SetMapViewScale(uint32_t SessionHandle, uint8_t ScaleID) { long scale=1 << ScaleID; struct transformation *trans=navit_get_trans(m_navit.u.navit); diff --git a/src/speech/CMakeLists.txt b/src/speech/CMakeLists.txt index f8d73ab..ee62ba2 100644 --- a/src/speech/CMakeLists.txt +++ b/src/speech/CMakeLists.txt @@ -54,22 +54,21 @@ set(COMMONAPI_GEN_DIR "${CMAKE_CURRENT_BINARY_DIR}/src-gen") add_subdirectory(${FRANCA_DIR}/hmi/speechservice "${CMAKE_CURRENT_BINARY_DIR}/franca") # Path to the generated files -set(API_VERSION_MAJOR 4) -set(API_VERSION "v${API_VERSION_MAJOR}") -set(PRJ_SRC_GEN_ROOT_PATH ${COMMONAPI_GEN_DIR}/${API_VERSION}/org/genivi) #files shared by all the APIs -set(PRJ_SRC_GEN_HMI_PATH ${PRJ_SRC_GEN_ROOT_PATH}/hmi) #files shared by the hmi APIs -set(PRJ_SRC_GEN_SPEECHOUTPUTSERVICE_PATH ${PRJ_SRC_GEN_HMI_PATH}/speechoutputservice) #files shared by the speechservice APIs +set(API_VERSION_NAVIGATION_MAJOR 4) +set(API_VERSION_NAVIGATION "v${API_VERSION_NAVIGATION_MAJOR}") +set(API_VERSION_SPEECHOUTPUTSERVICE_MAJOR 1) +set(API_VERSION_SPEECHOUTPUTSERVICE "v${API_VERSION_SPEECHOUTPUTSERVICE_MAJOR}") +set(PRJ_SRC_GEN_COMMON_PATH ${COMMONAPI_GEN_DIR}/${API_VERSION_NAVIGATION}/org/genivi) #files shared by all the APIs +set(PRJ_SRC_GEN_SPEECHOUTPUTSERVICE_PATH ${COMMONAPI_GEN_DIR}/${API_VERSION_SPEECHOUTPUTSERVICE}/org/genivi/hmi/speechoutputservice) #files shared by the speechservice APIs # Source Files FILE(GLOB PRJ_LOCAL_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp) FILE(GLOB PRJ_STUB_GEN_SRCS ${PRJ_SRC_GEN_ROOT_PATH}/*DBusStub*.cpp ${PRJ_SRC_GEN_ROOT_PATH}/*Types.cpp ${PRJ_SRC_GEN_ROOT_PATH}/*DBusDeployment.cpp ${PRJ_SRC_GEN_ROOT_PATH}/*StubDefault.cpp - ${PRJ_SRC_GEN_HMI_PATH}/*DBusStub*.cpp ${PRJ_SRC_GEN_HMI_PATH}/*Types.cpp ${PRJ_SRC_GEN_HMI_PATH}/*DBusDeployment.cpp ${PRJ_SRC_GEN_HMI_PATH}/*StubDefault.cpp ${PRJ_SRC_GEN_SPEECHOUTPUTSERVICE_PATH}/*DBusStub*.cpp ${PRJ_SRC_GEN_SPEECHOUTPUTSERVICE_PATH}/*Types.cpp ${PRJ_SRC_GEN_SPEECHOUTPUTSERVICE_PATH}/*DBusDeployment.cpp ${PRJ_SRC_GEN_SPEECHOUTPUTSERVICE_PATH}/*StubDefault.cpp ) FILE(GLOB PRJ_STUB_IMPL_SRCS ${PRJ_SRC_GEN_ROOT_PATH}/*Stub*.cpp - ${PRJ_SRC_GEN_HMI_PATH}/*Stub*.cpp ${PRJ_SRC_GEN_SPEECHOUTPUTSERVICE_PATH}/*Stub*.cpp ) @@ -82,7 +81,7 @@ set(FLITE_LIBRARIES /usr/lib/x86_64-linux-gnu/libflite.so /usr/lib/x86_64-linux- include_directories( ${COMMONAPI_GEN_DIR} ${PRJ_SRC_GEN_ROOT_PATH} - ${PRJ_SRC_GEN_HMI_PATH} + ${PRJ_SRC_GEN_COMMON_PATH} ${PRJ_SRC_GEN_SPEECHOUTPUTSERVICE_PATH} ${DBUS_INCLUDE_DIRS} ${COMMONAPI_INCLUDE_DIRS} diff --git a/src/speech/main.cpp b/src/speech/main.cpp index 261cd5a..4d3b1bc 100644 --- a/src/speech/main.cpp +++ b/src/speech/main.cpp @@ -50,7 +50,7 @@ extern "C" { #include #include -using namespace v4::org::genivi::hmi::speechoutputservice; +using namespace v1::org::genivi::hmi::speechoutputservice; using namespace v4::org::genivi; static std::shared_ptr < CommonAPI::Runtime > runtime; @@ -211,7 +211,7 @@ public: } } - fireNotifyQueueStatusEvent(qStatus); + fireNotifyQueueStatusSelective(qStatus); _reply(_chunkID); } @@ -220,19 +220,17 @@ public: * description: A prompt must be playing to perform an abort action. If no prompting operation * in progress there will be no reaction of the system. */ - void abortPrompter(const std::shared_ptr _client, abortPrompterReply_t _reply) { + void abortPrompter(const std::shared_ptr _client) { printf("\n>>> [server] abortPrompter()\n"); - _reply(); } /** * description: The prompter is closed after the last text chunk submitted has finished playing. */ - void closePrompter(const std::shared_ptr _client, closePrompterReply_t _reply) { + void closePrompter(const std::shared_ptr _client) { printf("\n>>> [server] closePrompter()\n"); - _reply(); } -- cgit v1.2.1