Request 20 (accepted)

gst123.changes Changed

gst123.spec Changed

@@ -1,4 +1,4 @@
-# Copyright (c) 2012 Pascal Bleser <pascal.bleser@opensuse.org>
+# Copyright (c) 2012-2013 Pascal Bleser <pascal.bleser@opensuse.org>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -14,24 +14,31 @@
 # vim: set ts=4 sw=4 et:
 
 Name:           gst123
-Version:        0.3.1
-Release:        1
+Version:        0.3.3
+Release:        0
+License:        LGPL-2.0+
 Summary:        GStreamer based Command Line Music Player
+Url:            http://space.twc.de/~sfefan/gst123.php
+Group:          Productivity/Multimedia/Sound/Players
 Source:         http://space.twc.de/~stefan/gst123/gst123-%{version}.tar.bz2
 Source1:        gst123.desktop
+# PATCH-FIX-PACKMAN TAG gst123-gtk2_backport_GDK_BLANK_CURSOR.patch pascal.bleser@opensuse.org -- No info available for this patch?
 Patch2:         gst123-gtk2_backport_GDK_BLANK_CURSOR.patch
-URL:            http://space.twc.de/~sfefan/gst123.php
-Group:          Productivity/Multimedia/Sound/Players
-License:        LGPL-2.0+
-BuildRoot:      %{_tmppath}/build-%{name}-%{version}
+BuildRequires:  gcc-c++
+BuildRequires:  glibc-devel
+%if 0%{?suse_version} >= 1230
+BuildRequires:  gstreamer-devel
+BuildRequires:  gstreamer-plugins-base-devel
+%else
 BuildRequires:  gstreamer-0_10-devel
 BuildRequires:  gstreamer-0_10-plugins-base-devel
-BuildRequires:  gstreamer-0_10-devel
-BuildRequires:  gtk2-devel
+%endif
+BuildRequires:  libstdc++-devel
 BuildRequires:  ncurses-devel
-BuildRequires:  gcc make glibc-devel gcc-c++ libstdc++-devel
-BuildRequires:  autoconf automake libtool pkgconfig
+BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
+BuildRequires:  pkgconfig(gtk+-2.0)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 The program gst123 is designed to be a more flexible command line player in the
@@ -40,25 +47,29 @@
 different file formats, like flac, ogg and mp3, you can use gst123 to play all
 your music files.
 
-
 %prep
 %setup -q
-%patch2
+%patch2 -p1
 
 %build
 %configure
-%__make %{?_smp_flags} V=1
+make %{?_smp_flags} V=1
 
 %install
-%makeinstall
-
-%__install -D -m0644 "%{SOURCE1}" "%{buildroot}%{_datadir}/applications/%{name}.desktop"
+%make_install
+install -D -m0644 "%{SOURCE1}" "%{buildroot}%{_datadir}/applications/%{name}.desktop"
 %suse_update_desktop_file -r "%{name}" AudioVideo Player
-
 %find_lang "%{name}" || echo -n >"%{name}.lang"
 
-%clean
-%{?buildroot:%__rm -rf "%{buildroot}"}
+%if 0%{?suse_version} >= 1140
+%post
+%desktop_database_post
+%endif
+
+%if 0%{?suse_version} >= 1140
+%postun
+%desktop_database_postun
+%endif
 
 %files -f "%{name}.lang"
 %defattr(-,root,root)

gst123-gtk2_backport_GDK_BLANK_CURSOR.patch Changed

gst123-0.3.1.tar.bz2/ChangeLog -> gst123-0.3.3.tar.bz2/ChangeLog Changed

@@ -1,3 +1,105 @@
+2013-06-03 12:38:38 +0200  Stefan Westerfeld 	# 3ee92d4
+
+	Updated NEWS for 0.3.3.
+
+2013-06-03 12:33:37 +0200  Stefan Westerfeld 	# e6716bc
+
+	bump version
+
+2013-06-03 12:27:21 +0200  Stefan Westerfeld 	# 8921a4f
+
+	gst123: use g_filename_to_uri for filename->uri conversions; fixes issue 10
+
+	Issue 10: Local files not properly escaped when converted to URLs
+
+2013-04-18 14:48:55 +0200  Stefan Westerfeld 	# e97b086
+
+	gst123: implemented --skip <n>, -k <n>; based on code by Tobias Bengfort
+
+2013-01-11 12:32:43 +0100  Stefan Westerfeld 	# f6bf398
+
+	gst123: fixed video size related warning (regression against 0.3.1)
+
+2013-01-11 12:03:10 +0100  Stefan Westerfeld 	# 6d28dbe
+
+	updated man page
+
+2013-01-11 11:54:54 +0100  Stefan Westerfeld 	# eb01ba9
+
+	Update NEWS.
+
+2013-01-11 11:50:18 +0100  Stefan Westerfeld 	# 0b72338
+
+	Bump version to 0.3.2.
+
+2013-01-10 17:40:55 +0100  Stefan Westerfeld 	# e6cdd92
+
+	gst123: keep ref count on elements in list for verbose iterator output
+
+2013-01-10 17:27:42 +0100  Stefan Westerfeld 	# 2a820ea
+
+	compat: improved foreach code for gstreamer 1.0
+
+2013-01-10 17:13:18 +0100  Stefan Westerfeld 	# 69b1e85
+
+	compat: improved foreach implementation for gstreamer 0.10
+
+2013-01-10 16:42:17 +0100  Stefan Westerfeld 	# 2437854
+
+	compat: improved video support for gstreamer 1.0
+
+2013-01-10 16:15:18 +0100  Stefan Westerfeld 	# cd86d43
+
+	compat: fix playbin creation for gstreamer 1.0
+
+2013-01-10 14:38:47 +0100  Stefan Westerfeld 	# 55d4c3e
+
+	compat: improved gstreamer-0.10 support
+
+2013-01-10 14:15:11 +0100  Stefan Westerfeld 	# 6a4ba61
+
+	compat: added compatibility code
+
+2013-01-10 14:10:12 +0100  Stefan Westerfeld 	# 496d2d6
+
+	compat: started to implement support for both: gstreamer 0.10 and gstreamer 1.0
+
+2013-01-08 14:49:51 +0100  Stefan Westerfeld 	# 04adff5
+
+	typefinder: replace deprecated function g_cond_timed_wait()
+
+2013-01-08 14:37:36 +0100  Stefan Westerfeld 	# 6c29274
+
+	gst123: properly quit player if none of the files in the playlist can be played
+
+2013-01-08 13:40:05 +0100  Stefan Westerfeld 	# 9bf7b49
+
+	get rid of deprecated g_mutex_new(),... functions
+
+2013-01-08 12:22:44 +0100  Stefan Westerfeld 	# 2cb1cc1
+
+	gst123: remove deprecated g_thread_init(), no longer necessary
+
+2013-01-08 12:14:27 +0100  Stefan Westerfeld 	# fe87870
+
+	gst123: don't use deprecated g_basename function
+
+2013-01-08 11:58:58 +0100  Stefan Westerfeld 	# d4cf7e4
+
+	playlist parser: added virtual destructor (fixes compile warning)
+
+2013-01-08 11:31:52 +0100  Stefan Westerfeld 	# 16cd28f
+
+	BUILD: extend configure check to allow gstreamer-0.10 and gstreamer-1.0
+
+2012-12-18 11:36:37 +0100  Stefan Westerfeld 	# 06e329a
+
+	gst123: added "-a pulse" PulseAudio output support
+
+2012-04-23 03:10:22 +0200  Stefan Westerfeld 	# 3e46d2e
+
+	Fix time display updates (broken by introduction of quiet mode).
+
 2012-04-21 01:06:42 +0200  Stefan Westerfeld 	# 4b67b85
 
 	Updated news for 0.3.1.

