Changeset 13041 for OpenSceneGraph/trunk/src/osgPlugins/xine/ReaderWriterXine.cpp

Timestamp:

03/21/12 18:36:20 (15 months ago)

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/src/osgPlugins/xine/ReaderWriterXine.cpp (modified) (13 diffs)

OpenSceneGraph/trunk/src/osgPlugins/xine/ReaderWriterXine.cpp

@@ -42 +42 @@
 
         META_Object(osgXine,XineImageStream);
-        
+
         void setVolume(float volume)
         {
             _volume = osg::minimum(osg::maximum(volume,0.0f),1.0f);
-            if (_stream) 
+            if (_stream)
             {
                 xine_set_param(_stream, XINE_PARAM_AUDIO_VOLUME, static_cast<int>(_volume*100.0f));
@@ -52 +52 @@
             }
         }
-        
+
         float getVolume() const
         {
@@ -61 +61 @@
         {
             if (filename==getFileName()) return true;
-            
+
             _xine = xine;
-        
+
             // create visual
             rgbout_visual_info_t* visual = new rgbout_visual_info_t;
@@ -83 +83 @@
                 return false;
             }
-            
+
 
             // set up stream
             _stream = xine_stream_new(_xine, _ao, _vo);
-            
+
             if (_stream)
             {
@@ -104 +104 @@
 
             int result = xine_open(_stream, filename.c_str());
-            
+
             if (result==0)
             {
@@ -111 +111 @@
                 return false;
             }
-            
-            
+
+
             _ready = false;
-            
+
             int width = xine_get_stream_info(_stream,XINE_STREAM_INFO_VIDEO_WIDTH);
             int height = xine_get_stream_info(_stream,XINE_STREAM_INFO_VIDEO_HEIGHT);
@@ -122 +122 @@
 
             // play();
-            
+
             return true;
 
@@ -163 +163 @@
 
             _status=PAUSED;
-            
+
             if (_stream)
             {
@@ -233 +233 @@
             {
                   OSG_INFO<<"  Closing stream"<<std::endl;
-                
+
                   xine_close(_stream);
 
@@ -252 +252 @@
                OSG_INFO<<"  Closing audio driver"<<std::endl;
 
-                xine_close_audio_driver(_xine, _ao);  
-                
+                xine_close_audio_driver(_xine, _ao);
+
                 _ao = 0;
             }
-            
+
             if (_vo)
             {
                OSG_INFO<<"  Closing video driver"<<std::endl;
 
-                xine_close_video_driver(_xine, _vo);  
-                
+                xine_close_video_driver(_xine, _vo);
+
                 _vo = 0;
             }
@@ -306 +306 @@
             supportsExtension("wmv","");
             supportsExtension("xine","Xine plugin Pseduo plugin");
-        
+
             _xine = xine_new();
 
@@ -317 +317 @@
 
             xine_init(_xine);
-            
+
             register_rgbout_plugin(_xine);
         }
-     
+
         virtual ~ReaderWriterXine()
         {
             OSG_INFO<<"~ReaderWriterXine()"<<std::endl;
-        
+
             if (_xine) xine_exit(_xine);
             _xine = NULL;
         }
-        
+
         virtual const char* className() const { return "Xine ImageStream Reader"; }
 
@@ -335 +335 @@
             std::string ext = osgDB::getLowerCaseFileExtension(file);
             if (!acceptsExtension(ext)) return ReadResult::FILE_NOT_HANDLED;
-            
+
             std::string fileName;
             if (ext=="xine")