[Sumover-dev] [svn commit] r3907 - vic/branches/mpeg4/render

[sumover-dev at cs.ucl.ac.uk]

Author: piers
Date: Thu Nov  2 17:10:14 2006
New Revision: 3907

Modified:
   vic/branches/mpeg4/render/renderer-window.cpp
   vic/branches/mpeg4/render/vw.cpp
   vic/branches/mpeg4/render/vw.h

Log:
Added more #ifdef HAVE_XVIDEO blocks around the XVIDEO code.

Modified: vic/branches/mpeg4/render/renderer-window.cpp
==============================================================================
--- vic/branches/mpeg4/render/renderer-window.cpp	(original)
+++ vic/branches/mpeg4/render/renderer-window.cpp	Thu Nov  2 17:10:14 2006
@@ -202,7 +202,10 @@
 void WindowDitherer::alloc_image()
 {
 	StandardVideoImage* p;
-	if(enable_xv){
+
+#ifdef HAVE_XVIDEO
+	
+	if (enable_xv){
 	  XVideoImage *p;		
 	  p = XVideoImage::allocate(window_->tkwin(), width_, height_);	
 	  if(p){
@@ -213,6 +216,8 @@
 	  enable_xv = false;
 	  printf("disable xvideo\n");
 	}
+#endif
+
 	p = StandardVideoImage::allocate(window_->tkwin(), outw_, outh_);
 	pixbuf_ = p->pixbuf();
 	image_ = p;

Modified: vic/branches/mpeg4/render/vw.cpp
==============================================================================
--- vic/branches/mpeg4/render/vw.cpp	(original)
+++ vic/branches/mpeg4/render/vw.cpp	Thu Nov  2 17:10:14 2006
@@ -159,6 +159,7 @@
 }
 
 
+#ifdef HAVE_XVIDEO
 // FIXME: need to detect xvdieo capability
 bool XVideoImage::enable_xv = true;
 
@@ -193,6 +194,7 @@
 		      int sx, int sy, int x, int y,int w, int h) const{
 	render.displayImage(window, gc, w, h);
 }
+#endif /*HAVE_XVIDEO*/
 
 SlowVideoImage::SlowVideoImage(Tk_Window tk, int w, int h)
 	: StandardVideoImage(tk, w, h)

Modified: vic/branches/mpeg4/render/vw.h
==============================================================================
--- vic/branches/mpeg4/render/vw.h	(original)
+++ vic/branches/mpeg4/render/vw.h	Thu Nov  2 17:10:14 2006
@@ -103,7 +103,9 @@
         
     protected:
 	IMAGE_TYPE* image_;
+#ifdef HAVE_XVIDEO
 	XRender render;
+#endif
 	static bool enable_xv;
 };
 #ifdef USE_SHM