gst123-0.3.1.tar.bz2/INSTALL -> gst123-0.3.3.tar.bz2/INSTALL Changed

gst123-0.3.1.tar.bz2/Makefile.in -> gst123-0.3.3.tar.bz2/Makefile.in Changed

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15,23 +15,6 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\\ \	*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -79,11 +62,6 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -154,6 +132,10 @@
 ECHO_T = @ECHO_T@
 EXEEXT = @EXEEXT@
 GROFF = @GROFF@
+GSTREAMER_0_10_CFLAGS = @GSTREAMER_0_10_CFLAGS@
+GSTREAMER_0_10_LIBS = @GSTREAMER_0_10_LIBS@
+GSTREAMER_1_0_CFLAGS = @GSTREAMER_1_0_CFLAGS@
+GSTREAMER_1_0_LIBS = @GSTREAMER_1_0_LIBS@
 GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
 GSTREAMER_GTKLIBS = @GSTREAMER_GTKLIBS@
 GSTREAMER_GTK_CFLAGS = @GSTREAMER_GTK_CFLAGS@
@@ -497,10 +479,13 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \

gst123-0.3.1.tar.bz2/NEWS -> gst123-0.3.3.tar.bz2/NEWS Changed

gst123-0.3.1.tar.bz2/aclocal.m4 -> gst123-0.3.3.tar.bz2/aclocal.m4 Changed

gst123-0.3.1.tar.bz2/build-aux/depcomp -> gst123-0.3.3.tar.bz2/build-aux/depcomp Changed

@@ -1,10 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-12-04.11; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
+# 2011 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
@@ -44,7 +44,7 @@
   object      Object file output by `PROGRAMS ARGS'.
   DEPDIR      directory where to store dependencies.
   depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
+  tmpdepfile  Temporary file to use when outputting dependencies.
   libtool     Whether libtool is used (yes/no).
 
 Report bugs to <bug-automake@gnu.org>.
@@ -90,10 +90,18 @@
    # This is just like msvisualcpp but w/o cygpath translation.
    # Just convert the backslash-escaped backslashes to single forward
    # slashes to satisfy depend.m4
-   cygpath_u="sed s,\\\\\\\\,/,g"
+   cygpath_u='sed s,\\\\,/,g'
    depmode=msvisualcpp
 fi
 
+if test "$depmode" = msvc7msys; then
+   # This is just like msvc7 but w/o cygpath translation.
+   # Just convert the backslash-escaped backslashes to single forward
+   # slashes to satisfy depend.m4
+   cygpath_u='sed s,\\\\,/,g'
+   depmode=msvc7
+fi
+
 case "$depmode" in
 gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
@@ -158,10 +166,12 @@
 ' < "$tmpdepfile" |
 ## Some versions of gcc put a space before the `:'.  On the theory
 ## that the space means something, we add a space to the output as
-## well.
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+      | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -405,6 +415,52 @@
    rm -f "$tmpdepfile"
    ;;
 
+msvc7)
+  if test "$libtool" = yes; then
+    showIncludes=-Wc,-showIncludes
+  else
+    showIncludes=-showIncludes
+  fi
+  "$@" $showIncludes > "$tmpdepfile"
+  stat=$?
+  grep -v '^Note: including file: ' "$tmpdepfile"
+  if test "$stat" = 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The first sed program below extracts the file names and escapes
+  # backslashes for cygpath.  The second sed program outputs the file
+  # name when reading, but also accumulates all include files in the
+  # hold buffer in order to output them again at the end.  This only
+  # works with sed implementations that can handle large buffers.
+  sed < "$tmpdepfile" -n '
+/^Note: including file:  *$.*$/ {
+  s//\1/
+  s/\\/\\\\/g
+  p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/$.*$/	\1 \\/p
+s/.$.*$ \\/\1:/
+H
+$ {
+  s/.*/	/
+  G
+  p
+}' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvc7msys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 #nosideeffect)
   # This comment above is used by automake to tell side-effect
   # dependency tracking mechanisms from slower ones.
@@ -503,7 +559,9 @@
   touch "$tmpdepfile"
   ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
   rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
+  # makedepend may prepend the VPATH from the source file name to the object.
+  # No need to regex-escape $object, excess matching of '.' is harmless.
+  sed "s|^.*$$object *:$|\1|" "$tmpdepfile" > "$depfile"
   sed '1,2d' "$tmpdepfile" | tr ' ' '
 ' | \
 ## Some versions of the HPUX 10.20 sed can't process this invocation

gst123-0.3.1.tar.bz2/build-aux/install-sh -> gst123-0.3.3.tar.bz2/build-aux/install-sh Changed

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-01-19.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -156,6 +156,10 @@
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
+	# Protect names problematic for `test' and other utilities.
+	case $dst_arg in
+	  -* | =!) dst_arg=./$dst_arg;;
+	esac
 	shift;;
 
     -T) no_target_directory=true;;
@@ -186,6 +190,10 @@
     fi
     shift # arg
     dst_arg=$arg
+    # Protect names problematic for `test' and other utilities.
+    case $dst_arg in
+      -* | =!) dst_arg=./$dst_arg;;
+    esac
   done
 fi
 
@@ -200,7 +208,11 @@
 fi
 
 if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
 
   # Set umask so as not to create temps with too-generous modes.
   # However, 'strip' requires both read and write access to temps.
@@ -228,9 +240,9 @@
 
 for src
 do
-  # Protect names starting with `-'.
+  # Protect names problematic for `test' and other utilities.
   case $src in
-    -*) src=./$src;;
+    -* | =!) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -252,12 +264,7 @@
       echo "$0: no destination specified." >&2
       exit 1
     fi
-
     dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
