[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1442-g67551e3

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  67551e3abab8f1e262587a2e59f44614adf84789 (commit)
      from  791e77e28aa276eb001805e1a06b75219eb180bc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=67551e3abab8f1e262587a2e59f44614adf84789


commit 67551e3abab8f1e262587a2e59f44614adf84789
Author: Sandro Santilli <address@hidden>
Date:   Mon Mar 12 08:22:50 2012 +0100

    Get rid of more XVideo references

diff --git a/doc/C/gnash.man-xml b/doc/C/gnash.man-xml
index 26ca519..49cc3f0 100644
--- a/doc/C/gnash.man-xml
+++ b/doc/C/gnash.man-xml
@@ -133,10 +133,10 @@ gnash [option]... [URL]
   </varlistentry>
 
   <varlistentry>
-    <term>--hwaccel none|vaapi|xv</term>
+    <term>--hwaccel none|vaapi</term>
     <listitem>
       <para>
-        Hardware Video Accelerator to use none|vaapi|xv|omap (default: none)
+        Hardware Video Accelerator to use none|vaapi (default: none)
       </para>
     </listitem>
   </varlistentry>
diff --git a/doc/C/preformatted/gnash.1.in b/doc/C/preformatted/gnash.1.in
index a3da491..8f5d92d 100644
--- a/doc/C/preformatted/gnash.1.in
+++ b/doc/C/preformatted/gnash.1.in
@@ -46,8 +46,8 @@ Be very verbose about parsing. Must be used in conjunction 
with -v.
 -A file
 Audio dump file (wave format).
 .TP 
---hwaccel none|vaapi|xv
-Hardware Video Accelerator to use none|vaapi|xv|omap (default: none)
+--hwaccel none|vaapi
+Hardware Video Accelerator to use none|vaapi (default: none)
 .TP 
 -x xid, --xid xid
 The XID of the parent window Gnash should use instead of
diff --git a/doc/C/preformatted/gnashuser.html.in 
b/doc/C/preformatted/gnashuser.html.in
index 058b052..dfd94a4 100644
--- a/doc/C/preformatted/gnashuser.html.in
+++ b/doc/C/preformatted/gnashuser.html.in
@@ -428,8 +428,8 @@
            </pre>
          </td></tr><tr><td align="left">HWAccel</td><td 
align="left">string</td><td align="left">
            Specify the type of Hardware Video Decoder. Currently only
-           <span class="emphasis"><em>vaapi</em></span>, <span 
class="emphasis"><em>omap</em></span>,
-           <span class="emphasis"><em>xv</em></span> or <span 
class="emphasis"><em>none</em></span> are
+           <span class="emphasis"><em>vaapi</em></span>
+           or <span class="emphasis"><em>none</em></span> are
            supported. None disables any acceleration support (the
            default).
          </td></tr><tr><td align="left">Renderer</td><td 
align="left">string</td><td align="left">
diff --git a/doc/C/usermanual/gnashrc.xml b/doc/C/usermanual/gnashrc.xml
index 2651e25..a14258f 100644
--- a/doc/C/usermanual/gnashrc.xml
+++ b/doc/C/usermanual/gnashrc.xml
@@ -300,8 +300,8 @@
          <entry>string</entry>
          <entry>
            Specify the type of Hardware Video Decoder. Currently only
-           <emphasis>vaapi</emphasis>, <emphasis>omap</emphasis>,
-           <emphasis>xv</emphasis> or <emphasis>none</emphasis> are
+           <emphasis>vaapi</emphasis>
+           or <emphasis>none</emphasis> are
            supported. None disables any acceleration support (the
            default).
          </entry>
diff --git a/gui/Player.h b/gui/Player.h
index 627e1c3..039a8b8 100644
--- a/gui/Player.h
+++ b/gui/Player.h
@@ -172,8 +172,8 @@ public:
     /// --renderer option to gnash.
     void setRenderer(const std::string& x) { _renderer = x; }
     
-    /// Set the hardware video accleration backend, none, vaapi, xv,
-    /// or cairo. This is set in the users gnashrc file, or can be
+    /// Set the hardware video accleration backend, none, vaapi.
+    /// This is set in the users gnashrc file, or can be
     /// overridden with the --hwaccel option to gnash.
     void setHWAccel(const std::string& x) { _hwaccel = x; }
 
@@ -204,8 +204,8 @@ public:
 private:
 
     /// Whether to ue HW video decoding support, no value means disabled.
-    /// The only currently supported values are: none, vaapi, or xv (omap)
-    /// support coming.  The default is none,
+    /// The only currently supported values are: none or vaapi.
+    /// The default is none,
     std::string _hwaccel;
     
     /// Which renderer backend to use, no value means use the default.
diff --git a/gui/gtk/gtk.cpp b/gui/gtk/gtk.cpp
index 5967332..da45af7 100644
--- a/gui/gtk/gtk.cpp
+++ b/gui/gtk/gtk.cpp
@@ -42,10 +42,6 @@
 # include <X11/keysym.h>
 # include <gdk/gdkx.h>
 # include <X11/Xlib.h>
-# ifdef HAVE_XV
-#  include <X11/extensions/Xv.h>
-#  include <X11/extensions/Xvlib.h>
-# endif
 #endif
 
 #include "log.h"
@@ -203,15 +199,6 @@ GtkGui::init(int argc, char **argv[])
         }
     }
 
