From feeb725900b1f36c0757b2b3b73837aa94640541 Mon Sep 17 00:00:00 2001 From: Krisjanis Rijnieks Date: Tue, 17 Nov 2020 21:49:06 +0200 Subject: [PATCH] Fix uint64 in SlideShowSource --- .../src/SlideShowSource/magSlide.cpp | 11 ++++----- .../src/SlideShowSource/magSlide.h | 24 +++++++++---------- .../SlideShowSource/magSlideShowSource.cpp | 12 ++++------ .../src/SlideShowSource/magSlideShowSource.h | 8 +++---- .../SlideShowSource/magSlideTransition.cpp | 4 ++-- .../src/SlideShowSource/magSlideTransition.h | 12 +++++----- .../magSlideTransitionFactory.cpp | 2 +- .../magSlideTransitionFactory.h | 2 +- 8 files changed, 36 insertions(+), 39 deletions(-) diff --git a/example_fbo-sources/src/SlideShowSource/magSlide.cpp b/example_fbo-sources/src/SlideShowSource/magSlide.cpp index 206a86c..adffed8 100644 --- a/example_fbo-sources/src/SlideShowSource/magSlide.cpp +++ b/example_fbo-sources/src/SlideShowSource/magSlide.cpp @@ -19,7 +19,7 @@ magSlide::magSlide(std::string type) magSlide::idCount++; } -void magSlide::update(u_int64_t deltaTime) +void magSlide::update(uint64_t deltaTime) { transition->update(deltaTime); runningTime += deltaTime; @@ -65,7 +65,7 @@ magSlide::ResizeOptions magSlide::getResizeOption() const return resizeOption; } -void magSlide::setDuration(u_int64_t duration) +void magSlide::setDuration(uint64_t duration) { this->duration = duration; } @@ -86,7 +86,7 @@ void magSlide::setState(SlideState state) } } -void magSlide::setTransitionDuration(u_int64_t tDuration) +void magSlide::setTransitionDuration(uint64_t tDuration) { buildOutDuration = tDuration; } @@ -110,7 +110,7 @@ const std::string magSlide::getSlideStateName() return "unknown"; } -void magSlide::start(u_int64_t startTime) +void magSlide::start(uint64_t startTime) { this->startTime = startTime; runningTime = 0; @@ -197,6 +197,5 @@ void magVideoSlide::draw() void magVideoSlide::useVideoForDuration() { - duration = u_int64_t((videoPlayer.getDuration()*1000)) - buildOutDuration; + duration = uint64_t((videoPlayer.getDuration()*1000)) - buildOutDuration; } - diff --git a/example_fbo-sources/src/SlideShowSource/magSlide.h b/example_fbo-sources/src/SlideShowSource/magSlide.h index 74e1b2c..f0aa175 100644 --- a/example_fbo-sources/src/SlideShowSource/magSlide.h +++ b/example_fbo-sources/src/SlideShowSource/magSlide.h @@ -14,7 +14,7 @@ class magSlide public: magSlide(std::string type); // ~magSlide(); - virtual void update(u_int64_t deltaTime); + virtual void update(uint64_t deltaTime); virtual void draw(); /** @@ -22,7 +22,7 @@ public: * called before displaying the slide. * @param startTime */ - void start(u_int64_t startTime); + void start(uint64_t startTime); enum ResizeOptions : short { @@ -96,7 +96,7 @@ public: */ virtual void setSize(float w, float h); - u_int64_t getDuration() + uint64_t getDuration() { return duration; } @@ -106,7 +106,7 @@ public: * builds (in or out) * @param duration in milliseconds. */ - void setDuration(u_int64_t duration); + void setDuration(uint64_t duration); /** * Sets the duration of the buildIn and buildOut @@ -114,7 +114,7 @@ public: * duration of the slide. * @param tDuration in milliseconds. */ - void setTransitionDuration(u_int64_t tDuration); + void setTransitionDuration(uint64_t tDuration); ResizeOptions getResizeOption() const; void setResizeOption(ResizeOptions resizeOption); @@ -182,41 +182,41 @@ protected: /** * The duration of the slide in millis, not counting builds */ - u_int64_t duration; + uint64_t duration; /** * The start time of the slide in milliseconds, in "local time". * In practice, this means that the start time is always 0. */ - u_int64_t startTime; + uint64_t startTime; /** * The end time of the slide in milliseconds, in "local time". * The endTime is startTime + buildInDuration + duration + buildOutDuration. */ - u_int64_t endTime; + uint64_t endTime; /** * The duration of the build in transition or effect, in milliseconds. */ -// u_int64_t buildInDuration; +// uint64_t buildInDuration; /** * The duration of the build out transition or effect, in milliseconds. */ - u_int64_t buildOutDuration; + uint64_t buildOutDuration; /** * The "local time" start of the build out transition. This time should also * signal the enqueuing of the next slide, if applicable. */ - u_int64_t buildOutStartTime; + uint64_t buildOutStartTime; /** * The amount of time the slide has been displayed, in milliseconds. * This constitutes the "local time" of the slide. */ - u_int64_t runningTime; + uint64_t runningTime; void setState(SlideState state); diff --git a/example_fbo-sources/src/SlideShowSource/magSlideShowSource.cpp b/example_fbo-sources/src/SlideShowSource/magSlideShowSource.cpp index 897ce93..a26b003 100644 --- a/example_fbo-sources/src/SlideShowSource/magSlideShowSource.cpp +++ b/example_fbo-sources/src/SlideShowSource/magSlideShowSource.cpp @@ -180,12 +180,12 @@ bool magSlideShowSource::createFromFolderContents(std::string path) { ofImage tempImage; for(ofFile &file : files){ if (tempImage.load(file.getFileName())){ - + // make a new image slide auto slide = std::make_shared(); slide->setup(tempImage); - slide->setDuration(static_cast(settings.slideDuration*1000)); - slide->setTransitionDuration(static_cast(settings.transitionDuration*1000)); + slide->setDuration(static_cast(settings.slideDuration*1000)); + slide->setTransitionDuration(static_cast(settings.transitionDuration*1000)); // if (settings.transitionName == "") addSlide(slide); }else{ @@ -361,7 +361,7 @@ void magSlideShowSource::addSlide(std::shared_ptr slide) { case magSlide::Fit: slide->setSize(getWidth(), getHeight()); break; - + default: break; } @@ -495,7 +495,7 @@ void magSlideShowSource::playSlide(int slideIndex) { playNextSlide(); } -void magSlideShowSource::enqueueSlide(std::shared_ptr slide, u_int64_t startTime) { +void magSlideShowSource::enqueueSlide(std::shared_ptr slide, uint64_t startTime) { // ofLogVerbose() << "Enqueuing slide " << currentSlideIndex << " slide id: " << slide->getId(); slide->start(startTime); activeSlides.insert(activeSlides.begin(), slide); @@ -527,5 +527,3 @@ void magSlideShowSource::fileAddedListener(const void *sender) { void magSlideShowSource::fileRemovedListener(const void *sender) { doInit = true; } - - diff --git a/example_fbo-sources/src/SlideShowSource/magSlideShowSource.h b/example_fbo-sources/src/SlideShowSource/magSlideShowSource.h index 6573370..47b4cd5 100644 --- a/example_fbo-sources/src/SlideShowSource/magSlideShowSource.h +++ b/example_fbo-sources/src/SlideShowSource/magSlideShowSource.h @@ -145,11 +145,11 @@ class magSlideShowSource : public ofx::piMapper::FboSource { private: // std::shared_ptr currentSlide; std::vector> activeSlides; - void enqueueSlide(std::shared_ptr slide, u_int64_t startTime); + void enqueueSlide(std::shared_ptr slide, uint64_t startTime); - u_int64_t lastTime; - u_int64_t deltaTime; - u_int64_t runningTime; + uint64_t lastTime; + uint64_t deltaTime; + uint64_t runningTime; bool isInitialized = false; bool isPlaying = false; diff --git a/example_fbo-sources/src/SlideShowSource/magSlideTransition.cpp b/example_fbo-sources/src/SlideShowSource/magSlideTransition.cpp index 6c4c9ac..2377702 100644 --- a/example_fbo-sources/src/SlideShowSource/magSlideTransition.cpp +++ b/example_fbo-sources/src/SlideShowSource/magSlideTransition.cpp @@ -13,7 +13,7 @@ void magSlideTransition::start(std::shared_ptr nextSlide) this->nextSlide = nextSlide; } -void magSlideTransition::update(u_int64_t timeDelta) +void magSlideTransition::update(uint64_t timeDelta) { if (!active) return; @@ -30,7 +30,7 @@ void magSlideTransition::update(u_int64_t timeDelta) } -u_int64_t magSlideTransition::getRunningTime() +uint64_t magSlideTransition::getRunningTime() { return runningTime; } diff --git a/example_fbo-sources/src/SlideShowSource/magSlideTransition.h b/example_fbo-sources/src/SlideShowSource/magSlideTransition.h index 8574f79..421b057 100644 --- a/example_fbo-sources/src/SlideShowSource/magSlideTransition.h +++ b/example_fbo-sources/src/SlideShowSource/magSlideTransition.h @@ -54,7 +54,7 @@ public: * If you need to override update, make sure to call this implementation * in your subclass. */ - virtual void update(u_int64_t timeDelta); + virtual void update(uint64_t timeDelta); /** * Draws the transition. Default implementation does nothing. @@ -65,9 +65,9 @@ public: /** * Current running time in milliseconds. - * @return u_int64_t + * @return uint64_t */ - u_int64_t getRunningTime(); + uint64_t getRunningTime(); /** * Returns the current time in normalized form. @@ -101,9 +101,9 @@ protected: std::shared_ptr slide; std::shared_ptr nextSlide; - u_int64_t runningTime; - u_int64_t duration; - u_int64_t endTime; + uint64_t runningTime; + uint64_t duration; + uint64_t endTime; bool active = false; diff --git a/example_fbo-sources/src/SlideShowSource/magSlideTransitionFactory.cpp b/example_fbo-sources/src/SlideShowSource/magSlideTransitionFactory.cpp index 1c03a57..ef44d1b 100644 --- a/example_fbo-sources/src/SlideShowSource/magSlideTransitionFactory.cpp +++ b/example_fbo-sources/src/SlideShowSource/magSlideTransitionFactory.cpp @@ -56,7 +56,7 @@ magSlideTransitionFactory* magSlideTransitionFactory::instance() std::shared_ptr magSlideTransitionFactory::createTransition(std::string transitionName, std::shared_ptr slide, - ofParameterGroup &settings, u_int64_t duration) + ofParameterGroup &settings, uint64_t duration) { std::shared_ptr transition; diff --git a/example_fbo-sources/src/SlideShowSource/magSlideTransitionFactory.h b/example_fbo-sources/src/SlideShowSource/magSlideTransitionFactory.h index 1a3bd32..75986e8 100644 --- a/example_fbo-sources/src/SlideShowSource/magSlideTransitionFactory.h +++ b/example_fbo-sources/src/SlideShowSource/magSlideTransitionFactory.h @@ -19,7 +19,7 @@ public: std::shared_ptr createTransition(std::string transitionName, std::shared_ptr slide, ofParameterGroup &group, - u_int64_t duration); + uint64_t duration); template void registerTransition(T transition) {