@@ -385,7 +392,7 @@
 
       case $dstdir in
 	/*) prefix='/';;
-	-*) prefix='./';;
+	-=!*) prefix='./';;
 	*)  prefix='';;
       esac
 
@@ -403,7 +410,7 @@
 
       for d
       do
-	test -z "$d" && continue
+	test X"$d" = X && continue
 
 	prefix=$prefix$d
 	if test -d "$prefix"; then

gst123-0.3.1.tar.bz2/build-aux/missing -> gst123-0.3.3.tar.bz2/build-aux/missing Changed

@@ -1,10 +1,10 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-01-06.13; # UTC
 
 # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
+# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -84,7 +84,6 @@
   help2man     touch the output file
   lex          create \`lex.yy.c', if possible, from existing .c
   makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
   yacc         create \`y.tab.ch', if possible, from existing .ch
 
 Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
@@ -122,15 +121,6 @@
     # Not GNU programs, they don't have --version.
     ;;
 
-  tar*)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
   *)
     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
        # We have it, but it failed.
@@ -226,7 +216,7 @@
          \`Bison' from any GNU archive site."
     rm -f y.tab.c y.tab.h
     if test $# -ne 1; then
-        eval LASTARG="\${$#}"
+        eval LASTARG=\${$#}
 	case $LASTARG in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
@@ -256,7 +246,7 @@
          \`Flex' from any GNU archive site."
     rm -f lex.yy.c
     if test $# -ne 1; then
-        eval LASTARG="\${$#}"
+        eval LASTARG=\${$#}
 	case $LASTARG in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
@@ -318,41 +308,6 @@
     touch $file
     ;;
 
-  tar*)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case $firstarg in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case $firstarg in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
   *)
     echo 1>&2 "\
 WARNING: \`$1' is needed, and is $msg.

gst123-0.3.1.tar.bz2/configure -> gst123-0.3.3.tar.bz2/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for gst123 0.3.1.
+# Generated by GNU Autoconf 2.68 for gst123 0.3.3.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@
 # Identity of this package.
 PACKAGE_NAME='gst123'
 PACKAGE_TARNAME='gst123'
-PACKAGE_VERSION='0.3.1'
-PACKAGE_STRING='gst123 0.3.1'
+PACKAGE_VERSION='0.3.3'
+PACKAGE_STRING='gst123 0.3.3'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -577,8 +577,12 @@
 GSTREAMER_GTKLIBS
 GSTREAMER_GTK_LIBS
 GSTREAMER_GTK_CFLAGS
+GSTREAMER_0_10_LIBS
+GSTREAMER_0_10_CFLAGS
 GSTREAMER_LIBS
 GSTREAMER_CFLAGS
+GSTREAMER_1_0_LIBS
+GSTREAMER_1_0_CFLAGS
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
@@ -696,8 +700,12 @@
 PKG_CONFIG
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
+GSTREAMER_1_0_CFLAGS
+GSTREAMER_1_0_LIBS
 GSTREAMER_CFLAGS
 GSTREAMER_LIBS
+GSTREAMER_0_10_CFLAGS
+GSTREAMER_0_10_LIBS
 GSTREAMER_GTK_CFLAGS
 GSTREAMER_GTK_LIBS'
 
@@ -1242,7 +1250,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 gst123 0.3.1 to adapt to many kinds of systems.
+\`configure' configures gst123 0.3.3 to adapt to many kinds of systems.
 
 Usage: $0 OPTION... VAR=VALUE...
 
@@ -1308,7 +1316,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gst123 0.3.1:";;
+     short | recursive ) echo "Configuration of gst123 0.3.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1340,10 +1348,18 @@
               directories to add to pkg-config's search path
   PKG_CONFIG_LIBDIR
               path overriding pkg-config's built-in search path
+  GSTREAMER_1_0_CFLAGS
+              C compiler flags for GSTREAMER_1_0, overriding pkg-config
+  GSTREAMER_1_0_LIBS
+              linker flags for GSTREAMER_1_0, overriding pkg-config
   GSTREAMER_CFLAGS
               C compiler flags for GSTREAMER, overriding pkg-config
   GSTREAMER_LIBS
               linker flags for GSTREAMER, overriding pkg-config
+  GSTREAMER_0_10_CFLAGS
+              C compiler flags for GSTREAMER_0_10, overriding pkg-config
+  GSTREAMER_0_10_LIBS
+              linker flags for GSTREAMER_0_10, overriding pkg-config
   GSTREAMER_GTK_CFLAGS
               C compiler flags for GSTREAMER_GTK, overriding pkg-config
   GSTREAMER_GTK_LIBS
@@ -1415,7 +1431,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gst123 configure 0.3.1
+gst123 configure 0.3.3
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1554,7 +1570,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gst123 $as_me 0.3.1, which was
+It was created by gst123 $as_me 0.3.3, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2372,7 +2388,7 @@
 
 # Define the identity of the package.
  PACKAGE='gst123'
- VERSION='0.3.1'
+ VERSION='0.3.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4037,6 +4053,82 @@
 
 
 pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSTREAMER_1_0" >&5
+$as_echo_n "checking for GSTREAMER_1_0... " >&6; }
+
+if test -n "$GSTREAMER_1_0_CFLAGS"; then
+    pkg_cv_GSTREAMER_1_0_CFLAGS="$GSTREAMER_1_0_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gstreamer-1.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GSTREAMER_1_0_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-1.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$GSTREAMER_1_0_LIBS"; then
+    pkg_cv_GSTREAMER_1_0_LIBS="$GSTREAMER_1_0_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gstreamer-1.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GSTREAMER_1_0_LIBS=`$PKG_CONFIG --libs "gstreamer-1.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+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
+	        GSTREAMER_1_0_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gstreamer-1.0" 2>&1`
+        else
+	        GSTREAMER_1_0_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gstreamer-1.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GSTREAMER_1_0_PKG_ERRORS" >&5
+
+	GST_1_0=0
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	GST_1_0=0
+else
+	GSTREAMER_1_0_CFLAGS=$pkg_cv_GSTREAMER_1_0_CFLAGS
+	GSTREAMER_1_0_LIBS=$pkg_cv_GSTREAMER_1_0_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	GST_1_0=1
+fi
+
+    if test x$GST_1_0 = x1; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: Building gst123 using gstreamer version 1.0" >&5
+$as_echo "$as_me: Building gst123 using gstreamer version 1.0" >&6;}
+
+
+pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSTREAMER" >&5
 $as_echo_n "checking for GSTREAMER... " >&6; }
 
@@ -4044,12 +4136,12 @@
     pkg_cv_GSTREAMER_CFLAGS="$GSTREAMER_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gstreamer-0.10") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-1.0 gstreamer-base-1.0 gstreamer-video-1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gstreamer-1.0 gstreamer-base-1.0 gstreamer-video-1.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-0.10" 2>/dev/null`
+  pkg_cv_GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-1.0 gstreamer-base-1.0 gstreamer-video-1.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -4061,12 +4153,104 @@
     pkg_cv_GSTREAMER_LIBS="$GSTREAMER_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-1.0 gstreamer-base-1.0 gstreamer-video-1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gstreamer-1.0 gstreamer-base-1.0 gstreamer-video-1.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GSTREAMER_LIBS=`$PKG_CONFIG --libs "gstreamer-1.0 gstreamer-base-1.0 gstreamer-video-1.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+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
+	        GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gstreamer-1.0 gstreamer-base-1.0 gstreamer-video-1.0" 2>&1`
+        else
+	        GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gstreamer-1.0 gstreamer-base-1.0 gstreamer-video-1.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GSTREAMER_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (gstreamer-1.0 gstreamer-base-1.0 gstreamer-video-1.0) were not met:
+
+$GSTREAMER_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 GSTREAMER_CFLAGS
+and GSTREAMER_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_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 GSTREAMER_CFLAGS
+and GSTREAMER_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" "$LINENO" 5; }
+else
+	GSTREAMER_CFLAGS=$pkg_cv_GSTREAMER_CFLAGS
+	GSTREAMER_LIBS=$pkg_cv_GSTREAMER_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+    else
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSTREAMER_0_10" >&5
+$as_echo_n "checking for GSTREAMER_0_10... " >&6; }
+
+if test -n "$GSTREAMER_0_10_CFLAGS"; then
+    pkg_cv_GSTREAMER_0_10_CFLAGS="$GSTREAMER_0_10_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gstreamer-0.10") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GSTREAMER_LIBS=`$PKG_CONFIG --libs "gstreamer-0.10" 2>/dev/null`
+  pkg_cv_GSTREAMER_0_10_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-0.10" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$GSTREAMER_0_10_LIBS"; then
+    pkg_cv_GSTREAMER_0_10_LIBS="$GSTREAMER_0_10_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gstreamer-0.10") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GSTREAMER_0_10_LIBS=`$PKG_CONFIG --libs "gstreamer-0.10" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -4087,14 +4271,89 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gstreamer-0.10" 2>&1`
+	        GSTREAMER_0_10_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gstreamer-0.10" 2>&1`
         else
-	        GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gstreamer-0.10" 2>&1`
+	        GSTREAMER_0_10_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gstreamer-0.10" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GSTREAMER_0_10_PKG_ERRORS" >&5
+
+	GST_0_10=0
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	GST_0_10=0
+else
+	GSTREAMER_0_10_CFLAGS=$pkg_cv_GSTREAMER_0_10_CFLAGS
+	GSTREAMER_0_10_LIBS=$pkg_cv_GSTREAMER_0_10_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	GST_0_10=1
+fi
+
+      if test x$GST_0_10 = x1; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: Building gst123 using gstreamer version 0.10" >&5
+$as_echo "$as_me: Building gst123 using gstreamer version 0.10" >&6;}
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSTREAMER" >&5
+$as_echo_n "checking for GSTREAMER... " >&6; }
+
+if test -n "$GSTREAMER_CFLAGS"; then
+    pkg_cv_GSTREAMER_CFLAGS="$GSTREAMER_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10 gstreamer-base-0.10 gstreamer-interfaces-0.10 gstreamer-video-0.10\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gstreamer-0.10 gstreamer-base-0.10 gstreamer-interfaces-0.10 gstreamer-video-0.10") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-0.10 gstreamer-base-0.10 gstreamer-interfaces-0.10 gstreamer-video-0.10" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$GSTREAMER_LIBS"; then
+    pkg_cv_GSTREAMER_LIBS="$GSTREAMER_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10 gstreamer-base-0.10 gstreamer-interfaces-0.10 gstreamer-video-0.10\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gstreamer-0.10 gstreamer-base-0.10 gstreamer-interfaces-0.10 gstreamer-video-0.10") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GSTREAMER_LIBS=`$PKG_CONFIG --libs "gstreamer-0.10 gstreamer-base-0.10 gstreamer-interfaces-0.10 gstreamer-video-0.10" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+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
+	        GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gstreamer-0.10 gstreamer-base-0.10 gstreamer-interfaces-0.10 gstreamer-video-0.10" 2>&1`
+        else
+	        GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gstreamer-0.10 gstreamer-base-0.10 gstreamer-interfaces-0.10 gstreamer-video-0.10" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GSTREAMER_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (gstreamer-0.10) were not met:
+	as_fn_error $? "Package requirements (gstreamer-0.10 gstreamer-base-0.10 gstreamer-interfaces-0.10 gstreamer-video-0.10) were not met:
 
 $GSTREAMER_PKG_ERRORS
 
@@ -4126,6 +4385,10 @@
 $as_echo "yes" >&6; }
 
 fi
+      else
+        as_fn_error $? "Neither gstreamer-0.10 nor gstreamer-1.0 was found using pkg-config." "$LINENO" 5
+      fi
+    fi
 
 
 
@@ -4139,12 +4402,12 @@
     pkg_cv_GSTREAMER_GTK_CFLAGS="$GSTREAMER_GTK_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-base-0.10 gtk+-2.0 gstreamer-interfaces-0.10 gstreamer-video-0.10\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gstreamer-base-0.10 gtk+-2.0 gstreamer-interfaces-0.10 gstreamer-video-0.10") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GSTREAMER_GTK_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-base-0.10 gtk+-2.0 gstreamer-interfaces-0.10 gstreamer-video-0.10" 2>/dev/null`
+  pkg_cv_GSTREAMER_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -4156,12 +4419,12 @@
     pkg_cv_GSTREAMER_GTK_LIBS="$GSTREAMER_GTK_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-base-0.10 gtk+-2.0 gstreamer-interfaces-0.10 gstreamer-video-0.10\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gstreamer-base-0.10 gtk+-2.0 gstreamer-interfaces-0.10 gstreamer-video-0.10") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GSTREAMER_GTK_LIBS=`$PKG_CONFIG --libs "gstreamer-base-0.10 gtk+-2.0 gstreamer-interfaces-0.10 gstreamer-video-0.10" 2>/dev/null`
+  pkg_cv_GSTREAMER_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -4182,14 +4445,14 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GSTREAMER_GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gstreamer-base-0.10 gtk+-2.0 gstreamer-interfaces-0.10 gstreamer-video-0.10" 2>&1`
+	        GSTREAMER_GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0" 2>&1`
         else
-	        GSTREAMER_GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gstreamer-base-0.10 gtk+-2.0 gstreamer-interfaces-0.10 gstreamer-video-0.10" 2>&1`
+	        GSTREAMER_GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GSTREAMER_GTK_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (gstreamer-base-0.10 gtk+-2.0 gstreamer-interfaces-0.10 gstreamer-video-0.10) were not met:
+	as_fn_error $? "Package requirements (gtk+-2.0) were not met:
 
 $GSTREAMER_GTK_PKG_ERRORS
 
@@ -5051,7 +5314,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gst123 $as_me 0.3.1, which was
+This file was extended by gst123 $as_me 0.3.3, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5117,7 +5380,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/\\""\`\$/\\\\&/g'`"
 ac_cs_version="\\
-gst123 config.status 0.3.1
+gst123 config.status 0.3.3
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"

gst123-0.3.1.tar.bz2/configure.ac -> gst123-0.3.3.tar.bz2/configure.ac Changed

@@ -1,4 +1,4 @@
-AC_INIT(gst123, 0.3.1)
+AC_INIT(gst123, 0.3.3)
 AC_CONFIG_SRCDIR(src/gst123.cc)
 AC_CONFIG_HEADER(config.h)
 AC_CONFIG_AUX_DIR(build-aux)
@@ -50,12 +50,28 @@
 AM_MAINTAINER_MODE
 
 dnl
-dnl Define package requirements.
+dnl We need gstreamer-0.10 or gstreamer-1.0
 dnl
 AC_DEFUN(AC_GSTREAMER_REQUIREMENTS,
 
-    dnl We need GLib with friends
-    PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10)
+    dnl gstreamer-1.0 development package installed?
+    PKG_CHECK_MODULES(GSTREAMER_1_0, gstreamer-1.0, GST_1_0=1, GST_1_0=0)
+
+    if test x$GST_1_0 = x1; then
+      AC_MSG_NOTICE(Building gst123 using gstreamer version 1.0)
+
+      PKG_CHECK_MODULES(GSTREAMER, gstreamer-1.0 gstreamer-base-1.0 gstreamer-video-1.0)
+    else
+      dnl gstreamer-0.10 development package installed?
+      PKG_CHECK_MODULES(GSTREAMER_0_10, gstreamer-0.10, GST_0_10=1, GST_0_10=0)
+
+      if test x$GST_0_10 = x1; then
+        AC_MSG_NOTICE(Building gst123 using gstreamer version 0.10)
+        PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10 gstreamer-base-0.10 gstreamer-interfaces-0.10 gstreamer-video-0.10)
+      else
+        AC_MSG_ERROR(Neither gstreamer-0.10 nor gstreamer-1.0 was found using pkg-config.)
+      fi
+    fi
     AC_SUBST(GSTREAMER_CFLAGS)
     AC_SUBST(GSTREAMER_LIBS)
 )
@@ -66,7 +82,7 @@
 AC_DEFUN(AC_GSTREAMER_GTK_REQUIREMENTS,
 
     dnl We need GLib with friends
-    PKG_CHECK_MODULES(GSTREAMER_GTK, gstreamer-base-0.10 gtk+-2.0 gstreamer-interfaces-0.10 gstreamer-video-0.10)
+    PKG_CHECK_MODULES(GSTREAMER_GTK, gtk+-2.0)
     AC_SUBST(GSTREAMER_GTK_CFLAGS)
     AC_SUBST(GSTREAMER_GTKLIBS)
 )

gst123-0.3.1.tar.bz2/docs/Makefile.in -> gst123-0.3.3.tar.bz2/docs/Makefile.in Changed

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15,23 +15,6 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\\ \	*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -67,11 +50,6 @@
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -126,6 +104,10 @@
 ECHO_T = @ECHO_T@
 EXEEXT = @EXEEXT@
 GROFF = @GROFF@
+GSTREAMER_0_10_CFLAGS = @GSTREAMER_0_10_CFLAGS@
+GSTREAMER_0_10_LIBS = @GSTREAMER_0_10_LIBS@
+GSTREAMER_1_0_CFLAGS = @GSTREAMER_1_0_CFLAGS@
+GSTREAMER_1_0_LIBS = @GSTREAMER_1_0_LIBS@
 GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
 GSTREAMER_GTKLIBS = @GSTREAMER_GTKLIBS@
 GSTREAMER_GTK_CFLAGS = @GSTREAMER_GTK_CFLAGS@
@@ -247,18 +229,11 @@
 $(am__aclocal_m4_deps):
 install-man1: $(dist_man_MANS)
 	@$(NORMAL_INSTALL)
-	@list1=''; \
-	list2='$(dist_man_MANS)'; \
-	test -n "$(man1dir)" \
-	  && test -n "`echo $$list1$$list2`" \
-	  || exit 0; \
-	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
-	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
-	{ for i in $$list1; do echo "$$i"; done;  \
-	if test -n "$$list2"; then \
-	  for i in $$list2; do echo "$$i"; done \
-	    | sed -n '/\.1a-z*$$/p'; \
-	fi; \
+	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+	@list=''; test -n "$(man1dir)" || exit 0; \
+	{ for i in $$list; do echo "$$i"; done; \
+	l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.1a-z*$$/p'; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \

gst123-0.3.1.tar.bz2/docs/gst123.1 -> gst123-0.3.3.tar.bz2/docs/gst123.1 Changed

@@ -1,4 +1,4 @@
-.TH "GST123" "1" "2012\-04\-20" "Revision 716" "gst123 Manual Page"
+.TH "GST123" "1" "2013\-04\-18" "Revision 921" "gst123 Manual Page"
 
 .SH NAME
 
@@ -60,6 +60,10 @@
 Show a list of available audio visualization plugins which can be used with the -v option.
 .PP
 .TP
+\fB-k\fR \fI<n>\fR, \fB--skip\fR \fI<n>\fR
+Skip the first 'n' seconds of each file.
+.PP
+.TP
 \fB-q\fR, \fB--quiet\fR
 Don't display any messages (title, codec, ui feedback).
 .PP
@@ -139,6 +143,14 @@
 The ALSA driver; when used without argument (as in -a alsa), the ALSA driver uses the default device. To select an ALSA device, its possible to use for example alsa=hw:1 (which will use the hw:1 ALSA device).
 .PP
 .TP
+\fBoss\fR=\fI<device>\fR
+The OSS driver; when used without argument (as in -a oss), the OSS driver uses the default device. The device can be specified using for example oss=/dev/dsp1 (which would use the OSS device /dev/dsp1).
+.PP
+.TP
+\fBpulse\fR=\fI<device>\fR
+The PulseAudio driver. This driver optionally accepts a device name using the pulse=\fI<device>\fR syntax.
+.PP
+.TP
 \fBjack\fR
 The JACK driver. Device selection is not supported in this case.
 .PP
@@ -146,10 +158,6 @@
 \fBnone\fR
 Dummy output driver, will not output any audio.
 .PP
-.TP
-\fBoss\fR=\fI<device>\fR
-The OSS driver; when used without argument (as in -a oss), the OSS driver uses the default device. The device can be specified using for example oss=/dev/dsp1 (which would use the OSS device /dev/dsp1).
-.PP
 
 .SH SEE ALSO

gst123-0.3.1.tar.bz2/src/Makefile.am -> gst123-0.3.3.tar.bz2/src/Makefile.am Changed

gst123-0.3.1.tar.bz2/src/Makefile.in -> gst123-0.3.3.tar.bz2/src/Makefile.in Changed

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,23 +16,6 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\\ \	*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -69,7 +52,7 @@
 	iostream.$(OBJEXT) networkstream.$(OBJEXT) \
 	filestream.$(OBJEXT) consolestream.$(OBJEXT) \
 	httpstream.$(OBJEXT) visualization.$(OBJEXT) msg.$(OBJEXT) \
-	typefinder.$(OBJEXT)
+	typefinder.$(OBJEXT) compat.$(OBJEXT)
 gst123_OBJECTS = $(am_gst123_OBJECTS)
 am__DEPENDENCIES_1 =
 gst123_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -107,11 +90,6 @@
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(gst123_SOURCES)
 DIST_SOURCES = $(gst123_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -137,6 +115,10 @@
 ECHO_T = @ECHO_T@
 EXEEXT = @EXEEXT@
 GROFF = @GROFF@
+GSTREAMER_0_10_CFLAGS = @GSTREAMER_0_10_CFLAGS@
+GSTREAMER_0_10_LIBS = @GSTREAMER_0_10_LIBS@
+GSTREAMER_1_0_CFLAGS = @GSTREAMER_1_0_CFLAGS@
+GSTREAMER_1_0_LIBS = @GSTREAMER_1_0_LIBS@
 GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
 GSTREAMER_GTKLIBS = @GSTREAMER_GTKLIBS@
 GSTREAMER_GTK_CFLAGS = @GSTREAMER_GTK_CFLAGS@
@@ -226,7 +208,8 @@
                  options.cc options.h microconf.cc microconf.h configfile.cc configfile.h \
 		 uri.cc playlist.cc m3uparser.cc plsparser.cc uri.h playlist.h m3uparser.h plsparser.h \
 		 iostream.cc iostream.h networkstream.cc filestream.cc consolestream.cc \
-		 httpstream.cc visualization.h visualization.cc msg.h msg.cc typefinder.h typefinder.cc
+		 httpstream.cc visualization.h visualization.cc msg.h msg.cc typefinder.h typefinder.cc \
+                 compat.h compat.cc
 
 gst123_LDADD = $(GSTREAMER_LIBS) $(GSTREAMER_GTK_LIBS) $(NCURSES_LIBS)
 all: all-am
@@ -265,11 +248,8 @@
 $(am__aclocal_m4_deps):
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
-	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
 	while read p p1; do if test -f $$p; \
@@ -313,6 +293,7 @@
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/configfile.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/consolestream.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filestream.Po@am__quote@

gst123-0.3.3.tar.bz2/src/compat.cc Added

@@ -0,0 +1,207 @@
+/* GST123 - GStreamer based command line media player
+ * Copyright (C) 2013 Stefan Westerfeld
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include "compat.h"
+
+#include <gst/video/video.h>
+
+#if GST_CHECK_VERSION(1,0,0)
+#include <gst/video/videooverlay.h>
+#else
+#include <gst/interfaces/xoverlay.h>
+#endif
+
+using namespace Gst123;
+using Compat::IteratorFunc;
+
+struct IteratorOp
+{
+  IteratorFunc  func;
+  void         *user_data;
+};
+
+#if GST_CHECK_VERSION(1,0,0)
+
+bool
+Compat::element_query_position (GstElement *element, GstFormat format, gint64 *cur_pos)
+{
+  return gst_element_query_position (element, format, cur_pos);
+}
+
+bool
+Compat::element_query_duration (GstElement *element, GstFormat format, gint64 *cur_pos)
+{
+  return gst_element_query_duration (element, format, cur_pos);
+}
+
+bool
+Compat::video_get_size (GstPad *pad, int *width, int *height)
+{
+  bool result = false;
+
+  if (GstCaps *caps = gst_pad_get_current_caps (pad))
+    {
+      GstVideoInfo info;
+
+      gst_video_info_init (&info);
+      // get video size (if any)
+      if (gst_video_info_from_caps (&info, caps))
+        {
+          *width = info.width;
+          *height = info.height;
+
+          result = true;
+        }
+
+      gst_caps_unref (caps);
+    }
+  return result;
+}
+
+static void
+call_op_func (const GValue *evalue, gpointer user_data)
+{
+  GstElement *element = GST_ELEMENT (g_value_get_object (evalue));
+  IteratorOp *op = (IteratorOp *) user_data;
+  op->func (element, op->user_data);
+}
+
+void
+Compat::iterator_foreach (GstIterator *iterator, IteratorFunc func, gpointer user_data)
+{
+  IteratorOp op;
+  op.func = func;
+  op.user_data = user_data;
+  gst_iterator_foreach (iterator, call_op_func, &op);
+}
+
+void
+Compat::video_overlay_set_window_handle (GstMessage *msg, guintptr id)
+{
+  gst_video_overlay_set_window_handle (GST_VIDEO_OVERLAY (GST_MESSAGE_SRC (msg)), id);
+}
+
+GstElement*
+Compat::create_playbin (const char *name)
+{
+  return gst_element_factory_make ("playbin", name);
+}
+
+bool
+Compat::is_stream_start_message (GstMessage *msg)
+{
+  return GST_MESSAGE_TYPE (msg) == GST_MESSAGE_STREAM_START;
+}
+
+GstCaps*
+Compat::pad_get_current_caps (GstPad *pad)
+{
+  return gst_pad_get_current_caps (pad);
+}
+
+bool
+Compat::is_video_overlay_prepare_window_handle_message (GstMessage *msg)
+{
+  return gst_is_video_overlay_prepare_window_handle_message (msg);
+}
+
+GstRegistry*
+Compat::registry_get()
+{
+  return gst_registry_get();
+}
+
+
+#else
+
+bool
+Compat::element_query_position (GstElement *element, GstFormat format, gint64 *cur_pos)
+{
+  return gst_element_query_position (element, &format, cur_pos);
+}
+
+bool
+Compat::element_query_duration (GstElement *element, GstFormat format, gint64 *cur_pos)
+{
+  return gst_element_query_duration (element, &format, cur_pos);
+}
+
+bool
+Compat::video_get_size (GstPad *pad, int *width, int *height)
+{
+  return gst_video_get_size (GST_PAD (pad), width, height);
+}
+
+static void
+call_op_func (gpointer eptr, gpointer user_data)
+{
+  GstElement *element = GST_ELEMENT (eptr);
+  IteratorOp *op = (IteratorOp *) user_data;
+  op->func (element, op->user_data);
+}
+
+void
+Compat::iterator_foreach (GstIterator *iterator, IteratorFunc func, gpointer user_data)
+{
+  IteratorOp op;
+  op.func = func;
+  op.user_data = user_data;
+  gst_iterator_foreach (iterator, call_op_func, &op);
+}
+
+void
+Compat::video_overlay_set_window_handle (GstMessage *msg, guintptr id)
+{
+  gst_x_overlay_set_xwindow_id (GST_X_OVERLAY (GST_MESSAGE_SRC (msg)), id);
+}
+
+GstElement*
+Compat::create_playbin (const char *name)
+{
+  return gst_element_factory_make ("playbin2", name);
+}
+
+bool
+Compat::is_stream_start_message (GstMessage *msg)
+{
+  return GST_MESSAGE_TYPE (msg) == GST_MESSAGE_ELEMENT &&
+         gst_structure_has_name (msg->structure, "playbin2-stream-changed");
+}
+
+GstCaps*
+Compat::pad_get_current_caps (GstPad *pad)
+{
+  return gst_pad_get_negotiated_caps (pad);
+}
+
+bool
+Compat::is_video_overlay_prepare_window_handle_message (GstMessage *msg)
+{
+  return GST_MESSAGE_TYPE (msg) == GST_MESSAGE_ELEMENT &&
+         gst_structure_has_name (msg->structure, "prepare-xwindow-id");
+}
+
+GstRegistry*
+Compat::registry_get()
+{
+  return gst_registry_get_default();
+}
+
+
+#endif

gst123-0.3.3.tar.bz2/src/compat.h Added

@@ -0,0 +1,50 @@
+/* GST123 - GStreamer based command line media player
+ * Copyright (C) 2013 Stefan Westerfeld
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GST123_COMPAT__
+#define __GST123_COMPAT__
+
+#include <gst/gst.h>
+
+namespace Gst123
+{
+
+namespace Compat
+{
+
+typedef void (*IteratorFunc) (GstElement *element, gpointer user_data);
+
+bool element_query_position (GstElement *element, GstFormat format, gint64 *cur_pos);
+bool element_query_duration (GstElement *element, GstFormat format, gint64 *cur_pos);
+bool video_get_size (GstPad *pad, int *width, int *height);
+bool is_video_overlay_prepare_window_handle_message (GstMessage *msg);
+bool is_stream_start_message (GstMessage *msg);
+
+void iterator_foreach (GstIterator *iterator, IteratorFunc func, gpointer user_data);
+void video_overlay_set_window_handle (GstMessage *msg, guintptr id);
+
+GstElement* create_playbin (const char *name);
+GstCaps *pad_get_current_caps (GstPad *pad);
+GstRegistry *registry_get();
+
+}
+
+}
+
+#endif

gst123-0.3.1.tar.bz2/src/gst123.cc -> gst123-0.3.3.tar.bz2/src/gst123.cc Changed

@@ -18,7 +18,6 @@
  * Boston, MA 02111-1307, USA.
  */
 #include <gst/gst.h>
