diff options
| author | christian mueller <christian.ei.mueller@bmw.de> | 2012-02-01 10:50:15 +0100 |
|---|---|---|
| committer | christian mueller <christian.ei.mueller@bmw.de> | 2012-02-01 14:01:29 +0100 |
| commit | 9f4c15a8e89d798077ca3edf7f786dbc740aa176 (patch) | |
| tree | 878af38925ee08720418790d85b9938877aa452e /PluginRoutingInterfaceAsync | |
| parent | 52a769615e476860f3e4c0196fdf7e5159a7a7c1 (diff) | |
| download | audiomanager-9f4c15a8e89d798077ca3edf7f786dbc740aa176.tar.gz | |
* implemented peeksinkclassIDs and peeksourceclassIDs
* changed interface of both from const to non-const
* corrected include headers to c++ style, eg. <cassert>
* corrected sendChangedData return type to void
* implemented tests for sinkclass and sourceclass peeking
* fixed bug in sockethandler (FD could not be removed) thanks to Frank
Diffstat (limited to 'PluginRoutingInterfaceAsync')
3 files changed, 5 insertions, 5 deletions
diff --git a/PluginRoutingInterfaceAsync/src/RoutingReceiverAsyncShadow.cpp b/PluginRoutingInterfaceAsync/src/RoutingReceiverAsyncShadow.cpp index 64bfc95..f433a2c 100644 --- a/PluginRoutingInterfaceAsync/src/RoutingReceiverAsyncShadow.cpp +++ b/PluginRoutingInterfaceAsync/src/RoutingReceiverAsyncShadow.cpp @@ -23,7 +23,7 @@ */ #include "RoutingReceiverAsyncShadow.h" -#include <assert.h> +#include <cassert> #include <sys/socket.h> #include <sys/ioctl.h> #include <string.h> diff --git a/PluginRoutingInterfaceAsync/src/RoutingSenderAsync.cpp b/PluginRoutingInterfaceAsync/src/RoutingSenderAsync.cpp index 9d063bc..d51e943 100644 --- a/PluginRoutingInterfaceAsync/src/RoutingSenderAsync.cpp +++ b/PluginRoutingInterfaceAsync/src/RoutingSenderAsync.cpp @@ -29,7 +29,7 @@ #include <poll.h> #include <errno.h> #include <time.h> -#include <assert.h> +#include <cassert> #include <sstream> #include <string> #include <dbus/dbus.h> diff --git a/PluginRoutingInterfaceAsync/test/mocklnterfaces.h b/PluginRoutingInterfaceAsync/test/mocklnterfaces.h index c3caa46..328d416 100644 --- a/PluginRoutingInterfaceAsync/test/mocklnterfaces.h +++ b/PluginRoutingInterfaceAsync/test/mocklnterfaces.h @@ -82,9 +82,9 @@ class MockRoutingReceiveInterface : public RoutingReceiveInterface { MOCK_METHOD1(deregisterCrossfader, am_Error_e(const am_crossfaderID_t crossfaderID)); MOCK_METHOD2(peekSourceClassID, - am_Error_e(const std::string& name, const am_sourceClass_t& sourceClassID)); + am_Error_e(const std::string& name, am_sourceClass_t& sourceClassID)); MOCK_METHOD2(peekSinkClassID, - am_Error_e(const std::string& name, const am_sinkClass_t& sinkClassID)); + am_Error_e(const std::string& name, am_sinkClass_t& sinkClassID)); MOCK_METHOD2(hookInterruptStatusChange, void(const am_sourceID_t sourceID, const am_InterruptState_e interruptState)); MOCK_METHOD1(hookDomainRegistrationComplete, @@ -98,7 +98,7 @@ class MockRoutingReceiveInterface : public RoutingReceiveInterface { MOCK_METHOD2(hookTimingInformationChanged, void(const am_connectionID_t connectionID, const am_timeSync_t delay)); MOCK_METHOD1(sendChangedData, - am_Error_e(const std::vector<am_EarlyData_s>& earlyData)); + void(const std::vector<am_EarlyData_s>& earlyData)); MOCK_CONST_METHOD1(getDBusConnectionWrapper, am_Error_e(DBusWrapper*& dbusConnectionWrapper)); MOCK_CONST_METHOD1(getSocketHandler, |