Browse Source

change paths from absolute to relative for all Targets but pi

master
das 5 years ago
committed by Krisjanis Rijnieks
parent
commit
33fc850aaf
  1. 8
      src/Application/SettingsLoader.cpp
  2. 34
      src/MediaServer/MediaServer.cpp
  3. 1
      src/ofxPiMapper.cpp

8
src/Application/SettingsLoader.cpp

@ -78,10 +78,16 @@ bool SettingsLoader::load(
source = mediaServer.loadMedia(sourceName, typeEnum);
}else{
// relative pathss as default, absolute Paths for RASPI
bool absolutePathSwitch = false;
#ifdef TARGET_RASPBERRY_PI
absolutePathSwitch = true;
#endif
// Construct full path
std::string dir = mediaServer.getDefaultMediaDir(typeEnum);
std::stringstream pathss;
pathss << ofToDataPath(dir, true) << sourceName;
pathss << ofToDataPath(dir, absolutePathSwitch) << sourceName;
std::string sourcePath = pathss.str();
// Check if file exists

34
src/MediaServer/MediaServer.cpp

@ -1,21 +1,29 @@
#include "MediaServer.h"
namespace ofx {
namespace piMapper {
MediaServer::MediaServer():
piVideoWatcher(PI_IMAGES_DIR, SourceType::SOURCE_TYPE_VIDEO),
usb0VideoWatcher(USB0_VIDEOS_DIR, SourceType::SOURCE_TYPE_VIDEO),
usb1VideoWatcher(USB1_VIDEOS_DIR, SourceType::SOURCE_TYPE_VIDEO),
usb2VideoWatcher(USB2_VIDEOS_DIR, SourceType::SOURCE_TYPE_VIDEO),
usb3VideoWatcher(USB3_VIDEOS_DIR, SourceType::SOURCE_TYPE_VIDEO),
piImageWatcher(PI_IMAGES_DIR, SourceType::SOURCE_TYPE_IMAGE),
usb0ImageWatcher(USB0_IMAGES_DIR, SourceType::SOURCE_TYPE_IMAGE),
usb1ImageWatcher(USB1_IMAGES_DIR, SourceType::SOURCE_TYPE_IMAGE),
usb2ImageWatcher(USB2_IMAGES_DIR, SourceType::SOURCE_TYPE_IMAGE),
usb3ImageWatcher(USB3_IMAGES_DIR, SourceType::SOURCE_TYPE_IMAGE),
imageWatcher(ofToDataPath(DEFAULT_IMAGES_DIR, true), SourceType::SOURCE_TYPE_IMAGE),
videoWatcher(ofToDataPath(DEFAULT_VIDEOS_DIR, true), SourceType::SOURCE_TYPE_VIDEO)
// relative pathss as default, absolute Paths for RASPI
bool absolutePathSwitch = false;
#ifdef TARGET_RASPBERRY_PI
absolutePathSwitch = true;
#endif
MediaServer::MediaServer() :
piVideoWatcher(PI_IMAGES_DIR, SourceType::SOURCE_TYPE_VIDEO),
usb0VideoWatcher(USB0_VIDEOS_DIR, SourceType::SOURCE_TYPE_VIDEO),
usb1VideoWatcher(USB1_VIDEOS_DIR, SourceType::SOURCE_TYPE_VIDEO),
usb2VideoWatcher(USB2_VIDEOS_DIR, SourceType::SOURCE_TYPE_VIDEO),
usb3VideoWatcher(USB3_VIDEOS_DIR, SourceType::SOURCE_TYPE_VIDEO),
piImageWatcher(PI_IMAGES_DIR, SourceType::SOURCE_TYPE_IMAGE),
usb0ImageWatcher(USB0_IMAGES_DIR, SourceType::SOURCE_TYPE_IMAGE),
usb1ImageWatcher(USB1_IMAGES_DIR, SourceType::SOURCE_TYPE_IMAGE),
usb2ImageWatcher(USB2_IMAGES_DIR, SourceType::SOURCE_TYPE_IMAGE),
usb3ImageWatcher(USB3_IMAGES_DIR, SourceType::SOURCE_TYPE_IMAGE),
imageWatcher(ofToDataPath(DEFAULT_IMAGES_DIR, absolutePathSwitch), SourceType::SOURCE_TYPE_IMAGE),
videoWatcher(ofToDataPath(DEFAULT_VIDEOS_DIR, absolutePathSwitch), SourceType::SOURCE_TYPE_VIDEO)
{
// By initialising all above we also copy files from external media
// to the ofxPiMapper storage.

1
src/ofxPiMapper.cpp

@ -1,5 +1,6 @@
#include "ofxPiMapper.h"
ofxPiMapper::ofxPiMapper(){}
void ofxPiMapper::setup(){

Loading…
Cancel
Save