From a6764384dc9cb922996efaf8405bb3ffa8d25f0b Mon Sep 17 00:00:00 2001 From: koldo Date: Wed, 14 Oct 2020 19:10:09 +0000 Subject: [PATCH] RasterPlayer: Replaced Callback git-svn-id: svn://ultimatepp.org/upp/trunk@15249 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/RasterPlayer/RasterPlayer.h | 2 +- uppsrc/RasterPlayer/src.tpp/RasterPlayer_en-us.tpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/uppsrc/RasterPlayer/RasterPlayer.h b/uppsrc/RasterPlayer/RasterPlayer.h index 3a6119a5a..7766f1547 100644 --- a/uppsrc/RasterPlayer/RasterPlayer.h +++ b/uppsrc/RasterPlayer/RasterPlayer.h @@ -36,7 +36,7 @@ public: RasterPlayer& SetSpeed(double s = 1) {speed = s; Refresh(); return *this;} RasterPlayer& SetMT(bool _mt = false); - Callback WhenShown; + Event<> WhenShown; int GetPageCount() {return images.GetCount();}; int GetFrameCount() {return images.GetCount();}; diff --git a/uppsrc/RasterPlayer/src.tpp/RasterPlayer_en-us.tpp b/uppsrc/RasterPlayer/src.tpp/RasterPlayer_en-us.tpp index 611bc09a8..c440e04e4 100644 --- a/uppsrc/RasterPlayer/src.tpp/RasterPlayer_en-us.tpp +++ b/uppsrc/RasterPlayer/src.tpp/RasterPlayer_en-us.tpp @@ -112,6 +112,6 @@ program.&] [s3; Sets the active page (frame).&] [s1; &] [s5;%- &] -[s6;:RasterPlayer`:`:WhenShown:%- [_^Callback^ Callback]_[* WhenShown]&] +[s6;:RasterPlayer`:`:WhenShown:%- [_^Callback^ Event<>]_[* WhenShown]&] [s3; Called when a new picture (page or frame) is shown.&] [s0; ]] \ No newline at end of file