diff layer/Layer.cpp @ 586:1ae54a29e59e

Merge from debug-output branch

--- a/layer/Layer.cpp	Thu Apr 14 15:21:21 2011 +0100
+++ b/layer/Layer.cpp	Tue Jun 14 14:48:29 2011 +0100
@@ -42,7 +42,7 @@
 
 Layer::~Layer()
 {
-//    std::cerr << "Layer::~Layer(" << this << ")" << std::endl;
+//    DEBUG << "Layer::~Layer(" << this << ")" << endl;
 }
 
 void
@@ -106,7 +106,7 @@
 PlayParameters *
 Layer::getPlayParameters() 
 {
-//    std::cerr << "Layer (" << this << ", " << objectName().toStdString() << ")::getPlayParameters: model is "<< getModel() << std::endl;
+//    std::cerr << "Layer (" << this << ", " << objectName() << ")::getPlayParameters: model is "<< getModel() << std::endl;
     const Model *model = getModel();
     if (model) {
 	return PlayParameterRepository::getInstance()->getPlayParameters(model);
@@ -169,7 +169,7 @@
 Layer::alignToReference(View *v, size_t frame) const
 {
     const Model *m = getModel();
-    std::cerr << "Layer::alignToReference(" << frame << "): model = " << m << ", alignment reference = " << (m ? m->getAlignmentReference() : 0) << std::endl;
+    DEBUG << "Layer::alignToReference(" << frame << "): model = " << m << ", alignment reference = " << (m ? m->getAlignmentReference() : 0) << endl;
     if (m && m->getAlignmentReference()) {
         return m->alignToReference(frame);
     } else {
@@ -181,7 +181,7 @@
 Layer::alignFromReference(View *v, size_t frame) const
 {
     const Model *m = getModel();
-    std::cerr << "Layer::alignFromReference(" << frame << "): model = " << m << ", alignment reference = " << (m ? m->getAlignmentReference() : 0) << std::endl;
+    DEBUG << "Layer::alignFromReference(" << frame << "): model = " << m << ", alignment reference = " << (m ? m->getAlignmentReference() : 0) << endl;
     if (m && m->getAlignmentReference()) {
         return m->alignFromReference(frame);
     } else {