FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up of debugging messages

Browse Source
This commit is contained in:
Robert Osfield
2004-07-27 13:32:15 +00:00
parent 654764a0e9
commit 7deea8531e
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/osg/TextureRectangle.cpp
View File

@@ -36,8 +36,6 @@ TextureRectangle::TextureRectangle():
_textureWidth(0),
_textureHeight(0)
{
osg::notify(osg::NOTICE)<<"TextureRectangle::TextureRectangle() "<<this<<std::endl;
setWrap(WRAP_S, CLAMP);
setWrap(WRAP_T, CLAMP);
@@ -49,8 +47,6 @@ TextureRectangle::TextureRectangle(Image* image):
_textureWidth(0),
_textureHeight(0)
{
osg::notify(osg::NOTICE)<<"TextureRectangle::TextureRectangle(Image*) "<<this<<std::endl;
setWrap(WRAP_S, CLAMP);
setWrap(WRAP_T, CLAMP);
@@ -217,8 +213,6 @@ void TextureRectangle::applyTexParameters(GLenum target, State& state) const
void TextureRectangle::applyTexImage_load(GLenum target, Image* image, State& state, GLsizei& inwidth, GLsizei& inheight) const
{
// if we don't have a valid image we can't create a texture!
osg::notify(osg::NOTICE)<<"TextureRectangle::applyTexImage_load "<<this<<std::endl;
if (!image || !image->data())
return;
@@ -264,8 +258,6 @@ void TextureRectangle::applyTexImage_load(GLenum target, Image* image, State& st
void TextureRectangle::applyTexImage_subload(GLenum target, Image* image, State& state, GLsizei& inwidth, GLsizei& inheight, GLint& inInternalFormat) const
{
osg::notify(osg::NOTICE)<<"TextureRectangle::applyTexImage_subload "<<this<<std::endl;
// if we don't have a valid image we can't create a texture!
if (!image || !image->data())
return;

4
src/osgPlugins/mpeg/MpegImageStream.cpp
View File

@@ -63,7 +63,6 @@ MpegImageStream::MpegImageStream(const char* fileName) : ImageStream()
// Deconstructor: stop and terminate thread
MpegImageStream::~MpegImageStream()
{
if( isRunning() )
{
quit(true);
@@ -269,12 +268,11 @@ void MpegImageStream::run()
MPEG3_RGB888, str);
dirty(); //Image();
++frameNumber;
if (frameNumber>=_frames)
{
rewind();
//stop();
}

9
src/osgPlugins/mpeg/MpegImageStream.h
View File

@@ -29,6 +29,7 @@
#define _MPEGIMAGESTREAM_H_
#include <osg/ImageStream>
#include <osg/Notify>
#include <OpenThreads/Thread>
#include <OpenThreads/Mutex>
@@ -56,11 +57,17 @@ namespace osg {
{
if (!isRunning()) start();
osg::notify(osg::NOTICE)<<"Play video"<<this<<std::endl;
setCmd(THREAD_START);
}
/// Pause stream at current position.
virtual void pause() { setCmd(THREAD_STOP); }
virtual void pause()
{
osg::notify(osg::NOTICE)<<"Pause video"<<this<<std::endl;
setCmd(THREAD_STOP);
}
/// Rewind stream to beginning.
virtual void rewind() { setCmd(THREAD_REWIND); }