Mercurial > hg > orthanc-stone
diff Framework/Deprecated/Loaders/LoaderStateMachine.h @ 1310:9bea7e15b519 broker
- first pass at changes to cope with the refactoring of the loading system
- global loader-related data accessible through ILoadersContext::ILock
- many changes in legacy loaders (CT, RTSTRUCT, DOSE) + loader cache
- NOT FINISHED! there are shared_from_this calls in ctors! this will crash!
author | Benjamin Golinvaux <bgo@osimis.io> |
---|---|
date | Mon, 09 Mar 2020 14:53:22 +0100 |
parents | 7ec8fea061b9 |
children | 9b126de2cde2 |
line wrap: on
line diff
--- a/Framework/Deprecated/Loaders/LoaderStateMachine.h Wed Mar 04 13:20:12 2020 +0100 +++ b/Framework/Deprecated/Loaders/LoaderStateMachine.h Mon Mar 09 14:53:22 2020 +0100 @@ -33,6 +33,11 @@ #include <list> +namespace OrthancStone +{ + class ILoadersContext; +} + namespace Deprecated { /** @@ -94,15 +99,14 @@ typedef std::list<OrthancStone::IOracleCommand*> PendingCommands; - OrthancStone::IOracle& oracle_; - bool active_; - unsigned int simultaneousDownloads_; - PendingCommands pendingCommands_; - unsigned int activeCommands_; + OrthancStone::ILoadersContext& loadersContext_; + bool active_; + unsigned int simultaneousDownloads_; + PendingCommands pendingCommands_; + unsigned int activeCommands_; public: - LoaderStateMachine(OrthancStone::IOracle& oracle, - OrthancStone::IObservable& oracleObservable); + LoaderStateMachine(OrthancStone::ILoadersContext& loadersContext); virtual ~LoaderStateMachine();