Update of /cvsroot/xine/gnome-xine
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5809
Modified Files:
ChangeLog configure.ac gxine.desktop
Log Message:
Resync with hg repository.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/xine/gnome-xine/ChangeLog,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- ChangeLog 12 Nov 2006 14:02:39 -0000 1.212
+++ ChangeLog 9 Dec 2006 14:05:28 -0000 1.213
@@ -6,6 +6,34 @@
* Fixes for when closing the 'about' dialogue box. (Ubuntu bug 64134)
* Fixed a bug which could cause gxine to hang (in X client libs)
during startup if it should try to report an error.
+ * Fixed a bug which would cause millions of errors when trying and
+ failing to display the logo image, e.g. if something which is
+ expected to be present, such as the MPEG elementary stream demuxer,
+ is missing.
+ * Altered gxine.desktop for HIG compliance. (Based on Ubuntu bug 74979)
+ * Avoid the possibility of a few (harmless) warnings during startup.
+ * Correctly display preference items which have instant effects.
+ * Added a simple segfault handler.
+ * Added an option to show time remaining for the current stream
+ instead of time elapsed. This can be toggled temporarily by
+ clicking on the elapsed/remaining time display.
+ * Added --geometry option (standard X-style). While this sets the
+ initial position & size, the size is then overridden by the video.
+ * Added a config item to control whether the display is kept
+ unblanked during *any* playback (with video or visualisation),
+ much as for fullscreen mode. Default is off (unchanged behaviour).
+ * Added tooltips to the post-plugin parameter value widgets.
+ Whether these are translated is up to the post plugin.
+ * Altered the plugin chain windows' preferences buttons so that it's
+ clearer which plugins are being configured.
+ * Replace F10 hard-wiring with usage of gtk-menu-bar-accel.
+ * Don't set the primary selection when copying - this is clipboard
+ territory.
+ * Allow compile-time logo file format selection.
+ Choose between "mpeg" (logo.mpv; needs MPEG elementary demuxer) and
+ "image" (logo.jpg; requires the image demuxer). The default is mpeg.
+ * Added JS playlist.repeat & playlist.random, both with value 'v' and
+ method 'toggle()'.
[dpettenò]
* Fix building on FreeBSD, replace a recursive pthread mutex with
Index: configure.ac
===================================================================
RCS file: /cvsroot/xine/gnome-xine/configure.ac,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- configure.ac 12 Nov 2006 14:02:39 -0000 1.101
+++ configure.ac 9 Dec 2006 14:05:28 -0000 1.102
@@ -1,8 +1,8 @@
AC_PREREQ(2.59)
-AC_INIT(gxine, 0.5.8)
+AC_INIT([gxine], [0.5.8])
AC_CONFIG_SRCDIR([src/main.c])
-AM_CONFIG_HEADER(include/config.h)
+AC_CONFIG_HEADERS([include/config.h])
AM_INIT_AUTOMAKE([1.6 dist-bzip2])
AM_MAINTAINER_MODE
dnl AM_ACLOCAL_INCLUDE(m4)
@@ -284,6 +284,60 @@
AC_SUBST(CPPFLAGS)
AC_SUBST(LDFLAGS)
+HAVE_MPEG="`test -f "$xine_plugin_dir"/xineplug_dmx_mpeg_elem.so && echo yes
|| echo no`"
+HAVE_IMAGE="`test -f "$xine_plugin_dir"/xineplug_dmx_image.so && echo yes ||
echo no`"
+
+AC_MSG_CHECKING([which logo format to use])
+AC_ARG_WITH(logo-format,
+ AS_HELP_STRING(--with-logo-format,
+ [set idle-mode logo format: "mpeg", "image" or
"auto"]),
+ [case "$withval" in
+ mpeg|image|auto)
+ withval="$withval"
+ ;;
+ *)
+ AC_MSG_ERROR([unrecognised logo type])
+ ;;
+ esac],
+ [withval=auto])
+LOGO_FORMAT=''
+logo_sub=''
+while test "$LOGO_FORMAT" = ''; do
+ if test "$withval" = auto; then
+ # preferred is last
+ if test "$HAVE_IMAGE" = yes; then withval=image; fi
+ if test "$HAVE_MPEG" = yes; then withval=mpeg; fi
+ # handle missing-demuxer case
+ if test "$withval" = auto; then
+ AC_MSG_ERROR([no available demuxer for the logo image -
rebuild/reinstall xine-lib?])
+ fi
+ fi
+ case "$withval" in
+ image)
+ if test "$HAVE_IMAGE" = no; then
+ logo_sub="$withval"
+ withval=auto
+ else
+ LOGO_FORMAT=jpg
+ fi
+ ;;
+ mpeg)
+ if test "$HAVE_MPEG" = no; then
+ logo_sub="$withval"
+ withval=auto
+ else
+ LOGO_FORMAT=mpv
+ fi
+ ;;
+ esac
+done
+AC_SUBST(LOGO_FORMAT)
+AC_DEFINE_UNQUOTED(LOGO_FORMAT, "$LOGO_FORMAT", [Set to the logo image format
(mpv or jpg)])
+AC_MSG_RESULT([$withval])
+if test "$logo_sub" != ''; then
+ AC_MSG_WARN([logo format "$logo_sub" cannot be displayed - demuxer not
present])
+fi
+
dnl ---------------------------------------------
dnl Check for lirc
dnl ---------------------------------------------
@@ -293,7 +347,7 @@
dnl Check for GNU getopt_long()
dnl ---------------------------------------------
AC_MSG_CHECKING(for GNU getopt_long)
-AC_TRY_RUN([
+AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <stdio.h>
#include <stdlib.h>
#include <getopt.h>
@@ -313,7 +367,7 @@
;
return 0;
}
- ],
+ ]])],
[AC_MSG_RESULT(yes);
ac_getopt_long=yes;
AC_DEFINE(HAVE_GETOPT_LONG,,[Define this if you have GNU getopt_long()
implemented])],
@@ -460,8 +514,12 @@
AC_ARG_VAR([VENDOR_PKG_VERSION], [vendor build identifier string (default is
the upstream version number, suffixed with "release" or "CVS snapshot")])
POST_VERSION=release
-if test -d CVS || test -d .hg || expr "$PACKAGE_VERSION" : '.*-dev$' \|
"$PACKAGE_VERSION" : '.*-dev-.*$' >/dev/null; then
- test -d CVS && POST_VERSION='CVS snapshot' || POST_VERSION='hg snapshot'
+if test -d .hg || expr "$(basename "$(pwd)")" :
'gxine-[[0123456789abcdef]]\{12\}$' >/dev/null; then
+ POST_VERSION='hg snapshot'
+elif test -d CVS; then
+ POST_VERSION='CVS snapshot'
+elif expr "$PACKAGE_VERSION" : '.*-dev$' \| "$PACKAGE_VERSION" : '.*-dev-.*$'
>/dev/null; then
+ POST_VERSION='dev snapshot'
fi
VENDOR_PKG_VERSION="${VENDOR_PKG_VERSION:-$POST_VERSION}"
AC_MSG_NOTICE([using build identifier: "$VENDOR_PKG_VERSION"])
Index: gxine.desktop
===================================================================
RCS file: /cvsroot/xine/gnome-xine/gxine.desktop,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gxine.desktop 4 Mar 2006 03:04:34 -0000 1.6
+++ gxine.desktop 9 Dec 2006 14:05:28 -0000 1.7
@@ -3,12 +3,12 @@
Encoding=UTF-8
Name=gxine
GenericName=Video Player
-Comment=Play films and songs, or watch digital TV
+Comment=Watch videos or TV and listen to audio in a variety of formats
Exec=gxine
X-MultipleArgs=true
Icon=gxine
Terminal=false
Type=Application
StartupNotify=true
-Categories=GTK;Application;AudioVideo;
+Categories=AudioVideo;GTK;Player;TV;
MimeType=video/mpeg;video/msvideo;video/quicktime;video/x-avi;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;application/x-ogg;application/ogg;audio/x-mp3;audio/x-mpeg;video/x-mpeg;video/x-fli;audio/x-wav;audio/x-mpegurl;audio/x-scpls;audio/x-ms-asx;application/vnd.rn-realmedia;audio/x-real-audio;audio/x-pn-realaudio;application/x-flac;audio/x-flac;application/x-shockwave-flash;audio/mpeg;audio/x-ms-asf;audio/x-m4a;audio/x-ms-wax;video/dv;video/x-anim;video/x-flc;misc/ultravox;application/x-matroska;audio/vnd.rn-realaudio;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-wav;audio/x-pn-windows-acm;image/vnd.rn-realpix;video/vnd.rn-realvideo
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Xine-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
