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 { // ----------------------------------------------------------------------------- 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::get(); + constexpr auto ConferenceChatMessageFilter = SqlEventFilterBuilder::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 EventFilterToSql[] = { { MainDb::ConferenceCallFilter, ConferenceCallFilter },