Hello community,
here is the log from the commit of package telepathy-stream-engine for openSUSE:Factory
checked in at Wed Dec 30 00:31:05 CET 2009.
--------
--- GNOME/telepathy-stream-engine/telepathy-stream-engine.changes 2009-11-14 02:46:46.000000000 +0100
+++ /mounts/work_src_done/STABLE/telepathy-stream-engine/telepathy-stream-engine.changes 2009-12-18 09:46:57.000000000 +0100
@@ -1,0 +2,7 @@
+Fri Dec 18 09:31:45 CET 2009 - vuntz@opensuse.org
+
+- Update to version 0.5.13:
+ + Add support for Fremantle TV-out
+- Add hal-devel BuildRequires.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
telepathy-stream-engine-0.5.12.tar.bz2
New:
----
telepathy-stream-engine-0.5.13.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ telepathy-stream-engine.spec ++++++
--- /var/tmp/diff_new_pack.Nb85uV/_old 2009-12-30 00:30:42.000000000 +0100
+++ /var/tmp/diff_new_pack.Nb85uV/_new 2009-12-30 00:30:42.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package telepathy-stream-engine (Version 0.5.12)
+# spec file for package telepathy-stream-engine (Version 0.5.13)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -24,9 +24,10 @@
BuildRequires: telepathy-farsight-devel
BuildRequires: farsight2-devel
BuildRequires: gtk2-devel
+BuildRequires: hal-devel
BuildRequires: libxslt
BuildRequires: python-xml
-Version: 0.5.12
+Version: 0.5.13
Release: 1
License: LGPLv2.1+
# runtime dependency
++++++ telepathy-stream-engine-0.5.12.tar.bz2 -> telepathy-stream-engine-0.5.13.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-stream-engine-0.5.12/ChangeLog new/telepathy-stream-engine-0.5.13/ChangeLog
--- old/telepathy-stream-engine-0.5.12/ChangeLog 2009-10-26 17:27:12.000000000 +0100
+++ new/telepathy-stream-engine-0.5.13/ChangeLog 2009-12-17 19:27:12.000000000 +0100
@@ -1,3 +1,105 @@
+commit 04c52538cf3604ce6e99478bc6761f9e304852a0
+Author: Olivier Crête
+Date: Thu Dec 17 13:25:44 2009 -0500
+
+ version 0.5.13
+
+commit c88d7555c289b845ed907ff9ecd9667c099c4765
+Author: Olivier Crête
+Date: Thu Dec 17 13:24:27 2009 -0500
+
+ Fix compile warnings
+
+commit 3bef436f05cc86eea4e0df145e25bf2426e5d7e8
+Author: Olivier Crête
+Date: Fri Apr 3 18:47:51 2009 -0400
+
+ Remove the queue from the preview sink
+
+commit 308d44fcf7b70130b6d204020b622ea002aba21e
+Author: Olivier Crête
+Date: Fri Apr 3 18:51:21 2009 -0400
+
+ Remove pre-farsight queue
+
+commit 83d1eba44d49ba3cdf21cae215ae430ed34efda0
+Author: Olivier Crête
+Date: Wed Apr 1 18:27:09 2009 -0400
+
+ Default to UYVY, not I420
+
+commit ea8fd29502ae81c198abfc5ec7f2340bb11db31a
+Author: Olivier Crête
+Date: Thu Dec 17 12:19:21 2009 -0500
+
+ Switch Xv adapter depending on TV-out status
+
+commit 9dd559ca70aa0e12fc5fa017971d8c179c4ef3ae
+Author: Olivier Crête
+Date: Wed Dec 16 15:37:23 2009 -0500
+
+ Add libhal dependency
+
+commit d4d5e1cd086d6eaadc257acad126b6045747e6d0
+Author: Olivier Crête
+Date: Wed Dec 16 15:26:19 2009 -0500
+
+ Restart sink when the xv adapter is changed
+
+commit beb6ad8df87b1e4271a1ca128318fea77a9fcb3c
+Author: Olivier Crête
+Date: Wed Dec 16 14:54:38 2009 -0500
+
+ Set xv device onto actual sink
+
+commit 1cc831708f7e83c324dc9500f4117b045214c2a8
+Author: Olivier Crête
+Date: Wed Dec 16 14:10:58 2009 -0500
+
+ Add Xv device property
+
+commit d2c2231eecfc04bbf7b23b157ce80464c897c9de
+Author: Olivier Crête
+Date: Wed Dec 16 14:10:44 2009 -0500
+
+ Fix compilation
+
+commit 5809c756d3efecb0b13f7a941e3543b0f1033e57
+Author: Olivier Crête
+Date: Thu Dec 3 13:31:07 2009 +0530
+
+ Move non-assert code out of assert to be able to build without it
+
+commit 024db8c7791a2763db0c3095c15d083dd227db11
+Author: Olivier Crête
+Date: Fri Nov 6 16:19:30 2009 -0500
+
+ Pass correct type to method
+
+commit 9895271605db18922252ade8a6a08ea02ba3e2d5
+Author: Olivier Crête
+Date: Fri Nov 6 16:19:18 2009 -0500
+
+ Remove unused variable
+
+commit 32d953524e9c55a156c389bf2d3e825c4a48a868
+Author: Olivier Crête
+Date: Fri Nov 6 16:18:55 2009 -0500
+
+ Remove sigbus handling for pre-fremantle audio DSP
+
+commit 19f2378802abda6c3100e9d4d27ff71b10558d40
+Author: Olivier Crête
+Date: Mon Oct 26 17:29:46 2009 +0000
+
+ Verify content of correct variable
+
+commit 0fbe5204ff8ed72d610737e81837abea29595f7b
+Author: Olivier Crête
+Date: Mon Oct 26 16:27:49 2009 +0000
+
+ version 0.5.12.1
+
commit e68d236c6811983b9b37f7d3777b9b388c2515d2
Author: Olivier Crête
Date: Mon Oct 26 16:25:59 2009 +0000
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-stream-engine-0.5.12/Makefile.in new/telepathy-stream-engine-0.5.13/Makefile.in
--- old/telepathy-stream-engine-0.5.12/Makefile.in 2009-10-26 17:26:37.000000000 +0100
+++ new/telepathy-stream-engine-0.5.13/Makefile.in 2009-12-17 19:26:29.000000000 +0100
@@ -127,6 +127,8 @@
GST_VIDEO_CFLAGS = @GST_VIDEO_CFLAGS@
GST_VIDEO_LIBS = @GST_VIDEO_LIBS@
GTKDOC_CHECK = @GTKDOC_CHECK@
+HAL_CFLAGS = @HAL_CFLAGS@
+HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-stream-engine-0.5.12/NEWS new/telepathy-stream-engine-0.5.13/NEWS
--- old/telepathy-stream-engine-0.5.12/NEWS 2009-10-26 17:24:55.000000000 +0100
+++ new/telepathy-stream-engine-0.5.13/NEWS 2009-12-17 19:25:22.000000000 +0100
@@ -1,3 +1,8 @@
+telepathy-stream-engine 0.5.13 (2009-12-17)
+==========================================
+
+* Add support for Fremantle TV-out
+
telepathy-stream-engine 0.5.12 (2009-10-26)
==========================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-stream-engine-0.5.12/api/Makefile.in new/telepathy-stream-engine-0.5.13/api/Makefile.in
--- old/telepathy-stream-engine-0.5.12/api/Makefile.in 2009-10-26 17:26:36.000000000 +0100
+++ new/telepathy-stream-engine-0.5.13/api/Makefile.in 2009-12-17 19:26:29.000000000 +0100
@@ -114,6 +114,8 @@
GST_VIDEO_CFLAGS = @GST_VIDEO_CFLAGS@
GST_VIDEO_LIBS = @GST_VIDEO_LIBS@
GTKDOC_CHECK = @GTKDOC_CHECK@
+HAL_CFLAGS = @HAL_CFLAGS@
+HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-stream-engine-0.5.12/configure new/telepathy-stream-engine-0.5.13/configure
--- old/telepathy-stream-engine-0.5.12/configure 2009-10-26 17:26:38.000000000 +0100
+++ new/telepathy-stream-engine-0.5.13/configure 2009-12-17 19:26:30.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for Telepathy Stream Engine 0.5.12.
+# Generated by GNU Autoconf 2.63 for Telepathy Stream Engine 0.5.13.
#
# Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=stream-engine.
#
@@ -745,8 +745,8 @@
# Identity of this package.
PACKAGE_NAME='Telepathy Stream Engine'
PACKAGE_TARNAME='telepathy-stream-engine'
-PACKAGE_VERSION='0.5.12'
-PACKAGE_STRING='Telepathy Stream Engine 0.5.12'
+PACKAGE_VERSION='0.5.13'
+PACKAGE_STRING='Telepathy Stream Engine 0.5.13'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=stream-engine'
# Factoring default headers for most tests.
@@ -799,6 +799,8 @@
SYSCONFDIR
X11_LIBS
X11_CFLAGS
+HAL_LIBS
+HAL_CFLAGS
GST_VIDEO_LIBS
GST_VIDEO_CFLAGS
GST_INTERFACES_LIBS
@@ -970,6 +972,8 @@
GST_INTERFACES_LIBS
GST_VIDEO_CFLAGS
GST_VIDEO_LIBS
+HAL_CFLAGS
+HAL_LIBS
X11_CFLAGS
X11_LIBS'
@@ -1524,7 +1528,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Telepathy Stream Engine 0.5.12 to adapt to many kinds of systems.
+\`configure' configures Telepathy Stream Engine 0.5.13 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1595,7 +1599,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Telepathy Stream Engine 0.5.12:";;
+ short | recursive ) echo "Configuration of Telepathy Stream Engine 0.5.13:";;
esac
cat <<\_ACEOF
@@ -1659,6 +1663,8 @@
C compiler flags for GST_VIDEO, overriding pkg-config
GST_VIDEO_LIBS
linker flags for GST_VIDEO, overriding pkg-config
+ HAL_CFLAGS C compiler flags for HAL, overriding pkg-config
+ HAL_LIBS linker flags for HAL, overriding pkg-config
X11_CFLAGS C compiler flags for X11, overriding pkg-config
X11_LIBS linker flags for X11, overriding pkg-config
@@ -1728,7 +1734,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Telepathy Stream Engine configure 0.5.12
+Telepathy Stream Engine configure 0.5.13
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1742,7 +1748,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Telepathy Stream Engine $as_me 0.5.12, which was
+It was created by Telepathy Stream Engine $as_me 0.5.13, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2461,7 +2467,7 @@
# Define the identity of the package.
PACKAGE='telepathy-stream-engine'
- VERSION='0.5.12'
+ VERSION='0.5.13'
cat >>confdefs.h <<_ACEOF
@@ -4155,8 +4161,8 @@
-macro_version='2.2.6'
-macro_revision='1.3012'
+macro_version='2.2.6b'
+macro_revision='1.3017'
@@ -4849,13 +4855,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:4852: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:4858: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:4855: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:4861: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:4858: output\"" >&5)
+ (eval echo "\"\$as_me:4864: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -6061,7 +6067,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6064 "configure"' > conftest.$ac_ext
+ echo '#line 6070 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7918,11 +7924,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7921: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7927: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7925: \$? = $ac_status" >&5
+ echo "$as_me:7931: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8257,11 +8263,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8260: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8266: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8264: \$? = $ac_status" >&5
+ echo "$as_me:8270: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8362,11 +8368,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8365: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8371: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8369: \$? = $ac_status" >&5
+ echo "$as_me:8375: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8417,11 +8423,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8420: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8426: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8424: \$? = $ac_status" >&5
+ echo "$as_me:8430: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -11230,7 +11236,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11233 "configure"
+#line 11239 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11326,7 +11332,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11329 "configure"
+#line 11335 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13025,6 +13031,117 @@
+pkg_failed=no
+{ $as_echo "$as_me:$LINENO: checking for HAL" >&5
+$as_echo_n "checking for HAL... " >&6; }
+
+if test -n "$HAL_CFLAGS"; then
+ pkg_cv_HAL_CFLAGS="$HAL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal\"") >&5
+ ($PKG_CONFIG --exists --print-errors "hal") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_HAL_CFLAGS=`$PKG_CONFIG --cflags "hal" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$HAL_LIBS"; then
+ pkg_cv_HAL_LIBS="$HAL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal\"") >&5
+ ($PKG_CONFIG --exists --print-errors "hal") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_HAL_LIBS=`$PKG_CONFIG --libs "hal" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "hal" 2>&1`
+ else
+ HAL_PKG_ERRORS=`$PKG_CONFIG --print-errors "hal" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$HAL_PKG_ERRORS" >&5
+
+ { { $as_echo "$as_me:$LINENO: error: Package requirements (hal) were not met:
+
+$HAL_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables HAL_CFLAGS
+and HAL_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+$as_echo "$as_me: error: Package requirements (hal) were not met:
+
+$HAL_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables HAL_CFLAGS
+and HAL_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
+ { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables HAL_CFLAGS
+and HAL_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see http://pkg-config.freedesktop.org/.
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables HAL_CFLAGS
+and HAL_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see http://pkg-config.freedesktop.org/.
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }; }
+else
+ HAL_CFLAGS=$pkg_cv_HAL_CFLAGS
+ HAL_LIBS=$pkg_cv_HAL_LIBS
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+ :
+fi
+
+
+
pkg_failed=no
{ $as_echo "$as_me:$LINENO: checking for X11" >&5
@@ -13739,7 +13856,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Telepathy Stream Engine $as_me 0.5.12, which was
+This file was extended by Telepathy Stream Engine $as_me 0.5.13, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13802,7 +13919,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-Telepathy Stream Engine config.status 0.5.12
+Telepathy Stream Engine config.status 0.5.13
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-stream-engine-0.5.12/configure.ac new/telepathy-stream-engine-0.5.13/configure.ac
--- old/telepathy-stream-engine-0.5.12/configure.ac 2009-10-26 17:25:26.000000000 +0100
+++ new/telepathy-stream-engine-0.5.13/configure.ac 2009-12-17 19:24:42.000000000 +0100
@@ -9,7 +9,7 @@
m4_define([stream_engine_major_version], [0])
m4_define([stream_engine_minor_version], [5])
-m4_define([stream_engine_micro_version], [12])
+m4_define([stream_engine_micro_version], [13])
m4_define([stream_engine_nano_version], [0])
# Some magic
@@ -134,6 +134,10 @@
AC_SUBST(GST_VIDEO_CFLAGS)
AC_SUBST(GST_VIDEO_LIBS)
+dnl Check for hal
+PKG_CHECK_MODULES(HAL, [hal])
+AC_SUBST(HAL_CFLAGS)
+AC_SUBST(HAL_LIBS)
dnl libx11
PKG_CHECK_MODULES(X11, [x11 gtk+-2.0])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-stream-engine-0.5.12/data/Makefile.in new/telepathy-stream-engine-0.5.13/data/Makefile.in
--- old/telepathy-stream-engine-0.5.12/data/Makefile.in 2009-10-26 17:26:36.000000000 +0100
+++ new/telepathy-stream-engine-0.5.13/data/Makefile.in 2009-12-17 19:26:29.000000000 +0100
@@ -99,6 +99,8 @@
GST_VIDEO_CFLAGS = @GST_VIDEO_CFLAGS@
GST_VIDEO_LIBS = @GST_VIDEO_LIBS@
GTKDOC_CHECK = @GTKDOC_CHECK@
+HAL_CFLAGS = @HAL_CFLAGS@
+HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-stream-engine-0.5.12/doc/Makefile.in new/telepathy-stream-engine-0.5.13/doc/Makefile.in
--- old/telepathy-stream-engine-0.5.12/doc/Makefile.in 2009-10-26 17:26:36.000000000 +0100
+++ new/telepathy-stream-engine-0.5.13/doc/Makefile.in 2009-12-17 19:26:29.000000000 +0100
@@ -90,6 +90,8 @@
GST_VIDEO_CFLAGS = @GST_VIDEO_CFLAGS@
GST_VIDEO_LIBS = @GST_VIDEO_LIBS@
GTKDOC_CHECK = @GTKDOC_CHECK@
+HAL_CFLAGS = @HAL_CFLAGS@
+HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-stream-engine-0.5.12/ltmain.sh new/telepathy-stream-engine-0.5.13/ltmain.sh
--- old/telepathy-stream-engine-0.5.12/ltmain.sh 2009-09-15 20:14:25.000000000 +0200
+++ new/telepathy-stream-engine-0.5.13/ltmain.sh 2009-12-14 21:51:23.000000000 +0100
@@ -1,6 +1,6 @@
# Generated from ltmain.m4sh.
-# ltmain.sh (GNU libtool) 2.2.6
+# ltmain.sh (GNU libtool) 2.2.6b
# Written by Gordon Matzigkeit , 1996
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.2.6
+# $progname: (GNU libtool) 2.2.6b
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -73,9 +73,9 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION=2.2.6
+VERSION=2.2.6b
TIMESTAMP=""
-package_revision=1.3012
+package_revision=1.3017
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -116,15 +116,15 @@
: ${CP="cp -f"}
: ${ECHO="echo"}
-: ${EGREP="/usr/bin/grep -E"}
-: ${FGREP="/usr/bin/grep -F"}
-: ${GREP="/usr/bin/grep"}
+: ${EGREP="/bin/grep -E"}
+: ${FGREP="/bin/grep -F"}
+: ${GREP="/bin/grep"}
: ${LN_S="ln -s"}
: ${MAKE="make"}
: ${MKDIR="mkdir"}
: ${MV="mv -f"}
: ${RM="rm -f"}
-: ${SED="/opt/local/bin/gsed"}
+: ${SED="/bin/sed"}
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
: ${Xsed="$SED -e 1s/^X//"}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-stream-engine-0.5.12/m4/ltversion.m4 new/telepathy-stream-engine-0.5.13/m4/ltversion.m4
--- old/telepathy-stream-engine-0.5.12/m4/ltversion.m4 2009-09-15 20:14:25.000000000 +0200
+++ new/telepathy-stream-engine-0.5.13/m4/ltversion.m4 2009-12-14 21:51:23.000000000 +0100
@@ -9,15 +9,15 @@
# Generated from ltversion.in.
-# serial 3012 ltversion.m4
+# serial 3017 ltversion.m4
# This file is part of GNU Libtool
-m4_define([LT_PACKAGE_VERSION], [2.2.6])
-m4_define([LT_PACKAGE_REVISION], [1.3012])
+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
+m4_define([LT_PACKAGE_REVISION], [1.3017])
AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.6'
-macro_revision='1.3012'
+[macro_version='2.2.6b'
+macro_revision='1.3017'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-stream-engine-0.5.12/src/Makefile.am new/telepathy-stream-engine-0.5.13/src/Makefile.am
--- old/telepathy-stream-engine-0.5.12/src/Makefile.am 2009-10-26 17:23:49.000000000 +0100
+++ new/telepathy-stream-engine-0.5.13/src/Makefile.am 2009-12-17 19:19:13.000000000 +0100
@@ -28,6 +28,7 @@
$(ERROR_CFLAGS) \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \
+ $(HAL_CFLAGS) \
$(X11_CFLAGS) \
$(GST_CFLAGS) \
$(GST_VIDEO_CFLAGS) \
@@ -41,6 +42,7 @@
AM_LDFLAGS = \
$(GLIB_LIBS) \
$(DBUS_LIBS) \
+ $(HAL_LIBS) \
$(X11_LIBS) \
$(GST_LIBS) \
$(GST_VIDEO_LIBS) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-stream-engine-0.5.12/src/Makefile.in new/telepathy-stream-engine-0.5.13/src/Makefile.in
--- old/telepathy-stream-engine-0.5.12/src/Makefile.in 2009-10-26 17:26:36.000000000 +0100
+++ new/telepathy-stream-engine-0.5.13/src/Makefile.in 2009-12-17 19:26:29.000000000 +0100
@@ -119,6 +119,8 @@
GST_VIDEO_CFLAGS = @GST_VIDEO_CFLAGS@
GST_VIDEO_LIBS = @GST_VIDEO_LIBS@
GTKDOC_CHECK = @GTKDOC_CHECK@
+HAL_CFLAGS = @HAL_CFLAGS@
+HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -246,6 +248,7 @@
$(ERROR_CFLAGS) \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \
+ $(HAL_CFLAGS) \
$(X11_CFLAGS) \
$(GST_CFLAGS) \
$(GST_VIDEO_CFLAGS) \
@@ -259,6 +262,7 @@
AM_LDFLAGS = \
$(GLIB_LIBS) \
$(DBUS_LIBS) \
+ $(HAL_LIBS) \
$(X11_LIBS) \
$(GST_LIBS) \
$(GST_VIDEO_LIBS) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-stream-engine-0.5.12/src/stream-engine-main.c new/telepathy-stream-engine-0.5.13/src/stream-engine-main.c
--- old/telepathy-stream-engine-0.5.12/src/stream-engine-main.c 2009-10-26 17:18:49.000000000 +0100
+++ new/telepathy-stream-engine-0.5.13/src/stream-engine-main.c 2009-12-17 19:19:13.000000000 +0100
@@ -162,7 +162,7 @@
#endif
static gboolean
-dump_dot_file(gpointer data)
+dump_dot_file (gpointer data G_GNUC_UNUSED)
{
TpStreamEngine *engine = tp_stream_engine_get ();
GstElement *pipeline = NULL;
@@ -185,24 +185,6 @@
g_idle_add (dump_dot_file, NULL);
}
-static void
-got_sigbus (int i G_GNUC_UNUSED)
-{
- const char *msg = "stream engine: DSP crashed\n";
-
- write (STDERR_FILENO, msg, strlen (msg));
-
-#if 0
- if (!forced_exit_in_progress)
- {
- forced_exit_in_progress =TRUE;
- g_idle_add ((GSourceFunc) dsp_crashed, NULL);
- }
-#endif
-
- _exit (1);
-}
-
/* every time the watchdog barks, schedule a bite */
static gboolean
watchdog_bark (gpointer data G_GNUC_UNUSED)
@@ -241,9 +223,11 @@
uid = getuid();
if (uid != 0 && geteuid() == 0) {
- g_assert(setresuid(uid, uid, uid) >= 0);
- g_assert(getuid() == uid);
- g_assert(geteuid() == uid);
+ gint ret;
+ ret = setresuid(uid, uid, uid);
+ g_assert (ret >= 0);
+ g_assert (getuid() == uid);
+ g_assert (geteuid() == uid);
}
#endif
@@ -271,7 +255,6 @@
if (g_getenv ("STREAM_ENGINE_TIMING") != NULL)
g_log_set_default_handler (tp_debug_timestamped_log_handler, NULL);
- signal (SIGBUS, got_sigbus);
signal (SIGUSR1, got_sigusr1);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-stream-engine-0.5.12/src/tp-stream-engine.c new/telepathy-stream-engine-0.5.13/src/tp-stream-engine.c
--- old/telepathy-stream-engine-0.5.12/src/tp-stream-engine.c 2009-10-26 17:23:49.000000000 +0100
+++ new/telepathy-stream-engine-0.5.13/src/tp-stream-engine.c 2009-12-17 19:23:07.000000000 +0100
@@ -22,13 +22,17 @@
#include "config.h"
#endif
-#include
#include
#include
#include
#include
#include
+#include
+#include
+
+#include
+
#include
#include
#include
@@ -52,6 +56,9 @@
#define BUS_NAME "org.maemo.Telepathy.StreamEngine"
#define OBJECT_PATH "/org/maemo/Telepathy/StreamEngine"
+#define VIDEO_JACK_UDI "/org/freedesktop/Hal/devices/platform_soc_audio_logicaldev_input"
+#define VIDEO_JACK_PROPERTY "input.jack.type"
+
static void
_create_pipeline (TpStreamEngine *self);
@@ -163,6 +170,11 @@
GPtrArray *audio_objects;
GHashTable *object_threads;
+
+ DBusGConnection *system_bus_connection;
+ LibHalContext *libhal_ctx;
+
+ gboolean has_tv_out;
};
static void
@@ -351,6 +363,18 @@
if (priv->dispose_has_run)
return;
+ if (self->priv->libhal_ctx)
+ {
+ libhal_ctx_shutdown (self->priv->libhal_ctx, NULL);
+ libhal_ctx_free (self->priv->libhal_ctx);
+ self->priv->libhal_ctx = NULL;
+ }
+
+ if (self->priv->system_bus_connection)
+ {
+ dbus_g_connection_unref (self->priv->system_bus_connection);
+ self->priv->system_bus_connection = NULL;
+ }
if (self->priv->reset_failcount_id)
{
@@ -1384,7 +1408,7 @@
"width", G_TYPE_INT, 176,
"height", G_TYPE_INT, 144,
#endif
- "format", GST_TYPE_FOURCC, GST_MAKE_FOURCC ('I', '4', '2', '0'),
+ "format", GST_TYPE_FOURCC, GST_MAKE_FOURCC ('U','Y','V','Y'),
"framerate", GST_TYPE_FRACTION_RANGE, 5, 1, 20, 1,
NULL);
}
@@ -1511,6 +1535,14 @@
}
+static void
+set_xv_device (TpStreamEngineVideoPreview *preview, gboolean has_tvout)
+{
+ gchar *device = has_tvout ? "1" : "0";
+
+ g_object_set (preview, "xv-device", device, NULL);
+}
+
/**
* tp_stream_engine_create_preview_window
*
@@ -1537,6 +1569,8 @@
return;
}
+ set_xv_device (preview, self->priv->has_tv_out);
+
g_mutex_lock (self->priv->mutex);
self->priv->preview_sinks = g_list_prepend (self->priv->preview_sinks,
preview);
@@ -1601,6 +1635,7 @@
return;
}
+ set_xv_device (preview, self->priv->has_tv_out);
g_mutex_lock (self->priv->mutex);
self->priv->preview = preview;
@@ -1746,6 +1781,140 @@
g_signal_emit (self, signals[HANDLING_CHANNEL], 0);
}
+static gboolean
+has_tvout (TpStreamEngine *self)
+{
+ char **values = NULL;
+ int i;
+ DBusError error;
+ gboolean has_video = FALSE;
+
+
+ dbus_error_init (&error);
+
+ values = libhal_device_get_property_strlist (self->priv->libhal_ctx,
+ VIDEO_JACK_UDI, VIDEO_JACK_PROPERTY, NULL);
+
+ if (dbus_error_is_set (&error))
+ {
+ g_warning ("Could not get property list for %s:%s: %s",
+ VIDEO_JACK_UDI, VIDEO_JACK_PROPERTY, error.message);
+ dbus_error_free (&error);
+ return FALSE;
+ }
+
+ if (values)
+ {
+ for (i = 0; values[i]; i++)
+ {
+ if (!strcmp ("video-out", values[i]))
+ {
+ has_video = TRUE;
+ break;
+ }
+ }
+ }
+ g_strfreev (values);
+
+ return has_video;
+}
+
+static void
+libhal_property_modified (LibHalContext *ctx,
+ const char *udi,
+ const char *key,
+ dbus_bool_t is_removed,
+ dbus_bool_t is_added)
+{
+ TpStreamEngine *self = libhal_ctx_get_user_data (ctx);
+ gboolean has_tv_out_new;
+
+ if (strcmp (udi, VIDEO_JACK_UDI) || strcmp (key, VIDEO_JACK_PROPERTY))
+ return;
+
+ has_tv_out_new = has_tvout (self);
+
+ if (has_tv_out_new != self->priv->has_tv_out)
+ {
+ GList *item;
+
+ g_debug ("TV out %s, switching preview's Xv adapter",
+ has_tv_out_new ? "enabled" : "disabled");
+
+ self->priv->has_tv_out = has_tv_out_new;
+
+ g_mutex_lock (self->priv->mutex);
+ if (self->priv->preview)
+ set_xv_device (self->priv->preview, has_tv_out_new);
+
+ for (item = self->priv->preview_sinks; item; item = g_list_next (item))
+ set_xv_device (item->data, has_tv_out_new);
+ g_mutex_unlock (self->priv->mutex);
+ }
+}
+
+static void
+setup_hal (TpStreamEngine *self)
+{
+ DBusError error;
+ GError *gerror = NULL;
+
+ dbus_error_init (&error);
+ self->priv->system_bus_connection = dbus_g_bus_get (DBUS_BUS_SYSTEM,
+ &gerror);
+ if (!self->priv->system_bus_connection)
+ {
+ g_error ("Unable to connect to DBus: %s", gerror->message);
+ g_clear_error (&gerror);
+ return;
+ }
+
+ self->priv->libhal_ctx = libhal_ctx_new ();
+
+ if (!libhal_ctx_set_dbus_connection (self->priv->libhal_ctx,
+ dbus_g_connection_get_connection (
+ self->priv->system_bus_connection)))
+ {
+ g_error ("Error setting dbus connection on hal ctx: %s", error.message);
+ dbus_error_free (&error);
+ return;
+ }
+
+ if (!libhal_ctx_init (self->priv->libhal_ctx, &error))
+ {
+ g_error ("Hal context initializing failure %s", error.message);
+ dbus_error_free (&error);
+ return;
+ }
+
+ libhal_ctx_set_user_data (self->priv->libhal_ctx, self);
+
+ libhal_ctx_set_device_property_modified (self->priv->libhal_ctx,
+ libhal_property_modified);
+
+
+ if (libhal_device_exists (self->priv->libhal_ctx, VIDEO_JACK_UDI, &error))
+ {
+ if (!libhal_device_add_property_watch (self->priv->libhal_ctx,
+ VIDEO_JACK_UDI, &error))
+ {
+ g_warning ("Could not add property watch: %s", error.message);
+ dbus_error_free (&error);
+ return;
+ }
+
+ self->priv->has_tv_out = has_tvout (self);
+ }
+ else
+ {
+ g_warning ("No video jack found: Video out support disabled: %s",
+ error.message);
+ dbus_error_free (&error);
+ return;
+ }
+
+}
+
void
tp_stream_engine_register (TpStreamEngine *self)
{
@@ -1772,6 +1941,8 @@
if (request_name_result == DBUS_REQUEST_NAME_REPLY_EXISTS)
g_error ("Failed to acquire bus name, stream engine already running?");
+
+ setup_hal (self);
}
static TfStream *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-stream-engine-0.5.12/src/videopreview.c new/telepathy-stream-engine-0.5.13/src/videopreview.c
--- old/telepathy-stream-engine-0.5.12/src/videopreview.c 2009-05-20 22:55:58.000000000 +0200
+++ new/telepathy-stream-engine-0.5.13/src/videopreview.c 2009-12-17 19:19:13.000000000 +0100
@@ -92,7 +92,6 @@
make_sink (TpStreamEngineVideoPreview *self)
{
GstElement *bin = gst_bin_new (NULL);
- GstElement *queue;
GstElement *sink;
GstPad *pad;
GstPad *ghostpad;
@@ -112,35 +111,10 @@
goto error;
}
- queue = gst_element_factory_make ("queue", NULL);
- if (!queue)
- {
- g_warning ("Could not make queue");
- goto error;
- }
-
- if (!gst_bin_add (GST_BIN (bin), queue))
- {
- gst_object_unref (queue);
- g_warning ("Could not add queue to bin");
- goto error;
- }
-
- g_object_set (queue,
- "leaky", 2,
- "max-size-buffers", 1,
- NULL);
-
- if (!gst_element_link (queue, sink))
- {
- g_warning ("Could not link queue and sink");
- goto error;
- }
-
- pad = gst_element_get_static_pad (queue, "sink");
+ pad = gst_element_get_static_pad (sink, "sink");
if (!pad)
{
- g_warning ("Could not get queue sink pad");
+ g_warning ("Could not get sink sink pad");
goto error;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-stream-engine-0.5.12/src/videosink.c new/telepathy-stream-engine-0.5.13/src/videosink.c
--- old/telepathy-stream-engine-0.5.12/src/videosink.c 2009-10-26 17:23:49.000000000 +0100
+++ new/telepathy-stream-engine-0.5.13/src/videosink.c 2009-12-17 19:23:54.000000000 +0100
@@ -37,6 +37,8 @@
#include "videosink.h"
#include "util.h"
+#define DEFAULT_XV_DEVICE "0"
+
G_DEFINE_ABSTRACT_TYPE (TpStreamEngineVideoSink, tp_stream_engine_video_sink,
G_TYPE_OBJECT);
@@ -70,7 +72,8 @@
PROP_0,
PROP_SINK,
PROP_WINDOW_ID,
- PROP_IS_PREVIEW
+ PROP_IS_PREVIEW,
+ PROP_XV_DEVICE
};
@@ -190,7 +193,6 @@
const gchar *videosink_name;
GstElement *sink = NULL;
GstElement *bin, *tmp;
- GstPad *pad;
GstPad *ghostpad;
if ((videosink_name = getenv ("PREVIEW_VIDEO_SINK")) ||
@@ -218,7 +220,7 @@
return NULL;
}
- if (g_object_has_property (sink, "force-aspect-ratio"))
+ if (g_object_has_property (G_OBJECT (sink), "force-aspect-ratio"))
g_object_set (sink, "force-aspect-ratio", TRUE, NULL);
@@ -306,7 +308,7 @@
self->priv->sinkpad = gst_bin_find_unconnected_pad (GST_BIN (bin),
GST_PAD_SINK);
- if (!pad)
+ if (!self->priv->sinkpad)
{
g_warning ("Could not find unconnected sink pad in the source bin");
gst_object_unref (bin);
@@ -450,6 +452,66 @@
}
+static GstElement *
+tp_stream_engine_video_sink_get_xv_device (TpStreamEngineVideoSink *self)
+{
+ GstIterator *iter = gst_bin_iterate_all_by_interface (
+ GST_BIN (self->priv->sink),
+ GST_TYPE_X_OVERLAY);
+ GstElement *sink = NULL;
+ gpointer item;
+
+ while (!sink)
+ {
+ switch (gst_iterator_next (iter, &item))
+ {
+ case GST_ITERATOR_OK:
+ if (g_object_has_property (G_OBJECT (item), "device"))
+ sink = GST_ELEMENT (item);
+ else
+ gst_object_unref (item);
+ break;
+ case GST_ITERATOR_RESYNC:
+ if (sink)
+ gst_object_unref (sink);
+ sink = NULL;
+ gst_iterator_resync (iter);
+ break;
+ case GST_ITERATOR_ERROR:
+ break;
+ case GST_ITERATOR_DONE:
+ break;
+ }
+ }
+
+ gst_iterator_free (iter);
+
+ return sink;
+}
+
+static void
+do_nothing_cb (GstPad *pad, gboolean blocked, gpointer data)
+{
+}
+
+static void
+restart_sink_pad_blocked (GstPad *pad, gboolean blocked, gpointer data)
+{
+ GstPad *peerpad;
+ GstElement *sink;
+
+ peerpad = gst_pad_get_peer (pad);
+ g_assert (peerpad);
+
+ sink = gst_pad_get_parent_element (peerpad);
+
+ gst_element_set_state (sink, GST_STATE_NULL);
+ gst_element_sync_state_with_parent (sink);
+
+ gst_object_unref (sink);
+ gst_object_unref (peerpad);
+ gst_pad_set_blocked_async (pad, FALSE, do_nothing_cb, NULL);
+}
static void
tp_stream_engine_video_sink_set_property (GObject *object,
@@ -464,6 +526,33 @@
case PROP_IS_PREVIEW:
self->priv->is_preview = g_value_get_boolean (value);
break;
+ case PROP_XV_DEVICE:
+ {
+ GstElement *xvdevice =
+ tp_stream_engine_video_sink_get_xv_device (self);
+ gchar *current_dev;
+
+ if (!xvdevice)
+ return;
+ g_object_get (xvdevice, "device", ¤t_dev, NULL);
+ if (strcmp (current_dev, g_value_get_string (value)))
+ {
+ GstPad *sinkpad;
+ GstPad *srcpad;
+ g_object_set_property (G_OBJECT (xvdevice), "device", value);
+
+ sinkpad = gst_element_get_static_pad (xvdevice, "sink");
+ g_assert (sinkpad);
+ srcpad = gst_pad_get_peer (sinkpad);
+ g_assert (sinkpad);
+ gst_object_unref (sinkpad);
+
+ gst_pad_set_blocked_async (srcpad, TRUE, restart_sink_pad_blocked, self);
+ gst_object_unref (srcpad);
+ }
+ gst_object_unref (xvdevice);
+ }
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
@@ -486,6 +575,17 @@
case PROP_WINDOW_ID:
g_value_set_uint (value, self->priv->window_id);
break;
+ case PROP_XV_DEVICE:
+ {
+ GstElement *xvdevice =
+ tp_stream_engine_video_sink_get_xv_device (self);
+
+ if (!xvdevice)
+ return;
+ g_object_get_property (G_OBJECT (xvdevice), "device", value);
+ gst_object_unref (xvdevice);
+ }
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
@@ -525,6 +625,13 @@
FALSE,
G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
+ g_object_class_install_property (object_class, PROP_XV_DEVICE,
+ g_param_spec_string ("xv-device",
+ "Xv Device",
+ "The Xv Device to use",
+ DEFAULT_XV_DEVICE,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
signals[PLUG_DELETED] =
g_signal_new ("plug-deleted",
G_OBJECT_CLASS_TYPE (klass),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-stream-engine-0.5.12/src/videostream.c new/telepathy-stream-engine-0.5.13/src/videostream.c
--- old/telepathy-stream-engine-0.5.12/src/videostream.c 2009-10-21 15:54:40.000000000 +0200
+++ new/telepathy-stream-engine-0.5.13/src/videostream.c 2009-12-17 19:19:13.000000000 +0100
@@ -56,8 +56,6 @@
GstElement *sink;
- GstElement *queue;
-
GMutex *mutex;
/* Everything below this line is protected by the mutex */
@@ -207,50 +205,12 @@
{
GObject *obj;
TpStreamEngineVideoStream *self = NULL;
- GstPad *srcpad;
GstPad *sinkpad;
obj = G_OBJECT_CLASS (tp_stream_engine_video_stream_parent_class)->constructor (type, n_props, props);
self = (TpStreamEngineVideoStream *) obj;
- self->priv->queue = gst_element_factory_make ("queue", NULL);
-
- if (!self->priv->queue)
- {
- g_warning ("Could not make queue element");
- return obj;
- }
-
- g_object_set (self->priv->queue,
- "leaky", 2,
- "max-size-buffers", 1,
- NULL);
-
- if (!gst_bin_add (GST_BIN (self->priv->bin), self->priv->queue))
- {
- g_warning ("Could not add quue to bin");
- return obj;
- }
-
- if (gst_element_set_state (self->priv->queue, GST_STATE_PLAYING) ==
- GST_STATE_CHANGE_FAILURE)
- {
- g_warning ("Could not start queue");
- return obj;
- }
-
- sinkpad = gst_element_get_static_pad (self->priv->queue, "sink");
-
- if (GST_PAD_LINK_FAILED (gst_pad_link (self->priv->pad, sinkpad)))
- {
- g_warning ("Could not link sink to queue");
- gst_object_unref (sinkpad);
- return obj;
- }
-
- gst_object_unref (sinkpad);
-
g_object_get (self->priv->stream, "sink-pad", &sinkpad, NULL);
if (!sinkpad)
@@ -259,27 +219,15 @@
return obj;
}
- srcpad = gst_element_get_static_pad (self->priv->queue, "src");
-
- if (!sinkpad)
- {
- g_warning ("Could not get queue's srcpad");
- gst_object_unref (sinkpad);
- return obj;
- }
-
- if (GST_PAD_LINK_FAILED (gst_pad_link (srcpad, sinkpad)))
+ if (GST_PAD_LINK_FAILED (gst_pad_link (self->priv->pad, sinkpad)))
{
- gst_object_unref (srcpad);
- gst_object_unref (sinkpad);
g_warning ("Could not link sink to queue");
+ gst_object_unref (sinkpad);
return obj;
}
- gst_object_unref (srcpad);
gst_object_unref (sinkpad);
-
self->priv->src_pad_added_handler_id = g_signal_connect_object (
self->priv->stream, "src-pad-added", G_CALLBACK (src_pad_added_cb), self,
0);
@@ -319,14 +267,6 @@
}
g_mutex_unlock (self->priv->mutex);
- if (self->priv->queue)
- {
- gst_element_set_locked_state (self->priv->queue, TRUE);
- gst_element_set_state (self->priv->queue, GST_STATE_NULL);
- gst_bin_remove (GST_BIN (self->priv->bin), self->priv->queue);
- self->priv->queue = NULL;
- }
-
if (self->priv->sink)
{
gst_element_set_locked_state (self->priv->sink, TRUE);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-stream-engine-0.5.12/test/Makefile.in new/telepathy-stream-engine-0.5.13/test/Makefile.in
--- old/telepathy-stream-engine-0.5.12/test/Makefile.in 2009-10-26 17:26:37.000000000 +0100
+++ new/telepathy-stream-engine-0.5.13/test/Makefile.in 2009-12-17 19:26:29.000000000 +0100
@@ -101,6 +101,8 @@
GST_VIDEO_CFLAGS = @GST_VIDEO_CFLAGS@
GST_VIDEO_LIBS = @GST_VIDEO_LIBS@
GTKDOC_CHECK = @GTKDOC_CHECK@
+HAL_CFLAGS = @HAL_CFLAGS@
+HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-stream-engine-0.5.12/test/python/Makefile.in new/telepathy-stream-engine-0.5.13/test/python/Makefile.in
--- old/telepathy-stream-engine-0.5.12/test/python/Makefile.in 2009-10-26 17:26:37.000000000 +0100
+++ new/telepathy-stream-engine-0.5.13/test/python/Makefile.in 2009-12-17 19:26:29.000000000 +0100
@@ -89,6 +89,8 @@
GST_VIDEO_CFLAGS = @GST_VIDEO_CFLAGS@
GST_VIDEO_LIBS = @GST_VIDEO_LIBS@
GTKDOC_CHECK = @GTKDOC_CHECK@
+HAL_CFLAGS = @HAL_CFLAGS@
+HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-stream-engine-0.5.12/tools/Makefile.in new/telepathy-stream-engine-0.5.13/tools/Makefile.in
--- old/telepathy-stream-engine-0.5.12/tools/Makefile.in 2009-10-26 17:26:37.000000000 +0100
+++ new/telepathy-stream-engine-0.5.13/tools/Makefile.in 2009-12-17 19:26:29.000000000 +0100
@@ -89,6 +89,8 @@
GST_VIDEO_CFLAGS = @GST_VIDEO_CFLAGS@
GST_VIDEO_LIBS = @GST_VIDEO_LIBS@
GTKDOC_CHECK = @GTKDOC_CHECK@
+HAL_CFLAGS = @HAL_CFLAGS@
+HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org