From f7471ca4cb308f337af04283e7e4bbd30c99a9b7 Mon Sep 17 00:00:00 2001 From: Green Sky Date: Sun, 6 Oct 2024 11:57:14 +0200 Subject: [PATCH] update to rmmi --- external/solanaceae_message3 | 2 +- external/solanaceae_tox | 2 +- src/chat_gui4.cpp | 2 +- src/chat_gui4.hpp | 4 ++-- src/main_screen.cpp | 2 +- src/main_screen.hpp | 3 ++- src/media_meta_info_loader.cpp | 2 +- src/media_meta_info_loader.hpp | 4 ++-- src/tox_friend_faux_offline_messaging.cpp | 6 +++--- src/tox_friend_faux_offline_messaging.hpp | 4 ++-- 10 files changed, 16 insertions(+), 15 deletions(-) diff --git a/external/solanaceae_message3 b/external/solanaceae_message3 index 9728f71c..3e6c857c 160000 --- a/external/solanaceae_message3 +++ b/external/solanaceae_message3 @@ -1 +1 @@ -Subproject commit 9728f71c9833baa65995e19e993d3450da750c20 +Subproject commit 3e6c857c8ad509a94e5a309a5061c5729fbcc439 diff --git a/external/solanaceae_tox b/external/solanaceae_tox index 1a3d9dd1..2e34ad21 160000 --- a/external/solanaceae_tox +++ b/external/solanaceae_tox @@ -1 +1 @@ -Subproject commit 1a3d9dd1870b1f45e252ff636adfd0c1f0ccf521 +Subproject commit 2e34ad2100afb314a3cf6d9336adc78d60ced638 diff --git a/src/chat_gui4.cpp b/src/chat_gui4.cpp index cff6baa4..0786556b 100644 --- a/src/chat_gui4.cpp +++ b/src/chat_gui4.cpp @@ -201,7 +201,7 @@ void ChatGui4::setClipboardData(std::vector mime_types, std::shared ChatGui4::ChatGui4( ConfigModelI& conf, ObjectStore2& os, - RegistryMessageModel& rmm, + RegistryMessageModelI& rmm, Contact3Registry& cr, TextureUploaderI& tu, ContactTextureCache& contact_tc, diff --git a/src/chat_gui4.hpp b/src/chat_gui4.hpp index 66e5c7ec..15628e8d 100644 --- a/src/chat_gui4.hpp +++ b/src/chat_gui4.hpp @@ -27,7 +27,7 @@ using MessageTextureCache = TextureCache("ConfigModelI", "host", &conf); g_provideInstance("Contact3Registry", "1", "host", &cr); - g_provideInstance("RegistryMessageModel", "host", &rmm); + g_provideInstance("RegistryMessageModelI", "host", &rmm); g_provideInstance("MessageSerializerNJ", "host", &msnj); g_provideInstance("ToxI", "host", &tc); diff --git a/src/main_screen.hpp b/src/main_screen.hpp index daa3ab25..7519d61d 100644 --- a/src/main_screen.hpp +++ b/src/main_screen.hpp @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -58,7 +59,7 @@ struct MainScreen final : public Screen { SimpleConfigModel conf; Contact3Registry cr; - RegistryMessageModel rmm; + RegistryMessageModelImpl rmm; MessageSerializerNJ msnj; MessageTimeSort mts; diff --git a/src/media_meta_info_loader.cpp b/src/media_meta_info_loader.cpp index d1cf3a8b..e85d3f84 100644 --- a/src/media_meta_info_loader.cpp +++ b/src/media_meta_info_loader.cpp @@ -120,7 +120,7 @@ void MediaMetaInfoLoader::handleMessage(const Message3Handle& m) { _rmm.throwEventUpdate(m); } -MediaMetaInfoLoader::MediaMetaInfoLoader(RegistryMessageModel& rmm) : _rmm(rmm) { +MediaMetaInfoLoader::MediaMetaInfoLoader(RegistryMessageModelI& rmm) : _rmm(rmm) { // HACK: make them be added externally? _image_loaders.push_back(std::make_unique()); _image_loaders.push_back(std::make_unique()); diff --git a/src/media_meta_info_loader.hpp b/src/media_meta_info_loader.hpp index 8923b643..39b85798 100644 --- a/src/media_meta_info_loader.hpp +++ b/src/media_meta_info_loader.hpp @@ -13,14 +13,14 @@ namespace Message::Components { // adds metadata to file messages class MediaMetaInfoLoader : public RegistryMessageModelEventI { protected: - RegistryMessageModel& _rmm; + RegistryMessageModelI& _rmm; std::vector> _image_loaders; void handleMessage(const Message3Handle& m); public: - MediaMetaInfoLoader(RegistryMessageModel& rmm); + MediaMetaInfoLoader(RegistryMessageModelI& rmm); virtual ~MediaMetaInfoLoader(void); protected: // rmm diff --git a/src/tox_friend_faux_offline_messaging.cpp b/src/tox_friend_faux_offline_messaging.cpp index 72b0a8ec..9769548f 100644 --- a/src/tox_friend_faux_offline_messaging.cpp +++ b/src/tox_friend_faux_offline_messaging.cpp @@ -26,7 +26,7 @@ namespace Contact::Components { ToxFriendFauxOfflineMessaging::ToxFriendFauxOfflineMessaging( Contact3Registry& cr, - RegistryMessageModel& rmm, + RegistryMessageModelI& rmm, ToxContactModel2& tcm, ToxI& t, ToxEventProviderI& tep @@ -54,7 +54,7 @@ float ToxFriendFauxOfflineMessaging::tick(float time_delta) { // cleanup if (_cr.all_of(c)) { _cr.remove(c); - auto* mr = static_cast(_rmm).get(c); + auto* mr = static_cast(_rmm).get(c); if (mr != nullptr) { mr->storage().clear(); } @@ -99,7 +99,7 @@ ToxFriendFauxOfflineMessaging::dfmc_Ret ToxFriendFauxOfflineMessaging::doFriendM // unacked message // timeouts for exising unacked messages expired (send) - auto* mr = static_cast(_rmm).get(c); + auto* mr = static_cast(_rmm).get(c); if (mr == nullptr) { // no messages return dfmc_Ret::NO_MSG; diff --git a/src/tox_friend_faux_offline_messaging.hpp b/src/tox_friend_faux_offline_messaging.hpp index ed0a424d..3a326aac 100644 --- a/src/tox_friend_faux_offline_messaging.hpp +++ b/src/tox_friend_faux_offline_messaging.hpp @@ -15,7 +15,7 @@ namespace Contact::Components { // timers get reset on connection changes, and send order is preserved. class ToxFriendFauxOfflineMessaging : public ToxEventI { Contact3Registry& _cr; - RegistryMessageModel& _rmm; + RegistryMessageModelI& _rmm; ToxContactModel2& _tcm; ToxI& _t; ToxEventProviderI& _tep; @@ -30,7 +30,7 @@ class ToxFriendFauxOfflineMessaging : public ToxEventI { public: ToxFriendFauxOfflineMessaging( Contact3Registry& cr, - RegistryMessageModel& rmm, + RegistryMessageModelI& rmm, ToxContactModel2& tcm, ToxI& t, ToxEventProviderI& tep