From 021440b9a4449ada5e4bb2221dbadc5fc9f67ac5 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Wed, 9 Feb 2005 12:29:09 +0000
Subject: [PATCH] Commented out the debug messages, added back in the audio
 into the xine plugin

---
 src/osg/TextureRectangle.cpp             | 2 +-
 src/osgPlugins/mpeg/MpegImageStream.cpp  | 5 ++++-
 src/osgPlugins/xine/ReaderWriterXine.cpp | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/osg/TextureRectangle.cpp b/src/osg/TextureRectangle.cpp
index a8c7f18ac..6fddb2efc 100644
--- a/src/osg/TextureRectangle.cpp
+++ b/src/osg/TextureRectangle.cpp
@@ -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;
diff --git a/src/osgPlugins/mpeg/MpegImageStream.cpp b/src/osgPlugins/mpeg/MpegImageStream.cpp
index 26cd7af0c..ba7cce3da 100644
--- a/src/osgPlugins/mpeg/MpegImageStream.cpp
+++ b/src/osgPlugins/mpeg/MpegImageStream.cpp
@@ -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;
diff --git a/src/osgPlugins/xine/ReaderWriterXine.cpp b/src/osgPlugins/xine/ReaderWriterXine.cpp
index 22df8fa97..e3a833b2d 100644
--- a/src/osgPlugins/xine/ReaderWriterXine.cpp
+++ b/src/osgPlugins/xine/ReaderWriterXine.cpp
@@ -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);