Mercurial > hg > svgui
comparison layer/Layer.cpp @ 682:1a0dfcbffaf1
Drop std:: from cout, cerr, endl -- pull these in through Debug.h
author | Chris Cannam |
---|---|
date | Tue, 26 Nov 2013 14:06:40 +0000 |
parents | 4806715f7a19 |
children | 1d526ba11a24 |
comparison
equal
deleted
inserted
replaced
681:eaf4446a1bef | 682:1a0dfcbffaf1 |
---|---|
104 } | 104 } |
105 | 105 |
106 PlayParameters * | 106 PlayParameters * |
107 Layer::getPlayParameters() | 107 Layer::getPlayParameters() |
108 { | 108 { |
109 // std::cerr << "Layer (" << this << ", " << objectName() << ")::getPlayParameters: model is "<< getModel() << std::endl; | 109 // cerr << "Layer (" << this << ", " << objectName() << ")::getPlayParameters: model is "<< getModel() << endl; |
110 const Model *model = getModel(); | 110 const Model *model = getModel(); |
111 if (model) { | 111 if (model) { |
112 return PlayParameterRepository::getInstance()->getPlayParameters(model); | 112 return PlayParameterRepository::getInstance()->getPlayParameters(model); |
113 } | 113 } |
114 return 0; | 114 return 0; |
255 if (i->haveReferenceFrame()) { | 255 if (i->haveReferenceFrame()) { |
256 referenceFrame = i->getReferenceFrame(); | 256 referenceFrame = i->getReferenceFrame(); |
257 } | 257 } |
258 long myMappedFrame = alignToReference(v, sourceFrame); | 258 long myMappedFrame = alignToReference(v, sourceFrame); |
259 | 259 |
260 // std::cerr << "sourceFrame = " << sourceFrame << ", referenceFrame = " << referenceFrame << " (have = " << i->haveReferenceFrame() << "), myMappedFrame = " << myMappedFrame << std::endl; | 260 // cerr << "sourceFrame = " << sourceFrame << ", referenceFrame = " << referenceFrame << " (have = " << i->haveReferenceFrame() << "), myMappedFrame = " << myMappedFrame << endl; |
261 | 261 |
262 if (myMappedFrame != referenceFrame) return true; | 262 if (myMappedFrame != referenceFrame) return true; |
263 } | 263 } |
264 | 264 |
265 return false; | 265 return false; |