[ekiga/ds-clutter] Video: Dropped old XV, X11 and DX complex code.

[Damien Sandras <dsandras src gnome org>]

commit c57dfcb125df7d393877c9ecd1a06af810c69a6b
Author: Damien Sandras <dsandras beip be>
Date:   Mon Dec 30 13:57:22 2013 +0100

    Video: Dropped old XV, X11 and DX complex code.
    
    This is now replaced by simpler GStreamer/Clutter code.

 configure.ac                                       |   45 -
 lib/Makefile.am                                    |   57 -
 .../videooutput-manager-common.cpp                 |  470 --------
 .../videooutput-manager-common.h                   |  293 -----
 .../dx-videooutput/videooutput-main-dx.cpp         |   59 -
 .../dx-videooutput/videooutput-main-dx.h           |   47 -
 .../dx-videooutput/videooutput-manager-dx.cpp      |  352 ------
 .../dx-videooutput/videooutput-manager-dx.h        |  107 --
 .../x-videooutput/videooutput-main-x.cpp           |   59 -
 .../components/x-videooutput/videooutput-main-x.h  |   47 -
 .../x-videooutput/videooutput-manager-x.cpp        |  617 ----------
 .../x-videooutput/videooutput-manager-x.h          |  133 ---
 lib/engine/engine.cpp                              |    8 -
 lib/gui/dxwindow.cpp                               | 1178 --------------------
 lib/gui/dxwindow.h                                 |  294 -----
 src/Makefile.am                                    |   14 -
 16 files changed, 0 insertions(+), 3780 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7cd4a00..4fbc6e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -399,51 +399,6 @@ fi],enable_shm=yes)
 fi
 AM_CONDITIONAL(HAVE_SHM, test "x$SHM" = "xenabled")
 
-dnl ###############################
-dnl Checks for Xv extension
-dnl ###############################
-XV="disabled"
-AC_ARG_ENABLE(xv, AS_HELP_STRING([--disable-xv],[enable XVideo hardware acceleration (default is enabled)]),
-[if test "x$enableval" = "xyes"; then
-  enable_xv=yes
-fi],enable_xv=yes)
-if test "x${gm_platform}" != "xmingw" -a "x$enable_xv" = "xyes"; then
-  PKG_CHECK_MODULES([XV], [xv],
-                    [AC_DEFINE(HAVE_XV,1,[XVideo support])
-                     XV="enabled"
-                    ])
-  AC_SUBST(XV_CFLAGS)
-  AC_SUBST(XV_LIBS)
-fi
-
-AM_CONDITIONAL(HAVE_XV, test "x$XV" = "xenabled")
-
-
-dnl ###########################################################################
-dnl Checks for DX extension
-dnl ###########################################################################
-DX="disabled"
-
-if test "x${gm_platform}" = "xmingw" ; then
-  AC_ARG_WITH(directx-dir, AS_HELP_STRING([--with-directx-dir=PFX],[location of DirectDraw]), 
with_directx_dir="$withval", with_directx_dir=".")
-
-  dnl Check for the includes presence
-  AC_MSG_CHECKING(for DirectX includes in ${with_directx_dir})
-  AC_MSG_RESULT()
-  if test -d ${with_directx_dir}; then
-    DX_CFLAGS="-I${with_directx_dir}"
-    DX_LIBS="$EKIGA_LIBS -lddraw"
-    AC_SUBST(DX_LIBS)
-    AC_SUBST(DX_CFLAGS)
-    DX="enabled"
-    AC_DEFINE(HAVE_DX,1,[DirectDraw support])
-  else
-    AC_MSG_ERROR([Unable to locate DirectX header files; --with-directx-dir is obligatory])
-  fi
-fi
-
-AM_CONDITIONAL(HAVE_DX, test "x$DX" = "xenabled")
-
 
 dnl ###############################
 dnl   DBUS Support
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 8262057..7e90887 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -37,8 +37,6 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/lib/engine/videoinput \
        -I$(top_srcdir)/lib/engine/videooutput \
        -I$(top_srcdir)/lib/engine/components/call-history \
