[totem] backend: Remove XVidMode support
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem] backend: Remove XVidMode support
- Date: Mon, 4 Apr 2011 16:27:52 +0000 (UTC)
commit 399549e66a4961d7287c08a01b2f6b837c8f5fbe
Author: Bastien Nocera <hadess hadess net>
Date: Sun Apr 3 04:42:41 2011 +0100
backend: Remove XVidMode support
Nobody in their right mind would use that anymore.
https://bugzilla.gnome.org/show_bug.cgi?id=637937
configure.in | 13 -
src/backend/Makefile.am | 1 -
src/backend/bacon-resize.c | 350 -----------------------------
src/backend/bacon-resize.h | 55 -----
src/backend/bacon-video-widget-gst-0.10.c | 36 ---
5 files changed, 0 insertions(+), 455 deletions(-)
---
diff --git a/configure.in b/configure.in
index a3096b3..a5b9363 100644
--- a/configure.in
+++ b/configure.in
@@ -242,13 +242,6 @@ if test x$(pkg-config --variable=targets gtk+-3.0) = xx11; then
$X_LIBRARIES)
AC_SUBST(XTEST_LIBS)
- PKG_CHECK_MODULES(XVIDMODE, xrandr >= 1.1.1 xxf86vm >= 1.0.1,
- have_xvidmode=yes, have_xvidmode=no)
-
- if test x$have_xvidmode = xyes; then
- AC_DEFINE(HAVE_XVIDMODE,, [Define this if you have the XVidMode and XRandR extension installed])
- fi
-
X_LIBS=""
dnl Explicitely link against libX11 to avoid problems with crappy linkers
@@ -271,7 +264,6 @@ if test x$(pkg-config --variable=targets gtk+-3.0) = xx11; then
AC_DEFINE(HAVE_XFREE, 1, [defined if you have X11/XF86keysym.h])
fi
fi
-AM_CONDITIONAL(HAVE_XVIDMODE, [test x$have_xvidmode = xyes])
dnl ================================================================
dnl Plugins support
@@ -899,11 +891,6 @@ if test x$enable_dbus = xyes ; then
else
AC_MSG_NOTICE([ D-Bus (gnome-screensaver) support disabled])
fi
-if test x$have_xvidmode = xyes ; then
- AC_MSG_NOTICE([** XVidmode support enabled])
-else
- AC_MSG_NOTICE([ XVidmode support disabled])
-fi
if test x$have_xfree = xyes ; then
AC_MSG_NOTICE([** XFree86 multimedia keys support enabled])
else
diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am
index 9150136..c3a5b70 100644
--- a/src/backend/Makefile.am
+++ b/src/backend/Makefile.am
@@ -52,7 +52,6 @@ libbaconvideowidget_la_SOURCES = \
$(BVW_MARSHAL_FILES) \
$(BVW_ENUM_FILES) \
bacon-video-widget.h \
- bacon-resize.h bacon-resize.c \
video-utils.c video-utils.h \
bacon-video-widget-gst-0.10.c \
bacon-video-widget-gst-missing-plugins.c \
diff --git a/src/backend/bacon-video-widget-gst-0.10.c b/src/backend/bacon-video-widget-gst-0.10.c
index 59d8645..f8d125e 100644
--- a/src/backend/bacon-video-widget-gst-0.10.c
+++ b/src/backend/bacon-video-widget-gst-0.10.c
@@ -85,7 +85,6 @@
#include "bacon-video-widget-enums.h"
#include "video-utils.h"
#include "gstscreenshot.h"
-#include "bacon-resize.h"
#define DEFAULT_USER_AGENT "Totem/"VERSION
@@ -286,9 +285,6 @@ struct BaconVideoWidgetPrivate
/* for stepping */
float rate;
-
- /* Bacon resize */
- BaconResize *bacon_resize;
};
static void bacon_video_widget_set_property (GObject * object,
@@ -621,18 +617,6 @@ bacon_video_widget_realize (GtkWidget * widget)
gtk_window_set_geometry_hints (GTK_WINDOW (toplevel), widget, NULL, 0);
bacon_video_widget_gst_missing_plugins_setup (bvw);
-
- bvw->priv->bacon_resize = bacon_resize_new (widget);
-}
-
-static void
-bacon_video_widget_unrealize (GtkWidget *widget)
-{
- BaconVideoWidget *bvw = BACON_VIDEO_WIDGET (widget);
-
- g_object_unref (bvw->priv->bacon_resize);
-
- GTK_WIDGET_CLASS (parent_class)->unrealize (widget);
}
static void
@@ -796,7 +780,6 @@ bacon_video_widget_class_init (BaconVideoWidgetClass * klass)
widget_class->get_preferred_width = bacon_video_widget_get_preferred_width;
widget_class->get_preferred_height = bacon_video_widget_get_preferred_height;
widget_class->realize = bacon_video_widget_realize;
- widget_class->unrealize = bacon_video_widget_unrealize;
widget_class->motion_notify_event = bacon_video_widget_motion_notify;
widget_class->button_press_event = bacon_video_widget_button_press;
widget_class->button_release_event = bacon_video_widget_button_release;
@@ -4495,34 +4478,15 @@ bacon_video_widget_get_volume (BaconVideoWidget * bvw)
* @fullscreen: %TRUE to go fullscreen, %FALSE otherwise
*
* Sets whether the widget renders the stream in fullscreen mode.
- *
- * Fullscreen rendering is done only when possible, as xvidmode is required.
**/
void
bacon_video_widget_set_fullscreen (BaconVideoWidget * bvw,
gboolean fullscreen)
{
- gboolean have_xvidmode;
-
g_return_if_fail (bvw != NULL);
g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
- g_object_get (G_OBJECT (bvw->priv->bacon_resize),
- "have-xvidmode", &have_xvidmode,
- NULL);
-
- if (have_xvidmode == FALSE)
- return;
-
bvw->priv->fullscreen_mode = fullscreen;
-
- if (fullscreen == FALSE)
- {
- bacon_resize_restore (bvw->priv->bacon_resize);
- /* Turn fullscreen on when we have xvidmode */
- } else if (have_xvidmode != FALSE) {
- bacon_resize_resize (bvw->priv->bacon_resize);
- }
}
/**
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]