cailean
/
ofxPiMapper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Added a DirectoryWatcher to magSlideShowSource

master
c-mendoza 8 years ago
parent
e231300b84
commit
b6a47bbb28
2 changed files with 193 additions and 168 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 94
      src/Sources/magSlideShowSource.cpp
  2. 267
      src/Sources/magSlideShowSource.h

94
src/Sources/magSlideShowSource.cpp
View File

@ -10,15 +10,20 @@
#include "SettingsLoader.h" #include "SettingsLoader.h"
#include "magSlideTransitionFactory.h" #include "magSlideTransitionFactory.h"
magSlideShowSource::magSlideShowSource() magSlideShowSource::magSlideShowSource() {
{
name = "Slide Show Source"; name = "Slide Show Source";
currentSlideIndex = 0; currentSlideIndex = 0;
isPlaying = false; isPlaying = false;
directoryWatcher = 0;
doInit = false;
} }
bool magSlideShowSource::initialize(magSlideShowSource::Settings settings) magSlideShowSource::~magSlideShowSource() {
{ directoryWatcher->endWatch();
delete directoryWatcher;
}
bool magSlideShowSource::initialize(magSlideShowSource::Settings settings) {
this->settings = settings; this->settings = settings;
bool success = true; bool success = true;
@ -45,23 +50,44 @@ bool magSlideShowSource::initialize(magSlideShowSource::Settings settings)
<< settings.slidesFolderPath; << settings.slidesFolderPath;
return success; return success;
} }
{
if (directoryWatcher == 0)
{
using namespace ofx::piMapper;
directoryWatcher = new DirectoryWatcher(settings.slidesFolderPath,
SourceTypeHelper::GetSourceTypeHelperEnum(
SOURCE_TYPE_NAME_IMAGE));
ofAddListener(directoryWatcher->directoryFileAddedEvent, this, &magSlideShowSource::fileAddedListener);
ofAddListener(directoryWatcher->directoryFileRemovedEvent, this,
&magSlideShowSource::fileRemovedListener);
directoryWatcher->beginWatch();
}
}
} }
else if (!settings.slideshowFilePath.empty()) else if (!settings.slideshowFilePath.empty())
{ {
// try to load slide show from xml
success = false; success = false;
} }
return success; return success;
} }
void magSlideShowSource::setup() void magSlideShowSource::setup() {
{
ofx::piMapper::FboSource::setup(); ofx::piMapper::FboSource::setup();
} }
void magSlideShowSource::update() void magSlideShowSource::update() {
{
// Perform re-initialization if the DirectoryWatcher
// detects file changes:
if (doInit)
{
initialize(settings);
doInit = false;
}
if (!isPlaying) return; if (!isPlaying) return;
auto nowTime = ofGetElapsedTimeMillis(); auto nowTime = ofGetElapsedTimeMillis();
@ -96,8 +122,7 @@ void magSlideShowSource::update()
} }
} }
void magSlideShowSource::draw() void magSlideShowSource::draw() {
{
ofBackground(0, 0); ofBackground(0, 0);
ofPushMatrix(); ofPushMatrix();
ofPushStyle(); ofPushStyle();
@ -115,8 +140,7 @@ void magSlideShowSource::draw()
ofDisableAlphaBlending(); ofDisableAlphaBlending();
} }
bool magSlideShowSource::createFromFolderContents(std::string path) bool magSlideShowSource::createFromFolderContents(std::string path) {
{
ofDirectory dir = ofDirectory(path); ofDirectory dir = ofDirectory(path);
slides.clear(); slides.clear();
@ -194,8 +218,7 @@ bool magSlideShowSource::createFromFolderContents(std::string path)
} }
} }
bool magSlideShowSource::loadFromXml() bool magSlideShowSource::loadFromXml() {
{
auto *loader = ofx::piMapper::SettingsLoader::instance(); auto *loader = ofx::piMapper::SettingsLoader::instance();
auto xml = ofxXmlSettings(); auto xml = ofxXmlSettings();
Settings settings; Settings settings;
@ -270,8 +293,7 @@ bool magSlideShowSource::loadFromXml()
return true; return true;
} }
void magSlideShowSource::addSlide(std::shared_ptr<magSlide> slide) void magSlideShowSource::addSlide(std::shared_ptr<magSlide> slide) {
{
// ofLogVerbose("addSlide") << slide->getId(); // ofLogVerbose("addSlide") << slide->getId();
slides.insert(slides.begin(), slide); slides.insert(slides.begin(), slide);
auto rOption = slide->getResizeOption(); auto rOption = slide->getResizeOption();
@ -337,9 +359,9 @@ void magSlideShowSource::addSlide(std::shared_ptr<magSlide> slide)
// bogusParamGroup, // bogusParamGroup,
// slide->buildInDuration); // slide->buildInDuration);
slide->transition = tf->createTransition(settings.transitionName, slide->transition = tf->createTransition(settings.transitionName,
slide, slide,
bogusParamGroup, bogusParamGroup,
slide->buildOutDuration); slide->buildOutDuration);
} }
//// void method(const void * sender, ArgumentsType &args) //// void method(const void * sender, ArgumentsType &args)
ofAddListener(slide->slideStateChangedEvent, this, &magSlideShowSource::slideStateChanged); ofAddListener(slide->slideStateChangedEvent, this, &magSlideShowSource::slideStateChanged);
@ -347,8 +369,7 @@ void magSlideShowSource::addSlide(std::shared_ptr<magSlide> slide)
} }
void magSlideShowSource::play() void magSlideShowSource::play() {
{
if (!isPlaying) if (!isPlaying)
{ {
runningTime = 0; runningTime = 0;
@ -359,13 +380,11 @@ void magSlideShowSource::play()
} }
} }
void magSlideShowSource::pause() void magSlideShowSource::pause() {
{
isPlaying = false; isPlaying = false;
} }
void magSlideShowSource::playNextSlide() void magSlideShowSource::playNextSlide() {
{
//TODO //TODO
// I should check here to see if there are less than two slides. // I should check here to see if there are less than two slides.
// If so, we should probably return // If so, we should probably return
@ -450,27 +469,23 @@ void magSlideShowSource::playNextSlide()
enqueueSlide(slides[currentSlideIndex], ofGetElapsedTimeMillis()); enqueueSlide(slides[currentSlideIndex], ofGetElapsedTimeMillis());
} }
void magSlideShowSource::playPrevSlide() void magSlideShowSource::playPrevSlide() {
{
currentSlideIndex -= (direction*2); currentSlideIndex -= (direction*2);
playNextSlide(); playNextSlide();
} }
void magSlideShowSource::playSlide(int slideIndex) void magSlideShowSource::playSlide(int slideIndex) {
{
currentSlideIndex = slideIndex-direction; currentSlideIndex = slideIndex-direction;
playNextSlide(); playNextSlide();
} }
void magSlideShowSource::enqueueSlide(std::shared_ptr<magSlide> slide, u_int64_t startTime) void magSlideShowSource::enqueueSlide(std::shared_ptr<magSlide> slide, u_int64_t startTime) {
{
// ofLogVerbose() << "Enqueuing slide " << currentSlideIndex << " slide id: " << slide->getId(); // ofLogVerbose() << "Enqueuing slide " << currentSlideIndex << " slide id: " << slide->getId();
slide->start(startTime); slide->start(startTime);
activeSlides.insert(activeSlides.begin(), slide); activeSlides.insert(activeSlides.begin(), slide);
} }
void magSlideShowSource::slideStateChanged(const void *sender, ofEventArgs &args) void magSlideShowSource::slideStateChanged(const void *sender, ofEventArgs &args) {
{
magSlide *slide = (magSlide *) sender; magSlide *slide = (magSlide *) sender;
// ofLogVerbose("slideStateChanged") << "Slide id: " << slide->getId() << " Slide state: " // ofLogVerbose("slideStateChanged") << "Slide id: " << slide->getId() << " Slide state: "
@ -488,11 +503,18 @@ void magSlideShowSource::slideStateChanged(const void *sender, ofEventArgs &args
} }
void magSlideShowSource::slideComplete(const void *sender, ofEventArgs &args) void magSlideShowSource::slideComplete(const void *sender, ofEventArgs &args) {
{
magSlide *slide = (magSlide *) sender; magSlide *slide = (magSlide *) sender;
// ofLogVerbose() << "Slide Complete. id: " << slide->getId(); // ofLogVerbose() << "Slide Complete. id: " << slide->getId();
slide->isComplete = true; slide->isComplete = true;
} }
void magSlideShowSource::fileAddedListener(const void *sender) {
doInit = true;
}
void magSlideShowSource::fileRemovedListener(const void *sender) {
doInit = true;
}

267
src/Sources/magSlideShowSource.h
View File

@ -9,152 +9,155 @@
#include "FboSource.h" #include "FboSource.h"
#include "magSlide.h" #include "magSlide.h"
#include "DirectoryWatcher.h"
class magSlide; class magSlide;
class magSlideShowSource : public ofx::piMapper::FboSource class magSlideShowSource : public ofx::piMapper::FboSource {
{ public:
public: magSlideShowSource();
magSlideShowSource(); struct Settings; // forward declaration
struct Settings; // forward declaration bool initialize(magSlideShowSource::Settings settings);
bool initialize(magSlideShowSource::Settings settings); void setup() override;
void setup() override; void update() override;
void update() override; void draw() override;
void draw() override;
/**
* Removes all slides and then attempts to create a new slide show
* based on the contents of the ofDirectory specified. The files may
* be images or videos, which will be transformed into the appropriate slide type.
* Any other file type in the directory is ignored (including other directories).
* The slide order is alphabetical according to filename.
*
* @param dir The ofDirectory to use as a source for a slide show.
* @return true if at least one slide was created. false is returned
* otherwise. Check the console for the specific error.
*/
bool createFromFolderContents(std::string path);
bool loadFromXml();
void addSlide(std::shared_ptr<magSlide> slide);
void play();
void pause();
void playNextSlide();
void playPrevSlide();
void playSlide(int slideIndex);
enum LoopType : int
{
NONE = 0,
NORMAL,
PING_PONG
};
struct Settings
{
/**
* The pixel width of the FBO.
*/
float width = 1280;
/**
* The pixel height of the FBO.
*/
float height = 720;
/**
* An optional default slide duration, in seconds.
* If a slide specifies a duration this value is ignored.
*/
float slideDuration = 5;
/**
* An optional default transition for the slide show.
*/
std::string transitionName = "";
/**
* An optional default transition duration. If no transition
* is specified, this value is ignored;
*/
float transitionDuration = 0;
/**
* If specified, all applicable files in the folder will
* be used as slides in the slide show. They will be ordered
* alphabetically according to their file names.
*
* If path is relative, the root will likely be the Data folder.
*/
std::string slidesFolderPath = "sources/images";
/**
* If specified,
*/
std::string slideshowFilePath;
/**
* Loop type for the slide show. See @code LoopType for options.
* The default is @code LoopType:None.
*/
LoopType loopType = LoopType::NONE;
/**
* The number of loops to perform, if the loopType is not NONE.
* If the value is 0 or less than 0, the slide show loops forever.
*/
int numLoops = 0;
/** /**
* The resizing option for the slide show. The default is FitProportionally. * Removes all slides and then attempts to create a new slide show
* If a slide already has a resizing option applied, that option will be * based on the contents of the ofDirectory specified. The files may
* respected and this resizeOption will not be used. * be images or videos, which will be transformed into the appropriate slide type.
* Any other file type in the directory is ignored (including other directories).
* The slide order is alphabetical according to filename.
*
* @param dir The ofDirectory to use as a source for a slide show.
* @return true if at least one slide was created. false is returned
* otherwise. Check the console for the specific error.
*/ */
magSlide::ResizeOptions resizeOption = magSlide::ResizeOptions::FitProportionally; bool createFromFolderContents(std::string path);
};
bool loadFromXml();
void addSlide(std::shared_ptr<magSlide> slide);
void play();
void pause();
void playNextSlide();
void playPrevSlide();
void playSlide(int slideIndex);
enum LoopType : int {
NONE = 0,
NORMAL,
PING_PONG
};
struct Settings {
/**
* The pixel width of the FBO.
*/
float width = 1280;
/**
* The pixel height of the FBO.
*/
float height = 720;
/**
* An optional default slide duration, in seconds.
* If a slide specifies a duration this value is ignored.
*/
float slideDuration = 5;
/**
* An optional default transition for the slide show.
*/
std::string transitionName = "";
/**
* An optional default transition duration. If no transition
* is specified, this value is ignored;
*/
float transitionDuration = 0;
/**
* If specified, all applicable files in the folder will
* be used as slides in the slide show. They will be ordered
* alphabetically according to their file names.
*
* If path is relative, the root will likely be the Data folder.
*/
std::string slidesFolderPath = "sources/images";
/**
* If specified,
*/
std::string slideshowFilePath;
/**
* Loop type for the slide show. See @code LoopType for options.
* The default is @code LoopType:None.
*/
LoopType loopType = LoopType::NONE;
/**
* The number of loops to perform, if the loopType is not NONE.
* If the value is 0 or less than 0, the slide show loops forever.
*/
int numLoops = 0;
/**
* The resizing option for the slide show. The default is FitProportionally.
* If a slide already has a resizing option applied, that option will be
* respected and this resizeOption will not be used.
*/
magSlide::ResizeOptions resizeOption = magSlide::ResizeOptions::FitProportionally;
};
////////////////////////////////////////////
//// Event Listeners
////////////////////////////////////////////
void slideStateChanged(const void *sender, ofEventArgs &args);
void slideComplete(const void *sender, ofEventArgs &args);
virtual ~magSlideShowSource();
////////////////////////////////////////////
//// Event Listeners
////////////////////////////////////////////
void slideStateChanged(const void* sender, ofEventArgs &args);
void slideComplete(const void* sender, ofEventArgs &args);
/**
/** * Fires when the slide show is done, which happens when
* Fires when the slide show is done, which happens when * the loop count is equal to Settings::numLoops, or when
* the loop count is equal to Settings::numLoops, or when * the last slide is played when @code LoopType::NONE is specified.
* the last slide is played when @code LoopType::NONE is specified. * Sender is this slide show.
* Sender is this slide show. */
*/ ofEvent<ofEventArgs> slideshowCompleteEvent;
ofEvent<ofEventArgs> slideshowCompleteEvent;
/** /**
* Fires when the slide show reaches the last slide * Fires when the slide show reaches the last slide
* and will perform a loop in the next call. * and will perform a loop in the next call.
* Sender is this slide show. * Sender is this slide show.
*/ */
ofEvent<ofEventArgs> slideshowWillLoopEvent; ofEvent<ofEventArgs> slideshowWillLoopEvent;
protected: protected:
Settings settings; Settings settings;
std::vector<std::shared_ptr<magSlide>> slides; std::vector<std::shared_ptr<magSlide>> slides;
private: private:
// std::shared_ptr<magSlide> currentSlide; // std::shared_ptr<magSlide> currentSlide;
std::vector<std::shared_ptr<magSlide>> activeSlides; std::vector<std::shared_ptr<magSlide>> activeSlides;
void enqueueSlide(std::shared_ptr<magSlide> slide, u_int64_t startTime); void enqueueSlide(std::shared_ptr<magSlide> slide, u_int64_t startTime);
u_int64_t lastTime; u_int64_t lastTime;
u_int64_t deltaTime; u_int64_t deltaTime;
u_int64_t runningTime; u_int64_t runningTime;
bool isInitialized = false; bool isInitialized = false;
bool isPlaying = false; bool isPlaying = false;
int currentSlideIndex = 0; int currentSlideIndex = 0;
int direction = 1; int direction = 1;
int loopCount = 0; int loopCount = 0;
ofx::piMapper::DirectoryWatcher* directoryWatcher;
void fileAddedListener(const void *sender);
void fileRemovedListener(const void *sender);
bool doInit;
}; };

Write Preview
Loading…
Cancel
Save