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 /PluginControlInterface/include/IAmControlReceiverShadow.h | |
| 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 'PluginControlInterface/include/IAmControlReceiverShadow.h')
| -rw-r--r-- | PluginControlInterface/include/IAmControlReceiverShadow.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/PluginControlInterface/include/IAmControlReceiverShadow.h b/PluginControlInterface/include/IAmControlReceiverShadow.h index ed8c774..2557836 100644 --- a/PluginControlInterface/include/IAmControlReceiverShadow.h +++ b/PluginControlInterface/include/IAmControlReceiverShadow.h @@ -35,13 +35,13 @@ public: IAmControlReceiverShadow(IAmControlReceive* iReceiveInterface, CAmSocketHandler* iSocketHandler); ~IAmControlReceiverShadow(); am_Error_e getRoute(bool onlyfree, am_sourceID_t sourceID, am_sinkID_t sinkID, std::vector<am_Route_s>& returnList); - am_Error_e connect(am_Handle_s& handle, am_connectionID_t& connectionID, am_ConnectionFormat_e format, am_sourceID_t sourceID, am_sinkID_t sinkID); + am_Error_e connect(am_Handle_s& handle, am_connectionID_t& connectionID, am_CustomConnectionFormat_t format, am_sourceID_t sourceID, am_sinkID_t sinkID); am_Error_e disconnect(am_Handle_s& handle, am_connectionID_t connectionID); - am_Error_e crossfade(am_Handle_s& handle, am_HotSink_e hotSource, am_crossfaderID_t crossfaderID, am_RampType_e rampType, am_time_t rampTime); + am_Error_e crossfade(am_Handle_s& handle, am_HotSink_e hotSource, am_crossfaderID_t crossfaderID, am_CustomRampType_t rampType, am_time_t rampTime); am_Error_e abortAction(am_Handle_s handle); am_Error_e setSourceState(am_Handle_s& handle, am_sourceID_t sourceID, am_SourceState_e state); - am_Error_e setSinkVolume(am_Handle_s& handle, am_sinkID_t sinkID, am_volume_t volume, am_RampType_e ramp, am_time_t time); - am_Error_e setSourceVolume(am_Handle_s& handle, am_sourceID_t sourceID, am_volume_t volume, am_RampType_e rampType, am_time_t time); + am_Error_e setSinkVolume(am_Handle_s& handle, am_sinkID_t sinkID, am_volume_t volume, am_CustomRampType_t ramp, am_time_t time); + am_Error_e setSourceVolume(am_Handle_s& handle, am_sourceID_t sourceID, am_volume_t volume, am_CustomRampType_t rampType, am_time_t time); am_Error_e setSinkSoundProperties(am_Handle_s& handle, am_sinkID_t sinkID, std::vector<am_SoundProperty_s>& soundProperty); am_Error_e setSinkSoundProperty(am_Handle_s& handle, am_sinkID_t sinkID, am_SoundProperty_s& soundProperty); am_Error_e setSourceSoundProperties(am_Handle_s& handle, am_sourceID_t sourceID, std::vector<am_SoundProperty_s>& soundProperty); |