X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/bb0603410f7b548d52f2556cc8be734913088443..5d2d99a864197495af5a46065df7a3371adba3e4:/projects/stargazer/plugins/other/smux/smux.h diff --git a/projects/stargazer/plugins/other/smux/smux.h b/projects/stargazer/plugins/other/smux/smux.h index 7337deaf..adeb50af 100644 --- a/projects/stargazer/plugins/other/smux/smux.h +++ b/projects/stargazer/plugins/other/smux/smux.h @@ -57,11 +57,15 @@ private: //----------------------------------------------------------------------------- class CHG_AFTER_NOTIFIER : public PROPERTY_NOTIFIER_BASE { public: - CHG_AFTER_NOTIFIER(SMUX & s, const USER_PTR & u) : smux(s), userPtr(u) {} - CHG_AFTER_NOTIFIER(const CHG_AFTER_NOTIFIER & rvalue) : smux(rvalue.smux), userPtr(rvalue.userPtr) {} + CHG_AFTER_NOTIFIER(SMUX & s, const USER_PTR & u) + : PROPERTY_NOTIFIER_BASE(), + smux(s), userPtr(u) {} + CHG_AFTER_NOTIFIER(const CHG_AFTER_NOTIFIER & rvalue) + : PROPERTY_NOTIFIER_BASE(), + smux(rvalue.smux), userPtr(rvalue.userPtr) {} void Notify(const std::string &, const std::string &); - USER_PTR GetUserPtr() { return userPtr; } + USER_PTR GetUserPtr() const { return userPtr; } private: CHG_AFTER_NOTIFIER & operator=(const CHG_AFTER_NOTIFIER & rvalue); @@ -71,7 +75,8 @@ private: //----------------------------------------------------------------------------- class ADD_DEL_TARIFF_NOTIFIER : public NOTIFIER_BASE, private NONCOPYABLE { public: - ADD_DEL_TARIFF_NOTIFIER(SMUX & s) : smux(s) {} + ADD_DEL_TARIFF_NOTIFIER(SMUX & s) + : NOTIFIER_BASE(), smux(s) {} void Notify(const TARIFF_DATA &); private: @@ -80,7 +85,7 @@ private: //----------------------------------------------------------------------------- class ADD_USER_NOTIFIER : public NOTIFIER_BASE, private NONCOPYABLE { public: - ADD_USER_NOTIFIER(SMUX & s) : smux(s) {} + ADD_USER_NOTIFIER(SMUX & s) : NOTIFIER_BASE(), smux(s) {} void Notify(const USER_PTR &); private: @@ -89,7 +94,7 @@ private: //----------------------------------------------------------------------------- class DEL_USER_NOTIFIER : public NOTIFIER_BASE, private NONCOPYABLE { public: - DEL_USER_NOTIFIER(SMUX & s) : smux(s) {} + DEL_USER_NOTIFIER(SMUX & s) : NOTIFIER_BASE(), smux(s) {} void Notify(const USER_PTR &); private: @@ -117,8 +122,8 @@ public: const std::string & GetStrError() const { return errorStr; } const std::string GetVersion() const { return "Stg SMUX Plugin 1.1"; } - uint16_t GetStartPosition() const { return 100; } - uint16_t GetStopPosition() const { return 100; } + uint16_t GetStartPosition() const { return 10; } + uint16_t GetStopPosition() const { return 10; } bool UpdateTables(); @@ -177,6 +182,12 @@ private: }; //----------------------------------------------------------------------------- +inline +void CHG_AFTER_NOTIFIER::Notify(const std::string &, const std::string &) +{ +smux.UpdateTables(); +} + inline void ADD_DEL_TARIFF_NOTIFIER::Notify(const TARIFF_DATA &) {