diff --git a/src/osg/TextureRectangle.cpp b/src/osg/TextureRectangle.cpp index f1f1a2441..48ca586c8 100644 --- a/src/osg/TextureRectangle.cpp +++ b/src/osg/TextureRectangle.cpp @@ -36,8 +36,6 @@ TextureRectangle::TextureRectangle(): _textureWidth(0), _textureHeight(0) { - osg::notify(osg::NOTICE)<<"TextureRectangle::TextureRectangle() "<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 "<data()) return; diff --git a/src/osgPlugins/mpeg/MpegImageStream.cpp b/src/osgPlugins/mpeg/MpegImageStream.cpp index 4149d70c2..60b0e4347 100644 --- a/src/osgPlugins/mpeg/MpegImageStream.cpp +++ b/src/osgPlugins/mpeg/MpegImageStream.cpp @@ -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(); } diff --git a/src/osgPlugins/mpeg/MpegImageStream.h b/src/osgPlugins/mpeg/MpegImageStream.h index b6fc5867d..7134e181b 100644 --- a/src/osgPlugins/mpeg/MpegImageStream.h +++ b/src/osgPlugins/mpeg/MpegImageStream.h @@ -29,6 +29,7 @@ #define _MPEGIMAGESTREAM_H_ #include +#include #include #include @@ -56,11 +57,17 @@ namespace osg { { if (!isRunning()) start(); + osg::notify(osg::NOTICE)<<"Play video"<