From 20491c0f31d70e254c56f171c69b95f3d4ad2813 Mon Sep 17 00:00:00 2001
From: Jens Lorenz <jlorenz@de.adit-jv.com>
Date: Wed, 11 Jun 2014 18:14:58 +0200
Subject: * Bug #100 - removed projecttypes.h which causes compiling conflicts

Signed-off-by: Jens Lorenz <jlorenz@de.adit-jv.com>
---
 PluginControlInterface/include/CAmControlSenderBase.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'PluginControlInterface/include/CAmControlSenderBase.h')

diff --git a/PluginControlInterface/include/CAmControlSenderBase.h b/PluginControlInterface/include/CAmControlSenderBase.h
index 82ee056..df2f9c9 100644
--- a/PluginControlInterface/include/CAmControlSenderBase.h
+++ b/PluginControlInterface/include/CAmControlSenderBase.h
@@ -69,15 +69,15 @@ public:
     void cbAckSetSourceSoundProperty(const am_Handle_s handle, const am_Error_e error);
     void cbAckSetSinkSoundProperties(const am_Handle_s handle, const am_Error_e error);
     void cbAckSetSinkSoundProperty(const am_Handle_s handle, const am_Error_e error);
-    am_Error_e getConnectionFormatChoice(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_Route_s listRoute, const std::vector<am_ConnectionFormat_e> listPossibleConnectionFormats, std::vector<am_ConnectionFormat_e>& listPrioConnectionFormats);
+    am_Error_e getConnectionFormatChoice(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_Route_s listRoute, const std::vector<am_CustomConnectionFormat_t> listPossibleConnectionFormats, std::vector<am_CustomConnectionFormat_t>& listPrioConnectionFormats);
     void getInterfaceVersion(std::string& version) const;
     void confirmCommandReady(const am_Error_e error) ;
     void confirmRoutingReady(const am_Error_e error) ;
     void confirmCommandRundown(const am_Error_e error) ;
     void confirmRoutingRundown(const am_Error_e error) ;
-    am_Error_e hookSystemUpdateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) ;
-    am_Error_e hookSystemUpdateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) ;
-    am_Error_e hookSystemUpdateGateway(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e>& listSourceConnectionFormats, const std::vector<am_ConnectionFormat_e>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix) ;
+    am_Error_e hookSystemUpdateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) ;
+    am_Error_e hookSystemUpdateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) ;
+    am_Error_e hookSystemUpdateGateway(const am_gatewayID_t gatewayID, const std::vector<am_CustomConnectionFormat_t>& listSourceConnectionFormats, const std::vector<am_CustomConnectionFormat_t>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix) ;
     void cbAckSetVolumes(const am_Handle_s handle, const std::vector<am_Volumes_s>& listVolumes, const am_Error_e error) ;
     void cbAckSetSinkNotificationConfiguration(const am_Handle_s handle, const am_Error_e error) ;
     void cbAckSetSourceNotificationConfiguration(const am_Handle_s handle, const am_Error_e error) ;
-- 
cgit v1.2.1