-#include <gst/interfaces/xoverlay.h>
 #include <gst/video/video.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
@@ -36,6 +35,7 @@
 #include "visualization.h"
 #include "msg.h"
 #include "typefinder.h"
+#include "compat.h"
 #include <vector>
 #include <string>
 #include <list>
@@ -97,13 +97,42 @@
   return result;
 }
 
+static string
+get_basename (const string& path)
+{
+  char *basename_c = g_path_get_basename (path.c_str());
+  string result = basename_c;
+  g_free (basename_c);
+
+  return result;
+}
+
 void
-force_aspect_ratio (gpointer element, gpointer userdata)
+force_aspect_ratio (GstElement *element, gpointer userdata)
 {
   if (g_object_class_find_property (G_OBJECT_GET_CLASS (G_OBJECT (element)), "force-aspect-ratio"))
     g_object_set (G_OBJECT (element), "force-aspect-ratio", TRUE, NULL);
 }
 
+static bool
+filename2uri (string& uri)
+{
+  GError *err = NULL;
+
+  char *xuri = g_filename_to_uri (uri.c_str(), NULL, &err);
+  uri = xuri;
+  g_free (xuri);
+
+  if (err != NULL)
+    {
+      g_critical ("Unable to convert to URI: %s", err->message);
+      g_error_free (err);
+
+      return false;
+    }
+  return true;
+}
+
 struct Options options;
 
 struct Player : public KeyHandler
