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

Commented out the debug messages, added back in the audio into the xine plugin

Browse Source
This commit is contained in:
Robert Osfield
2005-02-09 12:29:09 +00:00
parent 50a370dc56
commit 021440b9a4
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/osg/TextureRectangle.cpp
View File

@@ -305,7 +305,7 @@ void TextureRectangle::applyTexImage_subload(GLenum target, Image* image, State&
glPixelStorei(GL_UNPACK_ALIGNMENT, image->getPacking());
#define DO_TIMING
// #define DO_TIMING
#ifdef DO_TIMING
osg::Timer_t start_tick = osg::Timer::instance()->tick();
osg::notify(osg::NOTICE)<<"glTexSubImage2D pixelFormat = "<<std::hex<<image->getPixelFormat()<<std::dec<<std::endl;

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

@@ -39,6 +39,7 @@
#include "libmpeg3/libmpeg3.h"
#include <iostream>
using namespace osg;
@@ -49,7 +50,9 @@ using namespace osg;
// Constructor: setup and start thread
MpegImageStream::MpegImageStream(const char* fileName) : ImageStream()
{
_useMMX = false;
std::cout<<"Opening pegImageStream::MpegImageStream"<<std::endl;
_useMMX = true;
_fps = 0.0f;
_frames = 0;
_len = 0;

4
src/osgPlugins/xine/ReaderWriterXine.cpp
View File

@@ -111,7 +111,7 @@ class ReaderWriterXine : public osgDB::ReaderWriter
// set up drivers
xine_video_port_t* vo = xine_open_video_driver(_xine, "rgb", XINE_VISUAL_TYPE_RGBOUT, (void*)visual);
xine_audio_port_t* ao = xine_open_audio_driver(_xine, "oss", NULL);
xine_audio_port_t* ao = xine_open_audio_driver(_xine, "auto", NULL);
if (!vo)
{
@@ -121,7 +121,7 @@ class ReaderWriterXine : public osgDB::ReaderWriter
// set up stream
xine_stream_t* stream = xine_stream_new(_xine, 0, vo);
xine_stream_t* stream = xine_stream_new(_xine, ao, vo);
// set up queue
// xine_event_queue_t* queue = xine_event_new_queue(stream);