-       -I$(top_srcdir)/lib/engine/components/common-videooutput \
-       -I$(top_srcdir)/lib/engine/components/dx-videooutput \
        -I$(top_srcdir)/lib/engine/components/echo \
        -I$(top_srcdir)/lib/engine/components/gmconf-personal-details \
        -I$(top_srcdir)/lib/engine/components/hal-dbus \
@@ -158,21 +156,6 @@ libekiga_la_SOURCES +=     \
        gui/xwindow.h
 endif
 
-if HAVE_XV
-libekiga_la_SOURCES += \
-       gui/xvwindow.cpp                \
-       gui/xvwindow.h
-
-libekiga_la_LDFLAGS += $(XV_LIBS)
-
-endif
-
-if HAVE_DX
-libekiga_la_SOURCES += \
-       gui/dxwindow.cpp                \
-       gui/dxwindow.h
-endif
-
 ##
 # Sources of the main engine code
 ##
@@ -628,46 +611,6 @@ libekiga_la_LDFLAGS += $(SHM_LIBS)
 endif
 
 ##
-# Common files for several video output components
-##
-
-libekiga_la_SOURCES += \
-       engine/components/common-videooutput/videooutput-manager-common.cpp \
-       engine/components/common-videooutput/videooutput-manager-common.h
-
-##
-# Sources of the X video output component
-##
-
-if !WIN32
-
-AM_CPPFLAGS += \
-       -I$(top_srcdir)/lib/engine/components/x-videooutput
-
-libekiga_la_SOURCES += \
-       engine/components/x-videooutput/videooutput-manager-x.cpp \
-       engine/components/x-videooutput/videooutput-manager-x.h \
-       engine/components/x-videooutput/videooutput-main-x.cpp \
-       engine/components/x-videooutput/videooutput-main-x.h
-
-endif
-
-##
-# Sources of the Direct X video output component
-##
-
-if HAVE_DX
-
-libekiga_la_SOURCES += \
-       engine/components/dx-videooutput/videooutput-manager-dx.cpp \
-       engine/components/dx-videooutput/videooutput-manager-dx.h \
-       engine/components/dx-videooutput/videooutput-main-dx.cpp \
-       engine/components/dx-videooutput/videooutput-main-dx.h
-
-libekiga_la_LDFLAGS += $(DX_LIBS)
-endif
-
-##
 # Sources of the Clutter video output component
 ##
 
diff --git a/lib/engine/engine.cpp b/lib/engine/engine.cpp
index f79fdb1..43487e4 100644
--- a/lib/engine/engine.cpp
+++ b/lib/engine/engine.cpp
@@ -62,14 +62,6 @@
 #include "gtk-frontend.h"
 #include "gmconf-personal-details.h"
 
-#ifndef WIN32
-#include "videooutput-main-x.h"
-#endif
-
-#ifdef HAVE_DX
-#include "videooutput-main-dx.h"
-#endif
-
 #include "videooutput-main-clutter-gst.h"
 
 #include "videoinput-main-mlogo.h"
diff --git a/src/Makefile.am b/src/Makefile.am
index 0a135b4..6bee24d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,20 +30,6 @@ AM_CPPFLAGS = \
 
 BUILT_SOURCES = src/revision.h
 
-# XVideo/X
-if !WIN32
-AM_CPPFLAGS +=                                                 \
-       -I$(top_srcdir)/lib/engine/videooutput/common   \
-       -I$(top_srcdir)/lib/engine/videooutput/x
-endif
-
-# DirectX
-if HAVE_DX
-AM_CPPFLAGS +=                                                 \
-       -I$(top_srcdir)/lib/engine/videooutput/common   \
-       -I$(top_srcdir)/lib/engine/videooutput/dx
-endif
-
 bin_SCRIPTS = ekiga-config-tool
 bin_PROGRAMS = ekiga