Browse Source

Remove anoying debug messages

master
Krisjanis Rijnieks 11 years ago
parent
commit
9b04e00261
  1. 13
      src/MediaServer/MediaServer.cpp
  2. 4
      src/Sources/BaseSource.cpp
  3. 4
      src/Sources/ImageSource.cpp
  4. 2
      src/Sources/VideoSource.cpp
  5. 8
      src/SourcesEditor.cpp
  6. 2
      src/ui/RadioList.cpp

13
src/MediaServer/MediaServer.cpp

@ -18,7 +18,6 @@ namespace piMapper {
}
MediaServer::~MediaServer() {
cout << "Media server is over" << endl;
removeWatcherListeners();
};
@ -46,7 +45,6 @@ namespace piMapper {
}
std::vector<std::string> MediaServer::getVideoNames() {
cout << "nuVideos: " << getNumVideos() << endl;
std::vector<std::string> videoNames;
for (int i = 0; i < getNumVideos(); i++) {
// Split video path
@ -145,7 +143,6 @@ namespace piMapper {
}
BaseSource* MediaServer::loadVideo(string& path) {
cout << "loading video: " << path << endl;
VideoSource* videoSource = NULL;
// Check if this video is already loaded
bool isVideoLoaded = false;
@ -272,26 +269,16 @@ namespace piMapper {
}
void MediaServer::handleImageAdded(string& path) {
/*
cout << "onImageAdded: " << path << endl;
cout << "numImages: " << getNumImages() << endl;
*/
ofNotifyEvent(onImageAdded, path, this);
}
void MediaServer::handleImageRemoved(string& path) {
/*
cout << "onImageRemoved: " << path << endl;
cout << "numImages: " << getNumImages() << endl;
*/
ofNotifyEvent(onImageRemoved, path, this);
}
void MediaServer::handleVideoAdded(string& path) {
//cout << "onVideoAdded: " << path << endl;
ofNotifyEvent(onVideoAdded, path, this);
}
void MediaServer::handleVideoRemoved(string& path) {
//cout << "onVideoRemoved: " << path << endl;
ofNotifyEvent(onVideoRemoved, path, this);
}

4
src/Sources/BaseSource.cpp

@ -12,9 +12,7 @@ namespace ofx {
texture = newTexture;
}
BaseSource::~BaseSource() {
cout << "BaseSource destr" << endl;
}
BaseSource::~BaseSource() {}
ofTexture* BaseSource::getTexture() {
return texture;

4
src/Sources/ImageSource.cpp

@ -13,9 +13,9 @@ namespace ofx {
void ImageSource::loadImage(std::string& filePath) {
path = filePath;
cout << "loading image: " << filePath << endl;
//cout << "loading image: " << filePath << endl;
setNameFromPath(filePath);
cout << "path: " << path << endl;
//cout << "path: " << path << endl;
image = new ofImage();
if (!image->loadImage(filePath)) {
ofLogFatalError("ImageSource") << "Could not load image";

2
src/Sources/VideoSource.cpp

@ -3,7 +3,7 @@
namespace ofx {
namespace piMapper {
VideoSource::VideoSource() {
cout << "VideoSource constr" << endl;
//cout << "VideoSource constr" << endl;
loadable = true;
loaded = false;
type = SourceType::SOURCE_TYPE_VIDEO;

8
src/SourcesEditor.cpp

@ -44,10 +44,6 @@ namespace piMapper {
imageSelector->setPosition(20, 20);
ofAddListener(imageSelector->onRadioSelected, this, &SourcesEditor::handleImageSelected);
vector<string> videoNames = mediaServer->getVideoNames();
cout << "list video names: " << endl;
for (int i = 0; i < videoNames.size(); i++) {
cout << videoNames[i] << endl;
}
videoSelector->setup("Videos", videoNames, mediaServer->getVideoPaths());
videoSelector->setPosition(250, 20);
ofAddListener(videoSelector->onRadioSelected, this, &SourcesEditor::handleVideoSelected);
@ -93,8 +89,8 @@ namespace piMapper {
}
// Attempt to clear existing media server and assign new one
clearMediaServer();
cout << "old ms addr: " << mediaServer << endl;
cout << "new ms addr: " << newMediaServer << endl;
//cout << "old ms addr: " << mediaServer << endl;
//cout << "new ms addr: " << newMediaServer << endl;
mediaServer = newMediaServer;
isMediaServerExternal = true;
}

2
src/ui/RadioList.cpp

@ -34,7 +34,7 @@ void RadioList::setup(vector<string>& labels, vector<string>& values) {
guiGroup.add(toggle);
}
cout << "num items: " << guiGroup.getNumControls() << endl;
//cout << "num items: " << guiGroup.getNumControls() << endl;
}
void RadioList::setup(string title, vector<string>& labels, vector<string>& values) {

Loading…
Cancel
Save