@@ -143,11 +172,13 @@
   void
   add_uri (string uri)
   {
-    if (uri.find (":/") == uri.npos)
+    if (!gst_uri_is_valid (uri.c_str()))
       {
 	if (!g_path_is_absolute (uri.c_str()))
 	  uri = g_get_current_dir() + string (G_DIR_SEPARATOR + uri);
-	uri = "file://" + uri;
+
+        if (!filename2uri (uri))
+          return;
       }
     uris.push_back (uri);
   }
@@ -277,7 +308,7 @@
               {
                 Msg::print ("\nPlaying %s\n", uri.c_str());
 
-                gtk_interface.set_title (g_basename (uri.c_str()));
+                gtk_interface.set_title (get_basename (uri));
 
                 video_size_width = 0;
                 video_size_height = 0;
@@ -286,6 +317,12 @@
                 g_object_set (G_OBJECT (playbin), "uri", uri.c_str(), NULL);
                 gst_element_set_state (playbin, GST_STATE_PLAYING);
 
+                if (options.skip > 0)
+                  {
+                    // block until state changed and seek to skip position
+                    gst_element_get_state (playbin, NULL, NULL, GST_CLOCK_TIME_NONE);
+                    seek (options.skip * GST_SECOND);
+                  }
                 return; // -> done
               }
           }
