update to rmmi and imgui
Some checks failed
ContinuousDelivery / linux-ubuntu (push) Has been cancelled
ContinuousDelivery / windows (push) Has been cancelled
ContinuousIntegration / linux (push) Has been cancelled
ContinuousIntegration / android (push) Has been cancelled
ContinuousIntegration / macos (push) Has been cancelled
ContinuousIntegration / windows (push) Has been cancelled
ContinuousDelivery / release (push) Has been cancelled

This commit is contained in:
Green Sky 2024-10-06 11:56:20 +02:00
parent c54542a841
commit 4b41375e0d
No known key found for this signature in database
14 changed files with 15 additions and 15 deletions

@ -1 +1 @@
Subproject commit b21acd4c9976c06809de933e7840e6b67e70d67d Subproject commit 34908967aa5d6431843aaa861de551fe804d0333

@ -1 +1 @@
Subproject commit d7400e375c6c7485659a0c5fc4bd7741cda57e37 Subproject commit 964bb0ffb98923f324e23681107b461f36deddc1

@ -1 +1 @@
Subproject commit d7280771ce71dcb437d97ea6a6070d8888bf8ade Subproject commit f5cf44119b891498881c0ef0fd93498632a202f9

@ -1 +1 @@
Subproject commit f38da08334d1dfb3cdd9fb5f795d6083d808c12a Subproject commit 301900c507d5719374b82a3730c19ad66eb10820

@ -1 +1 @@
Subproject commit 9728f71c9833baa65995e19e993d3450da750c20 Subproject commit 3e6c857c8ad509a94e5a309a5061c5729fbcc439

@ -1 +1 @@
Subproject commit 1f2aaf1ee964c39e61afab0350243e7f03d73cd4 Subproject commit a6c5886fb6ebdcef63d7822ad755cf06059bab05

@ -1 +1 @@
Subproject commit 1d7416efedfbb98e2720bb7afb099b813e74a1de Subproject commit 4360b65309356f67d6369235927ad8ce80fbb485

@ -1 +1 @@
Subproject commit 1a3d9dd1870b1f45e252ff636adfd0c1f0ccf521 Subproject commit 2e34ad2100afb314a3cf6d9336adc78d60ced638

@ -1 +1 @@
Subproject commit a678b627639f6b043ebf7607b181a552b0d2cad0 Subproject commit c81a04a778428fc289bdd03bba7f707cf8cf00b7

2
external/totato vendored

@ -1 +1 @@
Subproject commit 77fffb744e2379eefc0b1b4ce71cdfe72292a398 Subproject commit 1a032ce260ac84dd181092eefac0aefa1a63a374

View File

@ -39,7 +39,7 @@ SOLANA_PLUGIN_EXPORT uint32_t solana_plugin_start(struct SolanaAPI* solana_api)
auto* tox_i = PLUG_RESOLVE_INSTANCE(ToxI); auto* tox_i = PLUG_RESOLVE_INSTANCE(ToxI);
auto* tox_event_provider_i = PLUG_RESOLVE_INSTANCE(ToxEventProviderI); auto* tox_event_provider_i = PLUG_RESOLVE_INSTANCE(ToxEventProviderI);
auto* cr = PLUG_RESOLVE_INSTANCE_VERSIONED(Contact3Registry, "1"); auto* cr = PLUG_RESOLVE_INSTANCE_VERSIONED(Contact3Registry, "1");
auto* rmm = PLUG_RESOLVE_INSTANCE(RegistryMessageModel); auto* rmm = PLUG_RESOLVE_INSTANCE(RegistryMessageModelI);
auto* tcm = PLUG_RESOLVE_INSTANCE(ToxContactModel2); auto* tcm = PLUG_RESOLVE_INSTANCE(ToxContactModel2);
// static store, could be anywhere tho // static store, could be anywhere tho

View File

@ -33,7 +33,7 @@ SOLANA_PLUGIN_EXPORT uint32_t solana_plugin_start(struct SolanaAPI* solana_api)
try { try {
auto* os = PLUG_RESOLVE_INSTANCE(ObjectStore2); auto* os = PLUG_RESOLVE_INSTANCE(ObjectStore2);
auto* rmm = PLUG_RESOLVE_INSTANCE(RegistryMessageModel); auto* rmm = PLUG_RESOLVE_INSTANCE(RegistryMessageModelI);
auto* conf = PLUG_RESOLVE_INSTANCE(ConfigModelI); auto* conf = PLUG_RESOLVE_INSTANCE(ConfigModelI);
// static store, could be anywhere tho // static store, could be anywhere tho

View File

@ -10,7 +10,7 @@
#include <iostream> #include <iostream>
TransferAutoAccept::TransferAutoAccept(ObjectStore2& os, RegistryMessageModel& rmm, ConfigModelI& conf) : _os(os), _rmm(rmm), _conf(conf) { TransferAutoAccept::TransferAutoAccept(ObjectStore2& os, RegistryMessageModelI& rmm, ConfigModelI& conf) : _os(os), _rmm(rmm), _conf(conf) {
//_os.subscribe(this, ObjectStore_Event::object_update); //_os.subscribe(this, ObjectStore_Event::object_update);
_rmm.subscribe(this, RegistryMessageModel_Event::message_construct); _rmm.subscribe(this, RegistryMessageModel_Event::message_construct);

View File

@ -10,14 +10,14 @@ struct ConfigModelI;
class TransferAutoAccept : public RegistryMessageModelEventI, public ObjectStoreEventI { class TransferAutoAccept : public RegistryMessageModelEventI, public ObjectStoreEventI {
ObjectStore2& _os; ObjectStore2& _os;
RegistryMessageModel& _rmm; RegistryMessageModelI& _rmm;
//ContactModelI& _cm; //ContactModelI& _cm;
ConfigModelI& _conf; ConfigModelI& _conf;
std::vector<ObjectHandle> _accept_queue; std::vector<ObjectHandle> _accept_queue;
public: public:
TransferAutoAccept(ObjectStore2& os, RegistryMessageModel& rmm, ConfigModelI& conf); TransferAutoAccept(ObjectStore2& os, RegistryMessageModelI& rmm, ConfigModelI& conf);
// TODO: iterate // TODO: iterate
void iterate(void); void iterate(void);