From 58565d0a3a56d978a8fa7330fd23d2945599bf7e Mon Sep 17 00:00:00 2001 From: Krisjanis Rijnieks Date: Wed, 15 Oct 2014 15:50:17 +0200 Subject: [PATCH] Adjust things to be compatible with the updated DirectoryWatcher --- src/MediaServer/MediaServer.cpp | 8 ++++---- src/MediaServer/MediaServer.h | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/MediaServer/MediaServer.cpp b/src/MediaServer/MediaServer.cpp index 9dfea0b..3c8d6f2 100644 --- a/src/MediaServer/MediaServer.cpp +++ b/src/MediaServer/MediaServer.cpp @@ -17,14 +17,14 @@ MediaServer::MediaServer() MediaServer::~MediaServer() {}; -int MediaServer::getNumImages() { return imageWatcher.filePaths.size(); } -int MediaServer::getNumVideos() { return videoWatcher.filePaths.size(); } +int MediaServer::getNumImages() { return imageWatcher.getFilePaths().size(); } +int MediaServer::getNumVideos() { return videoWatcher.getFilePaths().size(); } std::vector& MediaServer::getImagePaths() { - return imageWatcher.filePaths; + return imageWatcher.getFilePaths(); } std::vector& MediaServer::getVideoPaths() { - return videoWatcher.filePaths; + return videoWatcher.getFilePaths(); } } } \ No newline at end of file diff --git a/src/MediaServer/MediaServer.h b/src/MediaServer/MediaServer.h index 03391e9..acf8ae0 100644 --- a/src/MediaServer/MediaServer.h +++ b/src/MediaServer/MediaServer.h @@ -26,6 +26,9 @@ class MediaServer { int getNumImages(); std::vector& getVideoPaths(); std::vector& getImagePaths(); + + // Custom events + //ofEvent on private: // Directory Watchers