-    // Gnash can only use the XVideo extension if our X server supports it.
-    if (hwaccel == "xv") {
-        // See if our X11 server supports the Xvideo extension, otherwise
-        // there is no point in trying to use Xvideo for scaling.
-        if (checkX11Extension("XVideo")) {
-            log_debug("Xvideo extension found");
-        }
-    }
-
     _canvas = gnash_canvas_new();
     gnash_canvas_setup(GNASH_CANVAS(_canvas), hwaccel, renderer, argc, argv);
     // Increase reference count to prevent its destruction (which could happen
diff --git a/gui/gtk/gtk_canvas.cpp b/gui/gtk/gtk_canvas.cpp
index 6dc2964..aeeae3a 100644
--- a/gui/gtk/gtk_canvas.cpp
+++ b/gui/gtk/gtk_canvas.cpp
@@ -202,7 +202,7 @@ gnash_canvas_setup(GnashCanvas *canvas, std::string& 
hwaccel,
         std::string& renderer, int argc, char **argv[])
 {
 
-    // Order should be VAAPI, Xv, X11
+    // Order should be VAAPI, X11
     bool initialized_renderer = false;
 
     // If a renderer hasn't been defined in gnashrc, or on the command
diff --git a/libbase/gnashrc.in b/libbase/gnashrc.in
index 87a7ddd..1c73c56 100644
--- a/libbase/gnashrc.in
+++ b/libbase/gnashrc.in
@@ -202,13 +202,6 @@
 # This is the shared memory key for your system
 #set LCShmKey 3711621821
 
-# Enable support for the X Video extension. Note that this requires a
-# kernel/X11 driver, and compile-time gstreamer or ffmpeg and libXv.
-#
-# Default: false
-#
-#set XVideo true
-
 # Force rendering quality to "BEST".
 #
 # Possible values:
diff --git a/libbase/rc.cpp b/libbase/rc.cpp
index 7058b09..ef79d6e 100644
--- a/libbase/rc.cpp
+++ b/libbase/rc.cpp
@@ -113,7 +113,6 @@ RcInitFile::RcInitFile()
     _saveStreamingMedia(false),
     _saveLoadedMedia(false),
     _popups(true),
-    _useXv(false),
     _webcamDevice(-1),
     _microphoneDevice(-1),
     _certfile("client.pem"),
diff --git a/libbase/rc.h b/libbase/rc.h
index 188f50d..89769fd 100644
--- a/libbase/rc.h
+++ b/libbase/rc.h
@@ -579,8 +579,6 @@ protected:
 
     bool _popups;
 
-    bool _useXv;
-       
     ///FIXME: this should probably eventually be changed to a more readable
     ///config option instead of an integer
     int _webcamDevice;
@@ -604,7 +602,7 @@ protected:
     bool _ignoreShowMenu;
 
     /// Whether to use HW video decoding support, no value means disabled.
-    /// The only currently supported values are: none, vaapi, or xv.  omap
+    /// The only currently supported values are: none or vaapi
     /// support is coming. 
     std::string _hwaccel;
 
diff --git a/libcore/RunResources.h b/libcore/RunResources.h
index 1334ef1..1c16cf3 100644
--- a/libcore/RunResources.h
+++ b/libcore/RunResources.h
@@ -125,8 +125,8 @@ public:
     void setRenderBackend(const std::string& x) { _renderer_backend = x; }
     std::string& getRenderBackend() { return _renderer_backend; }
 
-    /// Set the hardware video accleration backend, none, vaapi, xv,
-    /// or cairo. This is set in the users gnashrc file, or can be
+    /// Set the hardware video accleration backend, none or vaapi.
+    /// This is set in the users gnashrc file, or can be
     /// overridden with the --render-mode option to gnash.
     std::string& getHWAccelBackend() { return _hwaccel_backend; }
     void setHWAccelBackend(const std::string& x) { _hwaccel_backend = x; }
@@ -144,17 +144,15 @@ private:
 
     boost::shared_ptr<const SWF::TagLoadersTable> _tagLoaders;
 
-#if 1
     /// Whether to ue HW video decoding support, no value means disabled.
-    /// The only currently supported values are: none, vaapi, or xv (omap)
-    /// support coming.  The default is none,
+    /// The only currently supported values are: none or vaapi.
+    /// The default is none,
     std::string _hwaccel_backend;
 
     /// Which renderer backend to use, no value means use the default.
     /// The currently supported values are agg, opengl, or cairo. AGG
     /// being the default.
     std::string _renderer_backend;
-#endif    
 };
 
 } // end of gnash namespace