@@ -324,9 +361,8 @@
   void
   relative_seek (double displacement)
   {
-    GstFormat fmt = GST_FORMAT_TIME;
-    gint64    cur_pos;
-    gst_element_query_position (playbin, &fmt, &cur_pos);
+    gint64 cur_pos;
+    Compat::element_query_position (playbin, GST_FORMAT_TIME, &cur_pos);
 
     double new_pos_sec = cur_pos * (1.0 / GST_SECOND) + displacement;
     seek (new_pos_sec * GST_SECOND);
@@ -440,27 +476,27 @@
 static void
 caps_set_cb (GObject *pad, GParamSpec *pspec, class Player* player)
 {
-  if (GstCaps *caps = gst_pad_get_negotiated_caps (GST_PAD (pad)))
+  if (GstCaps *caps = Compat::pad_get_current_caps (GST_PAD (pad)))
     {
-      // get video size (if any)
-      gst_video_get_size (GST_PAD (pad), &player->video_size_width, &player->video_size_height);
-
-      // resize window to match video size
-      player->normal_size();
-
+      if (Compat::video_get_size (GST_PAD (pad), &player->video_size_width, &player->video_size_height))
+        {
+          // resize window to match video size
+          player->normal_size();
+        }
       gst_caps_unref (caps);
     }
 }
 
 static void
-collect_element (gpointer element,
+collect_element (GstElement *element,
                  gpointer list_ptr)
 {
   /* seems that if we use push_front, the pipeline gets displayed in the
    * right order; but I don't know if thats a guarantee of an accident
    */
   list<GstElement *>& elements = *(list<GstElement*> *)list_ptr;
-  elements.push_front (GST_ELEMENT (element));
+  gst_object_ref (element);
+  elements.push_front (element);
 }
 
 static string
@@ -523,56 +559,63 @@
 	if (options.verbose && player.last_state != GST_STATE_PLAYING && state == GST_STATE_PLAYING)
 	  {
 	    list<GstElement *> elements;
+
 	    GstIterator *iterator = gst_bin_iterate_recurse (GST_BIN (player.playbin));
-	    gst_iterator_foreach (iterator, collect_element, &elements);
+	    Compat::iterator_foreach (iterator, collect_element, &elements);
+
 	    string print_elements = collect_print_elements (GST_ELEMENT (player.playbin), elements);
 	    player.overwrite_time_display();
 	    Msg::print ("\ngstreamer pipeline contains: %s\n", print_elements.c_str());
+
+            list<GstElement *>::iterator it;
+            for (it = elements.begin(); it != elements.end(); it++)
+              gst_object_unref (*it);
 	  }
 	player.last_state = state;
       }
       break;
     case GST_MESSAGE_ELEMENT:
       {
-        if (gst_structure_has_name (message->structure, "prepare-xwindow-id") && gtk_interface.init_ok())
+        if (Compat::is_video_overlay_prepare_window_handle_message (message) && gtk_interface.init_ok())
           {
             // show gtk window to display video in
             gtk_interface.show();
-            gst_x_overlay_set_xwindow_id (GST_X_OVERLAY (GST_MESSAGE_SRC (message)),
-                                          GDK_WINDOW_XWINDOW (gtk_interface.window()->window));
-          }
-        else if (gst_structure_has_name (message->structure, "playbin2-stream-changed"))
-          {
-            // try to figure out the video size
-            GstElement *videosink = NULL;
-            g_object_get (G_OBJECT (player.playbin), "video-sink", &videosink, NULL);
-            if (videosink && !options.novideo)
-              {
-                // Find an sink element that has "force-aspect-ratio" property & set it
-                // to TRUE:
-                GstIterator *iterator = gst_bin_iterate_sinks (GST_BIN (videosink));
-                gst_iterator_foreach (iterator, force_aspect_ratio, NULL);
-
-                if (GstPad* pad = gst_element_get_static_pad (videosink, "sink"))
-                  {
-                    if (GstCaps *caps = gst_pad_get_negotiated_caps (pad))
-                      {
-                        caps_set_cb (G_OBJECT (pad), NULL, &player);
-                        gst_caps_unref (caps);
-                      }
-
-                    g_signal_connect (pad, "notify::caps", G_CALLBACK (caps_set_cb), &player);
-                    gst_object_unref (GST_OBJECT (pad));
-                  }
-                gst_object_unref (GST_OBJECT (videosink));
-              }
+            Compat::video_overlay_set_window_handle (message, GDK_WINDOW_XWINDOW (gtk_interface.window()->window));
           }
       }
+      break;
     default:
       /* unhandled message */
       break;
   }
 
