From 6d59e9585db35d9a3c16f01b4180ea440e4b5a4a Mon Sep 17 00:00:00 2001
From: Frank Herchet <frank.fh.herchet@bmw.de>
Date: Tue, 14 Feb 2012 17:00:45 +0100
Subject: * merge of changes from Christian

---
 PluginControlInterface/include/ControlSender.h | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'PluginControlInterface/include')

diff --git a/PluginControlInterface/include/ControlSender.h b/PluginControlInterface/include/ControlSender.h
index bd8d88f..ace61a6 100644
--- a/PluginControlInterface/include/ControlSender.h
+++ b/PluginControlInterface/include/ControlSender.h
@@ -94,6 +94,20 @@ private:
         std::vector<handleStatus> listHandleStaus;
     };
 
+    struct mainVolumeSet
+    {
+        am_sinkID_t sinkID;
+        am_Handle_s handle;
+        am_mainVolume_t mainVolume;
+    };
+
+    struct mainSinkSoundPropertySet
+    {
+        am_sinkID_t sinkID;
+        am_Handle_s handle;
+        am_MainSoundProperty_s mainSoundProperty;
+    };
+
     class findHandle
     {
         handleStatus mHandle;
@@ -132,13 +146,16 @@ private:
         }
         bool operator()(const am_MainConnection_s& mainConnection)
         {
-            if (mMainConnection.connectionID == mainConnection.connectionID)
+            if (mMainConnection.mainConnectionID == mainConnection.mainConnectionID)
                 return true;
             return false;
         }
     };
 
     std::vector<mainConnectionSet> mListOpenConnections;
+    std::vector<mainConnectionSet> mListOpenDisconnections;
+    std::vector<mainVolumeSet> mListOpenVolumeChanges;
+    std::vector<mainSinkSoundPropertySet> mListMainSoundPropertyChanges;
 };
 
 #endif /* CONTROLSENDER_H_ */
-- 
cgit v1.2.1