diff --git a/macros/x11.m4 b/macros/x11.m4
index 8125f01..7709ebc 100644
--- a/macros/x11.m4
+++ b/macros/x11.m4
@@ -45,14 +45,6 @@ AC_DEFUN([GNASH_PATH_X11],
     done
   fi
 
-  dnl We want to know whether the headers for XShm exist.
-  if test x"${ac_cv_path_x11_incl}" != x ; then
-    includedirfound=`echo "${ac_cv_path_x11_incl}" | cut -b 3-`
-    if test -f "$includedirfound/X11/extensions/Xv.h"; then
-      xv_incl=yes
-    fi
-  fi
-
   AC_MSG_CHECKING([for X11 headers])
   if test x"${ac_cv_path_x11_incl}" != x ; then
     dnl Don't pass -I/usr/include
@@ -101,10 +93,6 @@ AC_DEFUN([GNASH_PATH_X11],
         if test -f $i/libICE.a -o -f $i/libICE.${shlibext}; then
           ac_cv_path_x11_lib="${ac_cv_path_x11_lib} -lICE"
         fi
-        if test -f $i/libXv.a -o -f $i/libXv.${shlibext}; then
-          ac_cv_path_x11_lib="${ac_cv_path_x11_lib} -lXv"
-          xv_lib=yes
-        fi
         break
       fi
     done
@@ -138,11 +126,6 @@ AC_DEFUN([GNASH_PATH_X11],
   if test "x$has_x11" = xyes; then
     AC_DEFINE(HAVE_X11, [1], [X11 headers and libraries])
   fi
-  
-  if test x"$xv_incl" != x -a x"$xv_lib" != x; then
-    AC_DEFINE(HAVE_XV, [1], [X Video extension header and library])
-  fi
-  AM_CONDITIONAL(HAVE_XV, [ test x"$xv_incl" != x -a x"$xv_lib" != x ])
 
   AC_SUBST(X11_CFLAGS)
   AC_SUBST(X11_LIBS)

-----------------------------------------------------------------------

Summary of changes:
 doc/C/gnash.man-xml                  |    4 ++--
 doc/C/preformatted/gnash.1.in        |    4 ++--
 doc/C/preformatted/gnashuser.html.in |    4 ++--
 doc/C/usermanual/gnashrc.xml         |    4 ++--
 gui/Player.h                         |    8 ++++----
 gui/gtk/gtk.cpp                      |   13 -------------
 gui/gtk/gtk_canvas.cpp               |    2 +-
 libbase/gnashrc.in                   |    7 -------
 libbase/rc.cpp                       |    1 -
 libbase/rc.h                         |    4 +---
 libcore/RunResources.h               |   10 ++++------
 macros/x11.m4                        |   17 -----------------
 12 files changed, 18 insertions(+), 60 deletions(-)


hooks/post-receive
-- 
Gnash