+  if (Compat::is_stream_start_message (message))
+    {
+      // try to figure out the video size
+      GstElement *videosink = NULL;
+      g_object_get (G_OBJECT (player.playbin), "video-sink", &videosink, NULL);
+      if (videosink && !options.novideo)
+        {
+          // Find an sink element that has "force-aspect-ratio" property & set it
+          // to TRUE:
+          GstIterator *iterator = gst_bin_iterate_sinks (GST_BIN (videosink));
+          Compat::iterator_foreach (iterator, force_aspect_ratio, NULL);
+
+          if (GstPad* pad = gst_element_get_static_pad (videosink, "sink"))
+            {
+              if (GstCaps *caps = Compat::pad_get_current_caps (pad))
+                {
+                  caps_set_cb (G_OBJECT (pad), NULL, &player);
+                  gst_caps_unref (caps);
+                }
+
+              g_signal_connect (pad, "notify::caps", G_CALLBACK (caps_set_cb), &player);
+              gst_object_unref (GST_OBJECT (pad));
+            }
+          gst_object_unref (GST_OBJECT (videosink));
+        }
+    }
+
   /* remove message from the queue */
   return TRUE;
 }
@@ -605,12 +648,12 @@
 cb_print_position (gpointer *data)
 {
   Player& player = *(Player *)data;
-  GstFormat fmt = GST_FORMAT_TIME;
   gint64 pos, len;
 
   player.display_tags();
 
-  if (gst_element_query_position (player.playbin, &fmt, &pos) && gst_element_query_duration (player.playbin, &fmt, &len))
+  if (Compat::element_query_position (player.playbin, GST_FORMAT_TIME, &pos) &&
+      Compat::element_query_duration (player.playbin, GST_FORMAT_TIME, &len))
     {
       GTimeVal tv_pos, tv_len;
       GST_TIME_TO_TIMEVAL (pos, tv_pos);
@@ -640,12 +683,24 @@
       else
         blanks += "         ";
       Msg::print ("%s%s\r", status.c_str(), blanks.c_str());
+      Msg::flush();
     }
 
   /* call me again */
   return TRUE;
 }
 
