From a225f7cf3a5f153c90e4cec99a6cae02aa6405cd Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Tue, 22 May 2018 09:28:53 +0200
Subject: [PATCH] fix(MainDb): add a workaround to define sql filters on
 Windows

---
 .../remote-conference-list-event-handler.cpp  |  1 -
 src/db/main-db.cpp                            | 44 +++++++++++--------
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/src/conference/handlers/remote-conference-list-event-handler.cpp b/src/conference/handlers/remote-conference-list-event-handler.cpp
index 1c77a4636..0ea5f22c3 100644
--- a/src/conference/handlers/remote-conference-list-event-handler.cpp
+++ b/src/conference/handlers/remote-conference-list-event-handler.cpp
@@ -17,7 +17,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include "linphone/api/c-api.h"
 #include "linphone/core.h"
 #include "linphone/event.h"
 #include "linphone/proxy_config.h"
diff --git a/src/db/main-db.cpp b/src/db/main-db.cpp
index a928cf085..e60a7e895 100644
--- a/src/db/main-db.cpp
+++ b/src/db/main-db.cpp
@@ -153,27 +153,35 @@ struct SqlEventFilterBuilder<Type> {
 // -----------------------------------------------------------------------------
 
 namespace {
-	constexpr auto ConferenceCallFilter = SqlEventFilterBuilder<
-		EventLog::Type::ConferenceCallStart,
-		EventLog::Type::ConferenceCallEnd
-	>::get();
+	#ifdef _WIN32
+		// TODO: Find a workaround to deal with StaticString concatenation!!!
+		constexpr char ConferenceCallFilter[] = "3,4";
+		constexpr char ConferenceChatMessageFilter[] = "5";
+		constexpr char ConferenceInfoNoDeviceFilter[] = "1,2,6,7,8,9,12";
+		constexpr char ConferenceInfoFilter[] = "1,2,6,7,8,9,10,11,12";
+	#else
+		constexpr auto ConferenceCallFilter = SqlEventFilterBuilder<
+			EventLog::Type::ConferenceCallStart,
+			EventLog::Type::ConferenceCallEnd
+		>::get();
 
-	constexpr auto ConferenceChatMessageFilter = SqlEventFilterBuilder<EventLog::Type::ConferenceChatMessage>::get();
+		constexpr auto ConferenceChatMessageFilter = SqlEventFilterBuilder<EventLog::Type::ConferenceChatMessage>::get();
 
-	constexpr auto ConferenceInfoNoDeviceFilter = SqlEventFilterBuilder<
-		EventLog::Type::ConferenceCreated,
-		EventLog::Type::ConferenceTerminated,
-		EventLog::Type::ConferenceParticipantAdded,
-		EventLog::Type::ConferenceParticipantRemoved,
-		EventLog::Type::ConferenceParticipantSetAdmin,
-		EventLog::Type::ConferenceParticipantUnsetAdmin,
-		EventLog::Type::ConferenceSubjectChanged
-	>::get();
+		constexpr auto ConferenceInfoNoDeviceFilter = SqlEventFilterBuilder<
+			EventLog::Type::ConferenceCreated,
+			EventLog::Type::ConferenceTerminated,
+			EventLog::Type::ConferenceParticipantAdded,
+			EventLog::Type::ConferenceParticipantRemoved,
+			EventLog::Type::ConferenceParticipantSetAdmin,
+			EventLog::Type::ConferenceParticipantUnsetAdmin,
+			EventLog::Type::ConferenceSubjectChanged
+		>::get();
 
-	constexpr auto ConferenceInfoFilter = ConferenceInfoNoDeviceFilter + "," + SqlEventFilterBuilder<
-		EventLog::Type::ConferenceParticipantDeviceAdded,
-		EventLog::Type::ConferenceParticipantDeviceRemoved
-	>::get();
+		constexpr auto ConferenceInfoFilter = ConferenceInfoNoDeviceFilter + "," + SqlEventFilterBuilder<
+			EventLog::Type::ConferenceParticipantDeviceAdded,
+			EventLog::Type::ConferenceParticipantDeviceRemoved
+		>::get();
+	#endif // ifdef _WIN32
 
 	constexpr EnumToSql<MainDb::Filter> EventFilterToSql[] = {
 		{ MainDb::ConferenceCallFilter, ConferenceCallFilter },