[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. 7bfb0466cb6e0c248968
|
From: |
Benjamin Wolsey |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. 7bfb0466cb6e0c24896815d840c8abb27327e888 |
|
Date: |
Wed, 13 Oct 2010 10:59:01 +0000 |
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 7bfb0466cb6e0c24896815d840c8abb27327e888 (commit)
via 311f17b49f65986ac759f8bd578b9c4846f4999d (commit)
via 6abf4a79cb86c3f0a98a9165b685961ddc68717b (commit)
from d1dda483291873cbb2f89f9077ebaea66f55b734 (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=7bfb0466cb6e0c24896815d840c8abb27327e888
commit 7bfb0466cb6e0c24896815d840c8abb27327e888
Merge: d1dda48 311f17b
Author: Benjamin Wolsey <address@hidden>
Date: Wed Oct 13 12:11:43 2010 +0200
Merge branch 'guis'
http://git.savannah.gnu.org/cgit//commit/?id=311f17b49f65986ac759f8bd578b9c4846f4999d
commit 311f17b49f65986ac759f8bd578b9c4846f4999d
Author: Benjamin Wolsey <address@hidden>
Date: Wed Oct 13 10:19:59 2010 +0200
Drop XV, hildon, and ALP
diff --git a/Makefile.am b/Makefile.am
index 27bddea..7a5aa31 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -316,14 +316,6 @@ if BUILD_GTK_GUI
@echo " ATK_CFLAGS is $(ATK_CFLAGS)"
@echo " ATK_LIBS is $(ATK_LIBS)"
endif
-if BUILD_HILDON_GUI
- @echo " HILDON_CFLAGS is $(HILDON_CFLAGS)"
- @echo " HILDON_LIBS is $(HILDON_LIBS)"
-endif
-if BUILD_ALP_GUI
- @echo " ALP_CFLAGS is $(ALP_CFLAGS)"
- @echo " ALP_LIBS is $(ALP_LIBS)"
-endif
@echo " X11_CFLAGS is $(X11_CFLAGS)"
@echo " X11_LIBS is $(X11_LIBS)"
@echo "Support libraries..."
@@ -425,15 +417,9 @@ else
@echo " Supported GUI: GTK"
endif
endif
-if BUILD_HILDON_GUI
- @echo " Supported GUI: HILDON"
-endif
if BUILD_DUMP_GUI
@echo " Supported GUI: Dump"
endif
-if BUILD_ALP_GUI
- @echo " Supported GUI: ALP/Hiker"
-endif
if BUILD_KDE3_GUI
@echo " Supported GUI: KDE3"
endif
diff --git a/configure.ac b/configure.ac
index 58c7270..6a014c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -634,15 +634,6 @@ AC_ARG_ENABLE(gui,
while test -n "${enableval}" ; do
val=`echo ${enableval} | cut -d ' ' -f 1`
case "${val}" in
- hildon|HILDON|hildon2|HILDON2)
- build_hildon=yes
- AC_DEFINE(USE_HILDON, [1], [Use the Hildon mobile framework])
- build_gtk=yes
- ;;
- alp|ALP|alp|ALP)
- build_alp=yes
- build_gtk=yes
- ;;
gtk|GTK|gtk2|GTK2)
build_gtk=yes
;;
@@ -702,7 +693,7 @@ AC_ARG_ENABLE(gui,
build_qt4=yes
build_sdl=yes
;;
- *) AC_MSG_ERROR([invalid gui ${enableval} given (accept:
gtk|kde3|kde4|fltk|sdl|riscos|aqua|fb|hildon|alp|qtopia3|qtopia4|dump|aos4|haiku)])
+ *) AC_MSG_ERROR([invalid gui ${enableval} given (accept:
gtk|kde3|kde4|fltk|sdl|riscos|aqua|fb|qtopia3|qtopia4|dump|aos4|haiku)])
;;
esac
enableval=`echo ${enableval} | cut -d ' ' -f 2-6`
@@ -1119,15 +1110,14 @@ dnl NOTE: it is possible to use Gnash/VAAPI on
platforms with an Intel
dnl GMA500 but you currently will have to build the AGG renderer
dnl instead of the OGL (OpenGL) one.
-build_xv=yes
build_vaapi=yes
-hwaccel_list="VAAPI XVideo"
-nhwaccel=2
+hwaccel_list="VAAPI"
+nhwaccel=1
AC_ARG_ENABLE(hwaccel,
AC_HELP_STRING([--enable-hwaccel], [Specify which accleration to support to
enable (none,vaapi,omap)]),
if test -z ${enableval}; then
hwaccel_list="none"
- nhwaccel=1
+ nhwaccel=0
enableval=""
fi
while test -n "${enableval}" ; do
@@ -1137,7 +1127,6 @@ AC_ARG_ENABLE(hwaccel,
hwaccel_list="none"
build_vaapi=no
build_omap=no
- dnl build_xv=no
nhwaccel=0
;;
va*|VA*)
@@ -1145,17 +1134,11 @@ AC_ARG_ENABLE(hwaccel,
build_vaapi=yes
nhwaccel=$((nhwaccel+1))
;;
- xv*|XV*|Xv*)
- hwaccel_list="${hwaccel_list} XVideo"
- dnl build_xv=yes
- nhwaccel=$((nhwaccel+1))
- ;;
all|ALL)
- hwaccel_list="XVideo VAAPI OMAP"
- nhwaccel=3
+ hwaccel_list="VAAPI OMAP"
+ nhwaccel=2
build_omap=yes
build_vaapi=yes
- dnl build_xv=yes
;;
omap*|OMAP*)
hwaccel_list="${hwaccel_list} omap"
@@ -1216,12 +1199,12 @@ dnl Only build the vaapi support if we have a version
of FFmpeg that
dnl supports it.
if test x"${have_ffmpeg_vaapi}" = x"yes" -a x"${found_libva_incl}" = xyes; then
build_vaapi=yes
- hwaccel_list="VAAPI XVideo"
- nhwaccel=2
+ hwaccel_list="VAAPI"
+ nhwaccel=1
else
build_vaapi=no
- hwaccel_list="XVideo"
- nhwaccel=1
+ hwaccel_list=""
+ nhwaccel=0
fi
dnl Until the hwaccel patches in FFmpeg wind up in the ffmpeg-plugin,
@@ -1757,23 +1740,8 @@ sbox=no
if test x"${SBOX_REDIRECT_FROM_DIRS}" != x; then
sbox=yes
fi
-if test x"${build_alp}" = xyes; then
- GNASH_PATH_ALP
- if test x"${have_alp}" = x"yes"; then
- AC_DEFINE([HAVE_ALP], 1, [Access Linux Platform framework])
- fi
- dnl @@ It makes NO sense to set cross_compiling here,
- dnl @@ *after* it is used in conditionals above
- dnl @@ (AM_CONDITIONAL and directories search)
- dnl cross_compiling=yes
-dnl build_gtk=yes
- build_kde3=no
- build_ogl=no
- build_gles=no
- build_agg=yes
-fi
-if test x$build_gtk = xyes -o $build_alp = xyes -o x$build_hildon = xyes; then
+if test x$build_gtk = xyes -o $build_alp = xyes; then
GNASH_PATH_GTK2
GNASH_PATH_PANGO
GNASH_PKG_FIND(atk, [atk/atk.h], [atk library], atk_focus_tracker_init,
[1.0])
@@ -1784,13 +1752,6 @@ if test x$build_gtk = xyes -o $build_alp = xyes -o
x$build_hildon = xyes; then
GNASH_PKG_FIND(cairo, [cairo.h], [cairo render library], cairo_status)
fi
fi
-if test x"${build_hildon}" = xyes; then
- GNASH_PATH_HILDON
- build_gtk=yes
- build_kde3=no
-dnl build_ogl=no
-dnl build_agg=yes
-fi
dnl TODO: add checks for all other GUIs
@@ -2399,8 +2360,6 @@ AM_CONDITIONAL(BUILD_QT4_GUI, [ test x$build_qt4 =
xyes ])
AM_CONDITIONAL(BUILD_KDE3_GUI, [ test x$build_kde3 = xyes ])
AM_CONDITIONAL(BUILD_KDE4_GUI, [ test x$build_kde4 = xyes ])
-AM_CONDITIONAL(BUILD_ALP_GUI, [ test x$build_alp = xyes ])
-AM_CONDITIONAL(BUILD_HILDON_GUI, [ test x$build_hildon = xyes ])
AM_CONDITIONAL(BUILD_GTK_GUI, [ test x$build_gtk = xyes ])
AM_CONDITIONAL(BUILD_FLTK_GUI, [ test x$build_fltk = xyes ])
AM_CONDITIONAL(BUILD_SDL_GUI, [ test x$build_sdl = xyes ])
@@ -3206,23 +3165,6 @@ if test x$build_gtk = xyes -a x$build_ogl = xyes ; then
fi
-if test x$build_hildon = xyes; then #{
- if test x"$HILDON_LIBS" != x; then
- if test x"$HILDON_CFLAGS" != x; then
- echo " HILDON flags are: $HILDON_CFLAGS"
- else
- echo " HILDON flags are: default include path"
- fi
- echo " HILDON libs are: $HILDON_LIBS"
- else
- echo " ERROR: No HILDON development package installed!" >&3
- echo " Install it from http://gtk.org"; >&3
- #echo " or .deb users: apt-get install libhildon.0-dev" >&3
- echo " or .deb users: apt-get install libhildon-1-dev" >&3
- echo " or .rpm users: yum install hildon-devel" >&3
- fi
-fi
-
if test x$build_gtk = xyes; then #{
if test x"$GTK2_LIBS" != x; then
if test x"$GTK2_CFLAGS" != x; then
@@ -3813,16 +3755,6 @@ else
echo " or .rpm users: yum install dejagnu" >&4
fi
-dnl Access Linux Platform
-if test x"${build_alp}" = xyes; then
- if test x"${ALP_CFLAGS}" != x; then
- echo " ALP flags are: $ALP_CFLAGS"
- echo " ALP libs are: $ALP_LIBS"
- else
- echo " ERROR: No ALP development package is installed." >&3
- fi
-fi
-
dnl Haiku
if test x"${build_haiku}" = xyes -o x"${build_sound_mkit}" = xyes -o
x"${build_media_haiku}" = x"yes"; then
echo " Haiku libs are: $HAIKU_LIBS"
diff --git a/extensions/launcher/Makefile.am b/extensions/launcher/Makefile.am
index 6ff4da4..21de2d8 100644
--- a/extensions/launcher/Makefile.am
+++ b/extensions/launcher/Makefile.am
@@ -57,14 +57,6 @@ if BUILD_GTK_GUI
PROGS += gui/.libs/gtk-gnash
endif
-if BUILD_HILDON_GUI
-PROGS += gui/.libs/hildon-gnash
-endif
-
-if BUILD_ALP_GUI
-PROGS += gui/.libs/alp-gnash
-endif
-
if BUILD_KDE_GUI
PROGS += gui/.libs/kde-gnash
endif
diff --git a/extensions/launcher/launcher.cpp b/extensions/launcher/launcher.cpp
index dce7140..e993c23 100644
--- a/extensions/launcher/launcher.cpp
+++ b/extensions/launcher/launcher.cpp
@@ -33,14 +33,6 @@
#include "gtk_gnash.h"
#endif
-#ifdef USE_HILDON
-#include "hildon_gnash.h"
-#endif
-
-#ifdef USE_ALP
-#include "alp_gnash.h"
-#endif
-
#ifdef USE_KDE
#include "kde_gnash.h"
#endif
diff --git a/gui/Makefile.am b/gui/Makefile.am
index 2922c4d..dd79c73 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -292,21 +292,6 @@ if BUILD_GTK_GUI
include $(srcdir)/gtk/gtk.am
endif
-# if ALP # Access Linux Platform
-# gtk_gnash_LDFLAGS += "-shared -Xlinker -z -Xlinker defs $(GTK2_LIBS)"
-# gtk_gnash_LDADD += $(ALP_LIBS)
-# endif
-#
-# Build the GTK/ALP gui
-if BUILD_ALP_GUI
-include $(srcdir)/am-frag/alp.am
-endif
-
-# Build the GTK/HILDON gui
-if BUILD_HILDON_GUI
-include $(srcdir)/am-frag/hildon.am
-endif
-
# Build the DUMP gui
if BUILD_DUMP_GUI
include $(srcdir)/am-frag/dump.am
diff --git a/gui/Player.cpp b/gui/Player.cpp
index e55ef38..d8539ec 100644
--- a/gui/Player.cpp
+++ b/gui/Player.cpp
@@ -322,7 +322,7 @@ Player::run(int argc, char* argv[], const std::string&
infile,
_runResources->setStreamProvider(sp);
- // Set the Hardware video decoding resources. none, vaapi, xv, omap
+ // Set the Hardware video decoding resources. none, vaapi, omap
_runResources->setHWAccelBackend(_hwaccel);
// Set the Renderer resource, opengl, agg, or cairo
_runResources->setRenderBackend(_renderer);
diff --git a/gui/am-frag/alp.am b/gui/am-frag/alp.am
deleted file mode 100644
index 4e68093..0000000
--- a/gui/am-frag/alp.am
+++ /dev/null
@@ -1,205 +0,0 @@
-#
-# Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
-
-# if ALP # Access Linux Platform
-# gtk_gnash_LDFLAGS += "-shared -Xlinker -z -Xlinker defs $(GTK2_LIBS)"
-# gtk_gnash_LDADD += $(ALP_LIBS)
-# endif
-#
-# Build the GTK/ALP gui
-#
-
-if BUILD_ALP_GUI
-pkglib_LTLIBRARIES = libgnashalp.la
-libgnashalp_la_SOURCES = $(GUI_SRCS) gtk/gui_gtk.cpp
-libgnashalp_la_CPPFLAGS = $(gtk_gnash_CPPFLAGS)\
- $(ALP_CFLAGS) -DGUI_ALP -DGUI_CONFIG=\"ALP\" \
- -DALP_BUILD=ALP_BUILD_DEBUG
-libgnashalp_la_LDFLAGS = -module -avoid-version
-libgnashalp_la_LIBADD = $(gtk_gnash_LDADD) $(ALP_LIBS)
-if BUILD_OGL_RENDERER
-libgnashalp_la_CPPFLAGS += $(OPENGL_CFLAGS)
-libgnashalp_la_SOURCES += gtk/gtk_glue_gtkglext.cpp gtk/gtk_glue_gtkglext.h \
- gtk/gtk.cpp gtk/gtksup.h gtk/gtk_glue.h
-libgnashalp_la_LIBADD += $(OPENGL_LIBS)
-endif # BUILD_OGL_RENDERER
-if BUILD_AGG_RENDERER
-libgnashalp_la_CPPFLAGS += $(AGG_CFLAGS)
-libgnashalp_la_SOURCES += gtk/gtk_glue_agg.cpp gtk/gtk_glue_agg.h \
- gtk/gtk.cpp gtk/gtksup.h gtk/gtk_glue.h
-libgnashalp_la_LIBADD += $(AGG_LIBS)
-endif # BUILD_AGG_RENDERER
-if BUILD_CAIRO_RENDERER
-libgnashalp_la_CPPFLAGS += $(CAIRO_CFLAGS)
-libgnashalp_la_SOURCES += gtk/gtk_glue_cairo.cpp gtk/gtk_glue_cairo.h \
- gtk/gtk.cpp gtk/gtksup.h gtk/gtk_glue.h
-libgnashalp_la_LIBADD += $(CAIRO_LIBS)
-endif # BUILD_CAIRO_RENDERER
-
-# networking related info
-# NETCAT_REMOTE = netcat -q 10 `cat /tmp/alp.ip` 5038
-# NETCAT_REMOTE_Q = netcat -q 8 `cat /tmp/alp.ip` 5038
-# UML_IP = 192.168.3.101
-# REMOTE_IP = 192.168.1.101
-# ALP_NAMESPACE = org.gnu.gnash
-# ALP_BUNDLE_DIR = /opt/alp/bundles/
-
-# ALP_SECURITY - For building signed bundles you need to set this
-# variable to 1. The default is set to 0
-ALP_SECURITY = 0
-
-# CERTIFICATE and KEY - Specify the certificate and key files for signing.
-# The default is to look for files 'certificate' and 'key' in
-# the local dir then search up through the parent dirs
-CERTIFICATE = certificate
-KEY = key
-PASS = accesstest
-
-# where does built stuff go?
-BUILD_DIR := build/$(SBOX)
-# Bundle names
-# where to construct bundle hierarchy (e.g. obj/sbox/com.foo.apps.name)
-SRC_BND_DIR := $(BUILD_DIR)/$(BND_NAME)
-# Extract the bundle name directly from the Manifest file.
-BND_NAMES := gnash
-BND_NAME := $(word 1, $(BND_NAMES))
-TARGET_NAME := $(word 2, $(BND_NAMES))
-
-# install location for bundle hierarchy (for install/install-files targets)
-# Check to see if there is a "bundles" directory. If there is,
-# use it. Otherwise, revert to using the "packages" directory.
-DEST_BND_ROOT := /opt/alp/bundles
-DEST_BND_DIR := $(DEST_BND_ROOT)/$(BND_NAME)
-
-# Bar files
-# (if BAR_DIR not defined, assume bar files go in build/sbox)
-# (BAR_DIR may need to be created so we can't rely solely on BAR_TARGET)
-# (may be defined by build-all Makefile to collect .bar files in one place)
-BAR_NAME = $(BND_NAME).bar
-BAR_TARGET = $(BUILD_DIR)/$(BAR_NAME)
-BAR_DIR = $(BAR_DIR)/$(SBOX)
-
-# i486 means UML target, else assume REMOTE_IP refers to ARM
-# Sign the bundle
-#ifeq ($(ALP_SECURITY),1)
-$(SIGN_TARGET): $(CERTIFICATE) $(KEY)
- @echo [$(TARGET_NAME)] Sign $@
- $(DO_ECHO)$(SIGN) $(SRC_BND_DIR) $^ $(PASS) $(TARGET_NAME)
-#endif
-
-# alp-ip:
-# if test ! -f /tmp/alp.ip; then \
-# if test "`uname -m`" = "i486" -a "`uname -m`" = "i686" ; then \
-# echo "$(UML_IP)" | cut -d ' ' -f1 > /tmp/alp.ip ; \
-# else \
-# echo "$(REMOTE_IP)" | cut -d ' ' -f1 > /tmp/alp.ip ; \
-# fi ; \
-# fi
-
-# alp-bundle: libgnashalp.la
-# $(mkinstalldirs) $(ALP_NAMESPACE)/rsc
-# echo $(srcdir)/Manifest.xml $(ALP_NAMESPACE)/
-# cp -f $(srcdir)/Manifest.xml $(ALP_NAMESPACE)/
-# @if test -f libgnash.so; then \
-# cp -vf libgnashalp.so $(ALP_NAMESPACE)/; \
-# else \
-# cp -vf .libs/libgnashalp.so $(ALP_NAMESPACE)/; \
-# fi
-# cp -f $(top_srcdir)/gui/images/GnashGTiny.png $(ALP_NAMESPACE)/rsc/
-# cp -f $(top_srcdir)/gui/images/gravity.swf $(ALP_NAMESPACE)/rsc/
-
-# bar: alp-bundle # signed $(BUNDLE_TARGETS) $(SIGN_TARGET)
-# $(BARTENDER) pack $(ALP_NAMESPACE) $(ALP_NAMESPACE).bar
-# # cp $(BAR_TARGET) $(BAR_DIR)
-
-# # install-alp: alp-ip alp-bundle install-files
-# # echo "I think I'm installing"
-# # (echo "install $(ALP_NAMESPACE).hello.bar `ls -la
$(ALP_NAMESPACE).hello.bar | cut -d ' ' -f 6,6` 0 0 0755" ; cat
$(ALP_NAMESPACE).bar ) | $(NETCAT_REMOTE)
-# # @echo; echo "Registering new bar file with target..."
-# # @echo 'package install $(ALP_NAMESPACE).bar' | $(NETCAT_REMOTE)
-# # @echo " "
-
-# # (echo "install /tmp/$(ALP_NAMESPACE).hello.bar `/scratchbox/tools/bin/ls
-la buil
-# # d/alp-simulator/$(ALP_NAMESPACE).hello.bar | /scratchbox/tools/bin/cut
--delim='
-# # ' --fields=6,6` 0 0 0755" ; /scratchbox/tools/bin/cat
build/alp-simulator/com.ac
-# # cess.apps.hello.bar ) | netcat -q 10 `cat /tmp/alp.ip` 5038
-# install-alp: bar install-files # launcher uninstall
-# @echo "Installing new bar file..."
-# size=`ls -la $(ALP_NAMESPACE).bar | cut --delim=' ' --fields=6,6`; \
-# (echo "install $(ALP_NAMESPACE).bar $$size 0 0 0755" ; cat
$(ALP_NAMESPACE).bar ) | $(NETCAT_REMOTE)
-# @echo; echo "Registering new bar file with target..."
-# @echo 'package install /tmp/$(ALP_NAMESPACE).bar' | $(NETCAT_REMOTE)
-# @echo " "
-
-launch:
- @echo 'package run bar:$(ALP_NAMESPACE)' | $(NETCAT_REMOTE)
-
-# Note: bundle delete requires rdbgd version 11
-# uninstall-alp:
-# @echo 'package delete bar:$(ALP_NAMESPACE)' | $(NETCAT_REMOTE)
-# -if test -e $(DEST_BND_DIR)/Manifest.xml ; then \
-# rm -Rf $(DEST_BND_DIR) ; \
-# fi
-#############
-# install-files - Install built files into current rootfs
-# (DO NOT USE if target is running; does not interact with target)
-#############
-
-# install-files: alp-bundle
-# $(mkinstalldirs) $(DEST_BND_ROOT)/$(ALP_NAMESPACE)
-# # -if [ -e $(DEST_BND_DIR)/Manifest.xml ] ; then \
-# # echo " " ; \
-# # echo "Bundle already exists! Removing old bundle..." ; \
-# # rm -Rf $(DEST_BND_DIR) ; \
-# # fi
-# @echo "Installing new bundle files..."
-# cp -Rf $(ALP_NAMESPACE) $(DEST_BND_ROOT)
-
-# #############
-# # uninstall-files - Uninstall built files from current rootfs
-# # (DO NOT USE if target is running; does not interact with target)
-# #############
-
-# uninstall-files:
-# @echo " "
-# -if [ -e $(DEST_BND_DIR)/Manifest.xml ] ; then \
-# echo "Removing old bundle... (NOTE: target should NOT be running!)" ;
\
-# rm -Rf $(DEST_BND_DIR) ; \
-# else \
-# echo "Manifest.xml not found in $(DEST_BND_DIR)" ; \
-# echo "If the directory exists, you'll need to remove it manually." ; \
-# fi
-# @echo " "
-
-# ###########
-# # uninstall - uninstall app from remote target (using "bundle delete")
-# # (depends on netcat instead of rdbgd since it works w/o target)
-# ###########
-
-# uninstall-alp: uninstall-files
-# @# Note: bundle delete requires rdbgd version 11
-# @echo " "
-# @echo "Removing old bundle..."
-# @echo "(If this returns an error, the target is probably not running.)"
-# @echo "(In that case, the bundle should be gone when you next boot the
target.)"
-# @echo " "
-# address@hidden 'package delete bar:$(ALP_NAMESPACE)' | $(NETCAT_REMOTE)
-# @echo " "
-# @# explicitly remove the bundle directory in case the rdbgd command
fails.
-
-endif
-
diff --git a/gui/am-frag/hildon.am b/gui/am-frag/hildon.am
deleted file mode 100644
index 5da26c5..0000000
--- a/gui/am-frag/hildon.am
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
-
-#
-# Build the GTK/HILDON gui
-#
-if BUILD_HILDON_GUI
-bin_PROGRAMS += hildon-gnash
-hildon_gnash_SOURCES = $(GUI_SRCS) gtk/gui_gtk.cpp
-hildon_gnash_CPPFLAGS = -DGUI_GTK -DGUI_HILDON -DGUI_CONFIG=\"HILDON\" \
- $(AM_CPPFLAGS) $(GTK_CFLAGS) $(HILDON_CFLAGS)
-hildon_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
-#gtk_gnash_DEPENDENCIES = .configline
-
-if BUILD_OGL_RENDERER
-hildon_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
-hildon_gnash_SOURCES += gtk/gtk_glue_gtkglext.cpp gtk/gtk_glue_gtkglext.h \
- gtk/gtk.cpp gtk/gtksup.h gtk/gtk_glue.h
-hildon_gnash_LDADD = $(top_builddir)/librender/libgnashogl.la \
- $(GNASH_LIBS) $(GTK_LIBS) $(OPENGL_LIBS) $(HILDON_LIBS)
-endif # BUILD_OGL_RENDERER
-if BUILD_AGG_RENDERER
-hildon_gnash_CPPFLAGS += $(AGG_CFLAGS) $(HILDON_CFLAGS)
-hildon_gnash_SOURCES += gtk/gtk_glue_agg.cpp gtk/gtk_glue_agg.h \
- gtk/gtk.cpp gtk/gtksup.h gtk/gtk_glue.h
-hildon_gnash_LDADD = $(top_builddir)/librender/libgnashagg.la \
- $(GNASH_LIBS) $(GTK_LIBS) $(AGG_LIBS) $(HILDON_LIBS)
-
-endif # BUILD_AGG_RENDERER
-if BUILD_CAIRO_RENDERER
-hildon_gnash_CPPFLAGS += $(CAIRO_CFLAGS)
-hildon_gnash_SOURCES += gtk/gtk_glue_cairo.cpp gtk/gtk_glue_cairo.h \
- gtk/gtk.cpp gtk/gtksup.h gtk/gtk_glue.h
-hildon_gnash_LDADD = $(top_builddir)/librender/libgnashcairo.la \
- $(GNASH_LIBS) $(GTK_LIBS) $(CAIRO_LIBS) $(HILDON_LIBS)
-endif # BUILD_CAIRO_RENDERER
-endif # BUILD_GTK_HILDON
-
-# #
-# # Build the GTK/HILDON gui
-# #
-# if BUILD_HILDON_GUI
-# bin_PROGRAMS += hildon-gnash
-# hildon_gnash_SOURCES = $(GUI_SRCS) gtk/gui_gtk.cpp
-# hildon_gnash_CPPFLAGS = -DGUI_GTK -DGUI_HILDON -DGUI_CONFIG=\"HILDON\" \
-# $(AM_CPPFLAGS) $(GTK_CFLAGS) $(HILDON_CFLAGS)
-# hildon_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
-# #gtk_gnash_DEPENDENCIES = .configline
-
-# if BUILD_OGL_RENDERER
-# hildon_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
-# hildon_gnash_SOURCES += gtk/gtk_glue_gtkglext.cpp gtk/gtk_glue_gtkglext.h \
-# gtk/gtk.cpp gtk/gtksup.h gtk/gtk_glue.h
-# hildon_gnash_LDADD = $(top_builddir)/librender/libgnashogl.la \
-# $(GNASH_LIBS) $(GTK_LIBS) $(OPENGL_LIBS) $(HILDON_LIBS)
-# endif # BUILD_OGL_RENDERER
-# if BUILD_AGG_RENDERER
-# hildon_gnash_CPPFLAGS += $(AGG_CFLAGS) $(HILDON_CFLAGS)
-# hildon_gnash_SOURCES += gtk/gtk_glue_agg.cpp gtk/gtk_glue_agg.h \
-# gtk/gtk.cpp gtk/gtksup.h gtk/gtk_glue.h
-# hildon_gnash_LDADD = $(top_builddir)/librender/libgnashagg.la \
-# $(GNASH_LIBS) $(GTK_LIBS) $(AGG_LIBS) $(HILDON_LIBS)
-
-# endif # BUILD_AGG_RENDERER
-# if BUILD_CAIRO_RENDERER
-# hildon_gnash_CPPFLAGS += $(CAIRO_CFLAGS)
-# hildon_gnash_SOURCES += gtk/gtk_glue_cairo.cpp gtk/gtk_glue_cairo.h \
-# gtk/gtk.cpp gtk/gtksup.h gtk/gtk_glue.h
-# hildon_gnash_LDADD = $(top_builddir)/librender/libgnashcairo.la \
-# $(GNASH_LIBS) $(GTK_LIBS) $(CAIRO_LIBS) $(HILDON_LIBS)
-# endif # BUILD_CAIRO_RENDERER
-# endif # BUILD_GTK_HILDON
diff --git a/gui/gnash.cpp b/gui/gnash.cpp
index a3e9148..134cee9 100644
--- a/gui/gnash.cpp
+++ b/gui/gnash.cpp
@@ -64,16 +64,6 @@ extern "C" {
# include "gst/gstversion.h"
#endif
-#ifdef GUI_ALP
-#include <alp/title.h>
-#include <alp/menubar.h>
-#include <alp/bundlemgr.h>
-#include <alp/appmgr.h>
-# define gnash_main alp_main
-#else
-# define gnash_main main
-#endif
-
using std::cerr;
using std::endl;
using std::cout;
@@ -116,8 +106,8 @@ usage()
<< _(" -vp Be (very) verbose about parsing\n")
#endif
<< _(" -A <file> Audio dump file (wave format)\n")
- << _(" --hwaccel <none|vaapi|xv> Hardware Video Accelerator to use\n")
- << _(" none|vaapi|xv|omap (default: none)\n")
+ << _(" --hwaccel <none|vaapi> Hardware Video Accelerator to use\n")
+ << _(" none|vaapi|omap (default: none)\n")
<< _(" -x, --xid <ID> X11 Window ID for display\n")
<< _(" -w, --writelog Produce the disk based debug log\n")
<< _(" -j, --width <width> Set window width\n")
@@ -387,9 +377,6 @@ parseCommandLine(int argc, char* argv[], gnash::Player&
player)
case 'v':
player.setHWAccel("vaapi");
break;
- case 'x':
- player.setHWAccel("xv");
- break;
case 'n':
default:
player.setHWAccel("none");
@@ -519,7 +506,7 @@ parseCommandLine(int argc, char* argv[], gnash::Player&
player)
}
int
-gnash_main(int argc, char *argv[])
+main(int argc, char *argv[])
{
std::ios::sync_with_stdio(false);
diff --git a/gui/gtk/gtk.am b/gui/gtk/gtk.am
index 8bbc3bd..e352601 100644
--- a/gui/gtk/gtk.am
+++ b/gui/gtk/gtk.am
@@ -24,10 +24,6 @@ GTK_CANVAS = gtk/gtk_canvas.cpp gtk/gtk_canvas.h
if BUILD_GTK_GUI
bin_PROGRAMS += gtk-gnash
-if BUILD_ALP_GUI
-GTK_CFLAGS += -DALP_BUILD=ALP_BUILD_DEBUG
-endif
-
gtk_gnash_SOURCES = $(GUI_SRCS) $(GTK_CANVAS) \
gtk/gtk.cpp gtk/gtksup.h gtk/gtk_glue.h gtk/gui_gtk.cpp
gtk_gnash_CPPFLAGS = -DGUI_GTK -DGUI_CONFIG=\"GTK\" \
@@ -47,10 +43,6 @@ gtk_gnash_CPPFLAGS += $(AGG_CFLAGS)
gtk_gnash_SOURCES += gtk/gtk_glue_agg.cpp gtk/gtk_glue_agg.h
gtk_gnash_LDADD = $(top_builddir)/librender/libgnashrender.la \
$(GNASH_LIBS) $(GTK_LIBS) $(AGG_LIBS) $(CAIRO_LIBS)
-if HAVE_XV
-gtk_gnash_SOURCES += gtk/gtk_glue_agg_xv.cpp gtk/gtk_glue_agg_xv.h
-gtk_gnash_LDADD += $(X11_LIBS)
-endif # HAVE_XV
if HAVE_VAAPI
noinst_HEADERS += gtk/gtk_glue_agg_vaapi.h
diff --git a/gui/gtk/gtk.cpp b/gui/gtk/gtk.cpp
index 26debc0..d067480 100644
--- a/gui/gtk/gtk.cpp
+++ b/gui/gtk/gtk.cpp
@@ -74,10 +74,6 @@ extern "C" {
# include "gst/gstversion.h" // Only for the version number
#endif
-#ifdef GUI_HILDON
-# include <hildon/hildon.h>
-#endif
-
#ifdef HAVE_VA_VA_H
extern VAStatus va_getDriverName(VADisplay dpy, char **driver_name);
#endif
@@ -161,9 +157,6 @@ GtkGui::~GtkGui()
GtkGui::GtkGui(unsigned long xid, float scale, bool loop, RunResources& r)
:
Gui(xid, scale, loop, r)
-#ifdef GUI_HILDON
- ,_hildon_program(0)
-#endif
,_window(0)
,_resumeButton(0)
,_overlay(0)
@@ -186,10 +179,6 @@ GtkGui::init(int argc, char **argv[])
gtk_init(&argc, argv);
-#ifdef GUI_HILDON
- _hildon_program = hildon_program_get_instance();
-#endif
-
addPixmapDirectory (PKGDATADIR);
if (_xid) {
@@ -200,12 +189,7 @@ GtkGui::init(int argc, char **argv[])
#endif
log_debug (_("Created XEmbedded window"));
} else {
-#ifdef GUI_HILDON
- _window = hildon_window_new();
- hildon_program_add_window(_hildon_program, HILDON_WINDOW(_window));
-#else
_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-#endif
log_debug (_("Created top level window"));
}
@@ -276,7 +260,7 @@ GtkGui::init(int argc, char **argv[])
gtk_widget_show(_vbox);
gtk_container_add(GTK_CONTAINER(_window), _vbox);
-#if defined(USE_MENUS) && !defined(GUI_HILDON)
+#if defined(USE_MENUS)
if ( ! _xid ) {
createMenuBar();
}
@@ -686,13 +670,7 @@ GtkGui::createMenuBar()
{
_menubar = gtk_menu_bar_new();
gtk_widget_show(_menubar);
-#ifdef GUI_HILDON
-// _hildon_toolbar = create_hildon_toolbar(_hildon_program);
-// hildon_window_add_toolbar(HILDON_WINDOW(_window),
-// GTK_TOOLBAR(_hildon_toolbar));
-#else
gtk_box_pack_start(GTK_BOX(_vbox), _menubar, FALSE, FALSE, 0);
-#endif
createFileMenu(_menubar);
createEditMenu(_menubar);
@@ -742,12 +720,6 @@ GtkGui::createMenu()
gtk_container_add(GTK_CONTAINER(_popup_menu), quit);
g_signal_connect(quit, "activate", G_CALLBACK(menuQuit), this);
-#ifdef GUI_HILDON
- hildon_window_set_menu(HILDON_WINDOW(_window),
- GTK_MENU(_popup_menu));
- gtk_widget_show_all(GTK_WIDGET(_popup_menu));
-#endif
-
return true;
}
@@ -774,12 +746,6 @@ GtkGui::createMenuAlt()
gtk_container_add(GTK_CONTAINER(_popup_menu_alt), quit);
g_signal_connect(quit, "activate", G_CALLBACK(menuQuit), this);
-#ifdef GUI_HILDON
- hildon_window_set_menu(HILDON_WINDOW(_window),
- GTK_MENU(_popup_menu_alt));
- gtk_widget_show_all(GTK_WIDGET(_popup_menu_alt));
-#endif
-
return true;
}
diff --git a/gui/gtk/gtk_canvas.cpp b/gui/gtk/gtk_canvas.cpp
index 26f6a71..bda1270 100644
--- a/gui/gtk/gtk_canvas.cpp
+++ b/gui/gtk/gtk_canvas.cpp
@@ -45,12 +45,6 @@
#include "gtk_glue_cairo.h"
#endif
-// This uses the Xv extension to X11, which has widespread support
-// for Hw video scaling.
-#ifdef HAVE_XV
-#include "gtk_glue_agg_xv.h"
-#endif
-
// AGG support, which is the default, for rendering in the canvas.
#include "gtk_glue_agg.h"
@@ -269,14 +263,6 @@ gnash_canvas_setup(GnashCanvas *canvas, std::string&
hwaccel,
} else
#endif
#ifdef RENDERER_AGG
-#ifdef HAVE_XV
- if (hwaccel == "xv") {
- // Use the X11 XV extension, which works on most GPUs.
- canvas->glue.reset(new gnash::GtkAggXvGlue);
- // Set the hardware acclerator to the next one to try
- // if initializing fails.
- } else
-#endif // HAVE_XV
{
canvas->glue.reset(new gnash::GtkAggGlue);
}
diff --git a/gui/gtk/gtk_glue_agg_xv.cpp b/gui/gtk/gtk_glue_agg_xv.cpp
deleted file mode 100644
index 1f80f87..0000000
--- a/gui/gtk/gtk_glue_agg_xv.cpp
+++ /dev/null
@@ -1,643 +0,0 @@
-//
-// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-
-
-/// \page gtk_shm_support GTK shared memory extension support
-///
-/// Xv glue for AGG.
-//
-/// Xv does hardware scaling for us.
-/// Thus, we should let the renderer render at a scale of 1 and we'll let
-/// Xv scale the rendered image to window size. Of course this destroys
-/// aspect ratio potentially set by the SWF.
-
-
-
-#include "gnash.h"
-#include "log.h"
-#include "Renderer.h"
-#include "Renderer_agg.h"
-#include "Movie.h"
-#include "movie_root.h"
-#include "gtk_glue_agg_xv.h"
-#include "VideoConverter.h"
-#include "VM.h"
-
-#include <cerrno>
-#include <gdk/gdkx.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-
-namespace gnash
-{
-
-GtkAggXvGlue::GtkAggXvGlue()
- : _agg_renderer(0),
- _stride(0),
- _xv_image(0),
- _xv_image_is_shared(false),
- _xv_port(std::numeric_limits<XvPortID>::max()),
- _xv_max_width(0),
- _xv_max_height(0),
- _window_width(0),
- _window_height(0),
- _movie_width(0),
- _movie_height(0),
- //_mediaHandler(media::MediaHandler::get()),
- _shm_info(0)
-{
- memset(&_xv_format, 0, sizeof(XvImageFormatValues));
-}
-
-GtkAggXvGlue::~GtkAggXvGlue()
-{
- destroy_x_image();
-}
-
-bool
-GtkAggXvGlue::init(int /*argc*/, char **/*argv*/[])
-{
- int dummy;
- unsigned int p_version, p_release, p_request_base, p_event_base,
- p_error_base;
-
- if (!XQueryExtension(gdk_display, "XVideo", &dummy, &dummy, &dummy)) {
- log_debug(_("WARNING: No XVideo extension available."));
- return false;
- }
- if (XvQueryExtension(gdk_display, &p_version, &p_release, &p_request_base,
- &p_event_base, &p_error_base) != Success) {
- log_debug(_("WARNING: XVideo extension is available, but is not
currently ready."));
- return false;
- }
-
- log_debug(_("GTK-AGG: XVideo available (version: %d, release: %d, "
- "request base: %d, event base: %d, error base: %d)"),
- p_version, p_release, p_request_base, p_event_base,
- p_error_base);
-
- return findXvPort(gdk_display);
-}
-
-void
-GtkAggXvGlue::prepDrawingArea(GtkWidget *drawing_area)
-{
- _drawing_area = drawing_area;
-
- gtk_widget_set_double_buffered(_drawing_area, FALSE);
-}
-
-Renderer*
-GtkAggXvGlue::createRenderHandler()
-{
- std::string pixelformat = findPixelFormat(_xv_format);
- _agg_renderer = create_Renderer_agg(pixelformat.c_str());
- if (_agg_renderer == NULL) {
- boost::format fmt = boost::format(
- _("Could not create AGG renderer with pixelformat %s")
- ) % pixelformat;
- throw GnashException(fmt.str());
- }
-
- return _agg_renderer;
-}
-
-void
-GtkAggXvGlue::setupRendering(movie_root* stage)
-{
- static bool first = true;
- if (first && stage) {
- first = false;
-
- const Movie& mi = stage->getRootMovie();
-
- _movie_width = mi.widthPixels();
- _movie_height = mi.heightPixels();
-
- if (!create_xv_shmimage(_movie_width, _movie_height)) {
- if (!create_xv_image(_movie_width, _movie_height)) {
- log_error(_("GTK-AGG: Could not create the Xv image."));
- first = true;
- return;
- }
- }
-
- if (_xv_format.type == XvRGB) {
- // init renderer to write directly to xv_image
- static_cast<Renderer_agg_base *>(_agg_renderer)->init_buffer
- ((unsigned char*) _xv_image->data, _xv_image->data_size,
- _movie_width, _movie_height, _xv_image->pitches[0]);
-
- } else {
-
- int _bpp = 24;
- int depth_bytes = _bpp / 8;
-
- // 4 byte alignment. Gst expects this and ffmpeg doesn't object.
- _stride = ( (_movie_width*depth_bytes) + 4 - 1 ) & ~( 4 - 1 );
-
- int bufsize = _stride * _movie_height;
-
- _offscreenbuf.reset(new unsigned char[bufsize]);
-
- Renderer_agg_base * renderer =
- static_cast<Renderer_agg_base *>(_agg_renderer);
- renderer->init_buffer(_offscreenbuf.get(), bufsize, _movie_width,
- _movie_height, _stride);
-
- }
- }
-}
-
-
-void
-GtkAggXvGlue::beforeRendering(movie_root* stage)
-{
- setupRendering(stage);
-
- // We force the scale to its original state in case the GUI changed it (in
- // the event of a resize), because we want Xv to do the scaling for us.
- _agg_renderer->set_scale(1.0, 1.0);
-}
-
-void
-GtkAggXvGlue::render()
-{
- render(0, 0, _movie_width, _movie_height);
-}
-
-void
-GtkAggXvGlue::render(int /* minx */, int /* miny */, int /* maxx */, int /*
maxy */)
-{
- if (!_drawing_area || !_xv_image) {
- return;
- }
-
- if (_xv_format.type == XvYUV) {
-
- boost::uint32_t imgtype = 0;
- media::ImgBuf img(imgtype, _offscreenbuf.get(),
- _stride*_movie_height,
- _movie_width, _movie_height);
- img.dealloc = media::ImgBuf::noop;
- img.stride[0] = _stride;
-
- std::auto_ptr<media::ImgBuf> buf = _video_converter->convert(img);
- if (!buf.get()) {
- log_error(_("RGB->YUV conversion failed."));
- return;
- }
- if ((size_t)_xv_image->data_size != buf->size) {
- log_error(_("Converter returned invalid YUV data size (exp: %d,
got %d)"),
- _xv_image->data_size, buf->size);
- return;
- }
-
-
- memcpy(_xv_image->data, buf->data, buf->size);
- }
-
- if (_xv_image_is_shared) {
- XLockDisplay(gdk_display);
-
- XvShmPutImage(
- gdk_display,
- _xv_port,
- GDK_WINDOW_XWINDOW(_drawing_area->window),
- GDK_GC_XGC(_drawing_area->style->fg_gc[GTK_STATE_NORMAL]), // ???
- _xv_image,
- //minx, miny, w, h,
- 0, 0, _movie_width, _movie_height, /* source */
- //minx2, miny2, w2, h2,
- 0, 0, _window_width, _window_height, /* destination */
- False);
-
- XSync(gdk_display, False);
-
- XUnlockDisplay (gdk_display);
-
- } else {
- XvPutImage(
- gdk_display,
- _xv_port,
- GDK_WINDOW_XWINDOW(_drawing_area->window),
- GDK_GC_XGC(_drawing_area->style->fg_gc[GTK_STATE_NORMAL]), // ???
- _xv_image,
- //minx, miny, w, h,
- 0, 0, _movie_width, _movie_height, /* source */
- //minx2, miny2, w2, h2,
- 0, 0, _window_width, _window_height /* destination */);
- }
-
-}
-
-void
-GtkAggXvGlue::configure(GtkWidget *const /*widget*/, GdkEventConfigure *const
event)
-{
-
- _window_width = event->width;
- _window_height = event->height;
-}
-
-
-void
-get_max_xv_image(Display *display, XvPortID xv_port,
- unsigned int *width, unsigned int *height)
-{
- XvEncodingInfo * encodings;
- unsigned int num_encodings, idx;
-
- XvQueryEncodings(display, xv_port, &num_encodings, &encodings);
- if ( encodings ) {
- for ( idx = 0; idx < num_encodings; ++idx ) {
- if (std::equal(encodings[idx].name, encodings[idx].name+8,
"XV_IMAGE")) {
- *width = encodings[idx].width;
- *height = encodings[idx].height;
- break;
- }
- }
- }
- log_debug("GTK-AGG: Maximum XVideo dimensions: %ux%u\n", *width, *height );
- XvFreeEncodingInfo( encodings );
-}
-
-bool
-GtkAggXvGlue::findXvPort(Display* display)
-{
- unsigned int num_adaptors;
- XvAdaptorInfo* adaptor_info;
-
- if ((XvQueryAdaptors(display, DefaultRootWindow(display), &num_adaptors,
- &adaptor_info) != Success)) {
- log_debug("GTK-AGG: WARNING: No XVideo adapters. Falling back to
non-Xv.");
-
- return false;
- }
-
- log_debug("GTK-AGG: NOTICE: Found %d XVideo adapter(s) on GPU.",
num_adaptors);
-
- for (unsigned int i = 0; i < num_adaptors; ++i) {
-
- const XvAdaptorInfo& adaptor = adaptor_info[i];
-
- if (!((adaptor.type & XvInputMask) &&
- (adaptor.type & XvImageMask))) {
- continue;
- }
-
- for (XvPortID port = adaptor.base_id;
- port < adaptor.base_id + adaptor.num_ports;
- ++port) {
-
- int num_formats;
- XvImageFormatValues* formats = XvListImageFormats(display, port,
&num_formats);
-
- for (int j=0; j < num_formats; j++) {
- const XvImageFormatValues& format = formats[j];
-
- if (!isFormatBetter(_xv_format, format)) {
- continue;
- }
-
- std::string agg_pixelformat = findPixelFormat(format);
- if (agg_pixelformat.empty()) {
- continue;
- }
-
- if (!ensurePortGrabbed(display, port)) {
- continue;
- }
-
- _xv_format = format;
- }
-
- XFree(formats);
- }
- }
-
- XvFreeAdaptorInfo(adaptor_info);
-
- if (_xv_port != std::numeric_limits<XvPortID>::max()) {
- const char fourcc[] = {(_xv_format.id & 0xFF),
- (_xv_format.id >> 8) & 0xFF,
- (_xv_format.id >> 16) & 0xFF,
- (_xv_format.id >> 24) & 0xFF, 0};
- log_debug(_("GTK-AGG: Selected format %s for Xv rendering."), fourcc);
- get_max_xv_image(display, _xv_port, &_xv_max_width, &_xv_max_height);
- }
-
- return _xv_format.id != 0;
-}
-
-std::string
-GtkAggXvGlue::findPixelFormat(const XvImageFormatValues& format)
-{
- std::string rv;
-
- if ((format.type == XvRGB) && (format.format == XvPacked)) {
-
- unsigned int red_shift, red_prec;
- unsigned int green_shift, green_prec;
- unsigned int blue_shift, blue_prec;
-
- decode_mask(format.red_mask, &red_shift, &red_prec);
- decode_mask(format.green_mask, &green_shift, &green_prec);
- decode_mask(format.blue_mask, &blue_shift, &blue_prec);
-
- const char *pixelformat = agg_detect_pixel_format(
- red_shift, red_prec,
- green_shift, green_prec,
- blue_shift, blue_prec,
- format.bits_per_pixel);
-
- if (!pixelformat) {
- log_debug("GTK-AGG: Unknown RGB format "
- "'%d:%d:%d:%x:%x:%x' reported by Xv."
- " Please report this to the gnash-dev "
- "mailing list.", format.id,
- format.bits_per_pixel, format.depth,
- format.red_mask, format.green_mask,
- format.blue_mask);
- return rv;
- }
-
- rv = pixelformat;
-
- } else {
- std::auto_ptr<media::VideoConverter> converter =
- _mediaHandler->createVideoConverter(0x32424752 /* RGB */,
format.id);
-
- if (!converter.get()) {
- return rv;
- }
-
- _video_converter = converter;
-
- rv = "RGB24";
- }
-
- return rv;
-}
-
-bool
-GtkAggXvGlue::ensurePortGrabbed(Display *display, XvPortID port)
-{
- if (port == _xv_port) {
- return true;
- }
-
- if (!grabXvPort(display, port)) {
- return false;
- }
-
- if (_xv_port != std::numeric_limits<XvPortID>::max()) {
- XvUngrabPort(display, _xv_port, CurrentTime);
- }
-
- _xv_port = port;
-
- return true;;
-}
-
-bool
-GtkAggXvGlue::isFormatBetter(const XvImageFormatValues& oldformat,
- const XvImageFormatValues& newformat)
-{
- if ( (newformat.type == XvRGB) ) {
- if (oldformat.type != XvRGB) {
- return true;
- }
-
- return (newformat.depth > oldformat.depth);
- }
-
- return newformat.bits_per_pixel > oldformat.bits_per_pixel;
-}
-
-void
-GtkAggXvGlue::decode_mask(unsigned long mask, unsigned int *shift, unsigned
int *size)
-{
- *shift = 0;
- *size = 0;
-
- if (mask==0) return; // invalid mask
-
- while (!(mask & 1)) {
- (*shift)++;
- mask = mask >> 1;
- }
-
- while (mask & 1) {
- (*size)++;
- mask = mask >> 1;
- }
-}
-
-
-bool
-GtkAggXvGlue::grabXvPort(Display *display, XvPortID port)
-{
- int status;
-
- if ((status = XvGrabPort(display, port, CurrentTime)) == Success){
- log_debug("GTK-AGG: XVideo successfully grabbed port %ld.",
- (ptrdiff_t)port);
- return true;
- } else {
- const char* reason;
- switch (status) {
- case XvInvalidTime:
- reason = "XvInvalidTime";
- break;
- case XvAlreadyGrabbed:
- reason = "XvAlreadyGrabbed";
- break;
- case XvBadExtension:
- reason = "XvBadExtension";
- break;
- case XvBadAlloc:
- reason = "XvBadAlloc";
- break;
- default:
- reason = "Unknown";
- }
- log_debug("GTK-AGG: WARNING: Unable to XvGrabPort(%ld). Error: %s",
- (unsigned long)port, reason);
- }
- return false;
-}
-
-bool
-GtkAggXvGlue::create_xv_image(unsigned int width, unsigned int height)
-{
- destroy_x_image();
-
- _xv_image = XvCreateImage (gdk_display, _xv_port,
- _xv_format.id,
- NULL, width, height);
- if (!_xv_image) {
- printf("GTK-AGG: XvCreateImage failed!");
- return false;
- }
- if ((_xv_image->width < (int)width) || (_xv_image->height < (int)height)) {
- log_debug("GTK-AGG: xv_image => XVideo requested %dx%d, got %dx%d.
Aborting.\n",
- width, height, _xv_image->width, _xv_image->height);
- destroy_x_image();
- return false;
- }
- _xv_image->data = (char*)malloc(_xv_image->data_size);
- if (!_xv_image->data) {
- printf("GTK-AGG: Could not allocate %i bytes for Xv buffer: %s\n",
- _xv_image->data_size, strerror(errno));
- return false;
- }
- memset(_xv_image->data, 0, _xv_image->data_size);
- _xv_image_is_shared = false;
-
- log_debug(_("GTK-AGG: Created non-shared XvImage address@hidden, data=%#x,
%d bytes, %d planes."),
- width, height, (ptrdiff_t)_xv_image, (ptrdiff_t)_xv_image->data,
- _xv_image->data_size, _xv_image->num_planes);
- return true;
-}
-
-bool
-GtkAggXvGlue::create_xv_shmimage(unsigned int width, unsigned int height)
-{
- // First, we make sure that we can actually use XShm. Gdk seems to do a
- // better job at detecting this than we traditionally have, so we'll just
- // try to create small shared GdkImage.
-
- assert(_drawing_area && _drawing_area->window);
-
- GdkVisual* wvisual = gdk_drawable_get_visual(_drawing_area->window);
-
- GdkImage* tmpimage = gdk_image_new (GDK_IMAGE_SHARED, wvisual, 1, 1);
-
- if (tmpimage) {
- gdk_image_destroy(tmpimage);
- } else {
- log_debug(_("GTK-AGG: XShm not supported; will use non-shared
memory."));
- return false;
- }
-
- // destroy any already existing structures
- destroy_x_image();
-
- // prepare segment info (populated by XvShmCreateImage)
- _shm_info = (XShmSegmentInfo*) malloc(sizeof(XShmSegmentInfo));
- assert(_shm_info != NULL);
-
- // create shared memory XImage
- if ((width > _xv_max_width) || (height > _xv_max_height)) {
- log_debug("GTK-AGG: xv_shmimage => %dx%d too big for XVideo", width,
height);
- return false;
- }
- _xv_image = XvShmCreateImage(gdk_display, _xv_port,
- _xv_format.id,
- NULL, width, height, _shm_info);
- if (!_xv_image) {
- printf("GTK-AGG: XvShmCreateImage failed!");
- return false;
- }
- if ((_xv_image->width < (int)width) || (_xv_image->height < (int)height)) {
- log_debug("GTK-AGG: xv_shmimage => XVideo requested %dx%d, got %dx%d.
Aborting.\n",
- width, height, _xv_image->width, _xv_image->height);
- destroy_x_image();
- return false;
- }
- _xv_image_is_shared = true;
-
- // create shared memory segment
- _shm_info->shmid = shmget(IPC_PRIVATE,
- _xv_image->data_size,
- IPC_CREAT|0777);
- if (_shm_info->shmid == -1) {
- printf("GTK-AGG: xv_shmimage => Failed requesting Xv shared memory
segment "
- "(%s). Perhaps the "
- "required memory size is bigger than the limit set by the
kernel.",
- strerror(errno));
- destroy_x_image();
- return false;
- }
-
- // attach the shared memory segment to our process
- _shm_info->shmaddr = _xv_image->data = (char*) shmat(_shm_info->shmid,
NULL, 0);
-
- if (_shm_info->shmaddr == (char*)-1) {
- printf("GTK-AGG: xv_shmimage => Failed attaching to Xv shared memory
segment: %s",
- strerror(errno));
- destroy_x_image();
- return false;
- }
-
- // clear memory
- memset(_xv_image->data, 0, _xv_image->data_size);
-
- log_debug("GTK-AGG: Created shared XvImage address@hidden, data=%#x, %d
bytes.",
- width, height, (ptrdiff_t)_xv_image, (ptrdiff_t)_xv_image->data,
- _xv_image->data_size);
-
- // Give the server full access to our memory segment. We just follow
- // the documentation which recommends this, but we could also give him
- // just read-only access since we don't need XShmGetImage...
- _shm_info->readOnly = False;
-
- // Finally, tell the server to attach to our shared memory segment
- if (!XShmAttach(gdk_display, _shm_info)) {
- printf("GTK-AGG: xv_shmimage => Server failed attaching to the shared "
- "memory segment");
- destroy_x_image();
- return false;
- }
-
- XSync(gdk_display, False);
-
- // mark segment for automatic destruction after last process detaches
- shmctl(_shm_info->shmid, IPC_RMID, 0);
-
- return true;
-}
-
-void
-GtkAggXvGlue::destroy_x_image()
-{
- if (_xv_image) {
- log_debug("GTK-AGG: destroy => Using XFree (XVideo) to dispose of "
- "shared memory (%#x,%#x).", (ptrdiff_t)_xv_image,
(ptrdiff_t)_xv_image->data);
- if (_xv_image->data != NULL) {
- if (_xv_image_is_shared) {
- shmdt(_xv_image->data);
- } else {
- XFree(_xv_image->data);
- }
- XFree(_xv_image);
- }
- _xv_image = NULL;
- _xv_image_is_shared = false;
- }
-
- if (_shm_info) {
- // TODO: call shmdt?
- free(_shm_info);
- _shm_info=NULL;
- }
-}
-
-
-} // namespace gnash
-
diff --git a/gui/gtk/gtk_glue_agg_xv.h b/gui/gtk/gtk_glue_agg_xv.h
deleted file mode 100644
index 3f6104b..0000000
--- a/gui/gtk/gtk_glue_agg_xv.h
+++ /dev/null
@@ -1,102 +0,0 @@
-//
-// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
-#ifdef HAVE_CONFIG_H
-#include "gnashconfig.h"
-#endif
-
-#include "gtk_glue.h"
-#include "MediaHandler.h"
-
-#include <string>
-#include <gtk/gtk.h>
-#include <gdk/gdk.h>
-#include <boost/scoped_array.hpp>
-
-#include <X11/Xlib.h>
-
-#include <X11/extensions/XShm.h>
-#include <X11/extensions/Xv.h>
-#include <X11/extensions/Xvlib.h>
-
-
-namespace gnash
-{
-
-class GtkAggXvGlue : public GtkGlue
-{
- public:
- GtkAggXvGlue();
- ~GtkAggXvGlue();
-
- bool init(int argc, char **argv[]);
- void prepDrawingArea(GtkWidget *drawing_area);
- Renderer* createRenderHandler();
- virtual void beforeRendering(movie_root* stage);
- void render();
- void render(int minx, int miny, int maxx, int maxy);
- void configure(GtkWidget *const widget, GdkEventConfigure *const event);
-
- private:
- bool findXvPort(Display* display);
- bool grabXvPort(Display *display, XvPortID port);
- bool create_xv_image(unsigned int width, unsigned int height);
- bool create_xv_shmimage(unsigned int width, unsigned int height);
- void destroy_x_image();
- void setupRendering(movie_root* stage);
- void decode_mask(unsigned long mask, unsigned int *shift, unsigned int
*size);
- bool isFormatBetter(const XvImageFormatValues& oldformat,
- const XvImageFormatValues& newformat);
- bool ensurePortGrabbed(Display *display, XvPortID port);
- std::string findPixelFormat(const XvImageFormatValues& format);
-
- /// This will be used in case of RGB->YUV conversion.
- boost::scoped_array<boost::uint8_t> _offscreenbuf;
- Renderer *_agg_renderer;
- size_t _stride;
-
- /// If the hardware accepts RGB, then Agg will render directly into this.
- XvImage* _xv_image;
- bool _xv_image_is_shared;
- XvPortID _xv_port;
- unsigned int _xv_max_width;
- unsigned int _xv_max_height;
- int _window_width;
- int _window_height;
- int _movie_width;
- int _movie_height;
-
- media::MediaHandler* _mediaHandler;
- std::auto_ptr<media::VideoConverter> _video_converter;
-
- XvImageFormatValues _xv_format;
-
- XShmSegmentInfo *_shm_info;
-};
-
-} // namespace gnash
-
-
-
-
-
-
-
-
-
-
diff --git a/gui/gtk/gtksup.h b/gui/gtk/gtksup.h
index 584bbae..bb230e5 100644
--- a/gui/gtk/gtksup.h
+++ b/gui/gtk/gtksup.h
@@ -29,17 +29,6 @@
#include "gtk_glue.h"
-
-#ifdef GUI_HILDON
-extern "C" {
-# include <hildon/hildon.h>
-}
-#endif
-
-#ifdef USE_ALP
-# include <alp/bundlemgr.h>
-#endif
-
namespace gnash {
class GtkGui : public Gui
@@ -133,10 +122,6 @@ public:
private:
-#ifdef GUI_HILDON
- HildonProgram *_hildon_program;
-#endif
-
GtkWidget* _window;
GtkWidget* _resumeButton;
diff --git a/gui/pythonmod/Makefile.am b/gui/pythonmod/Makefile.am
index 9f13bdf..c11ac9d 100644
--- a/gui/pythonmod/Makefile.am
+++ b/gui/pythonmod/Makefile.am
@@ -66,10 +66,6 @@ INCLUDES += $(GLEXT_CFLAGS)
endif
if BUILD_AGG_RENDERER
RENDERER_GLUE = $(top_srcdir)/gui/gtk/gtk_glue_agg.cpp
-if HAVE_XV
-RENDERER_GLUE += $(top_srcdir)/gui/gtk/gtk_glue_agg_xv.cpp
-gnash_la_LIBADD += $(X11_LIBS)
-endif # HAVE_XV
endif
if BUILD_CAIRO_RENDERER
RENDERER_GLUE = $(top_srcdir)/gui/gtk/gtk_glue_cairo.cpp
diff --git a/macros/hildon.m4 b/macros/hildon.m4
deleted file mode 100644
index f9757a0..0000000
--- a/macros/hildon.m4
+++ /dev/null
@@ -1,143 +0,0 @@
-dnl
-dnl Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
-dnl
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3 of the License, or
-dnl (at your option) any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-dnl GNU General Public License for more details.
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-
-AC_DEFUN([GNASH_PATH_HILDON],
-[
-
- dnl Look for the header
- AC_ARG_WITH(hildon_incl, AC_HELP_STRING([--with-hildon-incl], [directory
where libhildon header is]), with_hildon_incl=${withval})
- AC_CACHE_VAL(ac_cv_path_hildon_incl,[
- if test x"${with_hildon_incl}" != x ; then
- if test -f ${with_hildon_incl}/hildon/hildon-program.h ; then
- ac_cv_path_hildon_incl="-I`(cd ${with_hildon_incl}; pwd)`"
- else
- AC_MSG_ERROR([${with_hildon_incl} directory doesn't contain
hildon/hildon.h])
- fi
- fi
- ])
-
- if test x$cross_compiling = xno; then
- if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_hildon_incl}" = x; then
- $PKG_CONFIG --exists hildon-1 && ac_cv_path_hildon_incl="`$PKG_CONFIG
--cflags-only-I hildon-1 | cut -d ' ' -f 1`"
- fi
- fi
-
- dnl Attempt to find the top level directory, which unfortunately has a
- dnl version number attached. At least on Debain based systems, this
- dnl doesn't seem to get a directory that is unversioned.
-
- AC_MSG_CHECKING([for the Hildon Version])
-
- if test x$cross_compiling = xno; then
- if test x"$PKG_CONFIG" != x; then
- $PKG_CONFIG --exists hildon-1 && gnash_hildon_version="`$PKG_CONFIG
--modversion hildon-1 | cut -d '.' -f 1`"
- fi
- fi
-
- if test x"${gnash_hildon_version}" = x; then
- gnash_hildon_topdir=""
- gnash_hildon_version=""
- for i in $incllist; do
- for j in `ls -dr $i/hildon-[[0-9]] 2>/dev/null`; do
- if test -f $j/hildon/hildon-program.h; then
- gnash_hildon_topdir="`basename $j`"
- gnash_hildon_version="`echo ${gnash_hildon_topdir} | sed -e
's:hildon-::'`"
- ac_cv_path_hildon_incl="-I$i/${gnash_hildon_topdir}"
- break
- fi
- done
- if test x$gnash_hildon_version != x; then
- break;
- fi
- done
- fi
-
- if test x"${gnash_hildon_version}" = x; then
- AC_MSG_RESULT(none)
- else
- AC_MSG_RESULT([${gnash_hildon_version}])
- fi
-
- AC_MSG_CHECKING([for libhildon header])
- AC_MSG_RESULT(${ac_cv_path_hildon_incl})
-
- dnl Look for the library
- AC_ARG_WITH(hildon_lib, AC_HELP_STRING([--with-hildon-lib], [directory where
hildon library is]), with_hildon_lib=${withval})
- AC_CACHE_VAL(ac_cv_path_hildon_lib,[
- if test x"${with_hildon_lib}" != x ; then
- if test -f ${with_hildon_lib}/libhildon-${gnash_hildon_version}.a -o -f
${with_hildon_lib}/libhildon-${gnash_hildon_version}.${shlibext}; then
- ac_cv_path_hildon_lib="-L`(cd ${with_hildon_lib}; pwd)`"
- else
- AC_MSG_ERROR([${with_hildon_lib} directory doesn't contain
libhildonhildon.])
- fi
- fi
- ])
-
- if test x$cross_compiling = xno; then
- if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_hildon_lib}" = x; then
- $PKG_CONFIG --exists hildon-1 && ac_cv_path_hildon_lib="`$PKG_CONFIG
--libs-only-l hildon-1 | cut -d ' ' -f 1`"
- fi
- fi
-
- if test x"${ac_cv_path_hildon_lib}" = x; then
- for i in $libslist; do
- if test -f $i/libhildon-${gnash_hildon_version}.a -o -f
$i/libhildon-${gnash_hildon_version}.${shlibext}; then
- if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then
- ac_cv_path_hildon_lib="-L$i -lhildon-${gnash_hildon_version}"
- break
- else
- ac_cv_path_hildon_lib="-lhildon-${gnash_hildon_version}"
- break
- fi
- fi
- done
- else
- hildon_lib_path=`$PKG_CONFIG --libs-only-L hildon-1`
- if test ! $hildon_lib_path = "-L/usr/lib" -o $hildon_lib_path =
"-L/usr/lib64"; then
- ac_cv_path_hildon_lib="${hildon_lib_path} ${ac_cv_path_hildon_lib}"
- fi
- fi
-
- AC_MSG_CHECKING([for libhildon library])
- AC_MSG_RESULT(${ac_cv_path_hildon_lib})
-
- if test x"${ac_cv_path_hildon_lib}" = x; then
- AC_CHECK_LIB(hildon-${gnash_hildon_version},
hildon_engine_shape_class_init,
[ac_cv_path_hildon_lib="-lhildon-${gnash_hildon_version}"])
- fi
-
- if test x"${ac_cv_path_hildon_incl}" != x; then
- HILDON_CFLAGS="${ac_cv_path_hildon_incl}"
- else
- HILDON_CFLAGS=""
- fi
-
- if test x"${ac_cv_path_hildon_lib}" != x; then
- HILDON_LIBS="${ac_cv_path_hildon_lib}"
- AC_DEFINE(HAVE_HILDON, [1], [has the Hildon mobile framework])
- else
- HILDON_LIBS=""
- fi
-
- AC_SUBST(HILDON_CFLAGS)
- AC_SUBST(HILDON_LIBS)
-])
-
-# Local Variables:
-# c-basic-offset: 2
-# tab-width: 2
-# indent-tabs-mode: nil
-# End:
http://git.savannah.gnu.org/cgit//commit/?id=6abf4a79cb86c3f0a98a9165b685961ddc68717b
commit 6abf4a79cb86c3f0a98a9165b685961ddc68717b
Author: Benjamin Wolsey <address@hidden>
Date: Tue Oct 12 12:29:53 2010 +0200
Drop obsolete code.
diff --git a/configure.ac b/configure.ac
index aadf53c..58c7270 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1413,9 +1413,6 @@ fi
LC_KEY=${lckey}
AC_SUBST(LC_KEY)
-dnl FIXME: this should go away when gtk.cpp is cleaned up..
-AC_DEFINE([BUILD_CANVAS], [], [Build GTK Canvas support for the GTK Widget ])
-
AC_ARG_ENABLE(python,
AC_HELP_STRING([--enable-python],[Enable python for the python wrapper]),
[case "${enableval}" in
diff --git a/gui/gtk/gtk.cpp b/gui/gtk/gtk.cpp
index 1375cdb..26debc0 100644
--- a/gui/gtk/gtk.cpp
+++ b/gui/gtk/gtk.cpp
@@ -56,9 +56,7 @@
#include <gdk/gdkkeysyms.h>
#include <string>
-#ifdef BUILD_CANVAS
#include "gtk_canvas.h"
-#endif
#ifdef HAVE_FFMPEG_AVCODEC_H
extern "C" {
@@ -253,18 +251,11 @@ GtkGui::init(int argc, char **argv[])
}
}
-#ifdef BUILD_CANVAS
_canvas = gnash_canvas_new();
gnash_canvas_setup(GNASH_CANVAS(_canvas), hwaccel, renderer, argc, argv);
// Increase reference count to prevent its destruction (which could happen
// later if we remove it from its container).
g_object_ref(G_OBJECT(_canvas));
-#else
- _drawingArea = gtk_drawing_area_new();
- // Increase reference count to prevent its destruction (which could happen
- // later if we remove it from its container).
- g_object_ref(G_OBJECT(_drawingArea));
-#endif
_resumeButton = gtk_button_new();
gtk_container_add(GTK_CONTAINER(_resumeButton),
@@ -291,28 +282,15 @@ GtkGui::init(int argc, char **argv[])
}
#endif
-#ifdef BUILD_CANVAS
gtk_box_pack_start(GTK_BOX(_vbox), _canvas, TRUE, TRUE, 0);
-#else
- gtk_box_pack_start(GTK_BOX(_vbox), _drawingArea, TRUE, TRUE, 0);
-#endif
setupEvents();
gtk_widget_realize(_window);
-#ifdef BUILD_CANVAS
gtk_widget_show(_canvas);
-#else
- gtk_widget_show(_drawingArea);
-#endif
gtk_widget_show(_window);
-#ifdef BUILD_CANVAS
_renderer = gnash_canvas_get_renderer(GNASH_CANVAS(_canvas));
-#else
- _renderer.reset(_glue->createRenderHandler());
- if (!_renderer.get()) return false;
-#endif
_runResources.setRenderer(_renderer);
// The first time stop() was called, stopHook() might not have had a chance
diff --git a/gui/gtk/gtksup.h b/gui/gtk/gtksup.h
index 1f5a470..584bbae 100644
--- a/gui/gtk/gtksup.h
+++ b/gui/gtk/gtksup.h
@@ -23,16 +23,12 @@
#include "gnashconfig.h"
#endif
-#include "gnash.h"
-#include "gtk_glue.h"
-
#include <string>
#include <gdk/gdk.h>
#include <gtk/gtk.h>
-#ifdef BUILD_CANVAS
-#include "gtk_canvas.h"
-#endif
+#include "gtk_glue.h"
+
#ifdef GUI_HILDON
extern "C" {
@@ -44,9 +40,7 @@ extern "C" {
# include <alp/bundlemgr.h>
#endif
-namespace gnash
-{
-
+namespace gnash {
class GtkGui : public Gui
{
@@ -150,11 +144,7 @@ private:
GtkWidget* _overlay;
// The area rendered into by Gnash
-#ifdef BUILD_CANVAS
GtkWidget* _canvas;
-#else
- GtkWidget* _drawingArea;
-#endif
GtkMenu* _popup_menu;
GtkMenu* _popup_menu_alt;
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 14 -
configure.ac | 93 +-----
extensions/launcher/Makefile.am | 8 -
extensions/launcher/launcher.cpp | 8 -
gui/Makefile.am | 15 -
gui/Player.cpp | 2 +-
gui/am-frag/alp.am | 205 ------------
gui/am-frag/hildon.am | 86 -----
gui/gnash.cpp | 19 +-
gui/gtk/gtk.am | 8 -
gui/gtk/gtk.cpp | 58 +----
gui/gtk/gtk_canvas.cpp | 14 -
gui/gtk/gtk_glue_agg_xv.cpp | 643 --------------------------------------
gui/gtk/gtk_glue_agg_xv.h | 102 ------
gui/gtk/gtksup.h | 29 +--
gui/pythonmod/Makefile.am | 4 -
macros/hildon.m4 | 143 ---------
17 files changed, 18 insertions(+), 1433 deletions(-)
delete mode 100644 gui/am-frag/alp.am
delete mode 100644 gui/am-frag/hildon.am
delete mode 100644 gui/gtk/gtk_glue_agg_xv.cpp
delete mode 100644 gui/gtk/gtk_glue_agg_xv.h
delete mode 100644 macros/hildon.m4
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. 7bfb0466cb6e0c24896815d840c8abb27327e888,
Benjamin Wolsey <=