+static gboolean
+idle_start_player (gpointer *data)
+{
+  Player& player = *(Player *)data;
+
+  player.play_next();
+
+  /* do not call me again */
+  return FALSE;
+}
+
 
 static inline bool
 is_directory (const string& path)
@@ -786,9 +841,6 @@
   Player player;
 
   /* Setup options */
-  if (!g_thread_supported())
-    g_thread_init (NULL);
-
   options.parse (argc, argv);
 
   /* init GStreamer */
@@ -842,7 +894,7 @@
         printf ("%s", options.usage.c_str());
       return -1;
     }
-  player.playbin = gst_element_factory_make ("playbin2", "play");
+  player.playbin = Compat::create_playbin ("play");
   if (options.novideo)
     {
       GstElement *fakesink = gst_element_factory_make ("fakesink", "novid");
@@ -869,6 +921,8 @@
             audio_sink = gst_element_factory_make ("osssink", "ossaudioout");
           else if (strcmp (audio_driver, "jack") == 0)
             audio_sink = gst_element_factory_make ("jackaudiosink", "jackaudioout");
+          else if (strcmp (audio_driver, "pulse") == 0)
+            audio_sink = gst_element_factory_make ("pulsesink", "pulseaudioout");
           else if (strcmp (audio_driver, "none") == 0)
             audio_sink = gst_element_factory_make ("fakesink", "fakeaudioout");
           else
@@ -886,9 +940,9 @@
     }
   gst_bus_add_watch (gst_pipeline_get_bus (GST_PIPELINE (player.playbin)), my_bus_callback, &player);
   g_timeout_add (130, (GSourceFunc) cb_print_position, &player);
+  g_idle_add ((GSourceFunc) idle_start_player, &player);
   signal (SIGINT, sigint_handler);
   g_usignal_add (SIGINT, sigint_usr_code, &player);
-  player.play_next();
 
   /* now run */
   terminal.init (player.loop, &player);

gst123-0.3.1.tar.bz2/src/msg.cc -> gst123-0.3.3.tar.bz2/src/msg.cc Changed

gst123-0.3.1.tar.bz2/src/msg.h -> gst123-0.3.3.tar.bz2/src/msg.h Changed

gst123-0.3.1.tar.bz2/src/options.cc -> gst123-0.3.3.tar.bz2/src/options.cc Changed

gst123-0.3.1.tar.bz2/src/options.h -> gst123-0.3.3.tar.bz2/src/options.h Changed

gst123-0.3.1.tar.bz2/src/playlist.cc -> gst123-0.3.3.tar.bz2/src/playlist.cc Changed

gst123-0.3.1.tar.bz2/src/playlist.h -> gst123-0.3.3.tar.bz2/src/playlist.h Changed

gst123-0.3.1.tar.bz2/src/typefinder.cc -> gst123-0.3.3.tar.bz2/src/typefinder.cc Changed

@@ -31,16 +31,16 @@
   done = false;
 
   m_probability = 0;
-  mutex = g_mutex_new();
-  cond = g_cond_new();
+  g_mutex_init (&mutex);
+  g_cond_init (&cond);
 
   run (filename);
 }
 
 TypeFinder::~TypeFinder()
 {
-  g_cond_free (cond);
-  g_mutex_free (mutex);
+  g_cond_clear (&cond);
+  g_mutex_clear (&mutex);
 }
 
 void
@@ -54,10 +54,10 @@
       m_probability = probability;
     }
 
-  g_mutex_lock (mutex);
+  g_mutex_lock (&mutex);
   done = true;
-  g_cond_signal (cond);
-  g_mutex_unlock (mutex);
+  g_cond_signal (&cond);
+  g_mutex_unlock (&mutex);
 }
 
 void
@@ -93,15 +93,17 @@
   gst_element_link_many (filesrc, typefind, fakesink, NULL);
   gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_PLAYING);
 
-  g_mutex_lock (mutex);
-  if (!done)
+  g_mutex_lock (&mutex);
+  gint64 end_time = g_get_monotonic_time() + 500 * G_TIME_SPAN_MILLISECOND;
+  while (!done)
     {
-      GTimeVal timeout_time;
-      g_get_current_time (&timeout_time);
-      g_time_val_add (&timeout_time, 500 * 1000);
-      g_cond_timed_wait (cond, mutex, &timeout_time);
+      if (!g_cond_wait_until (&cond, &mutex, end_time))
+        {
+          // timeout occurred
+          break;
+        }
     }
-  g_mutex_unlock (mutex);
+  g_mutex_unlock (&mutex);
 
   /* unset */
   gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_NULL);

gst123-0.3.1.tar.bz2/src/typefinder.h -> gst123-0.3.3.tar.bz2/src/typefinder.h Changed

gst123-0.3.1.tar.bz2/src/visualization.cc -> gst123-0.3.3.tar.bz2/src/visualization.cc Changed

Overview

Request 20 (accepted)

Request History