# HG changeset patch
# User Darren Salt <[EMAIL PROTECTED]>
# Date 1170536614 0
# Node ID bced04006cac67e2d2eb2eaea22ad8a1833976bf
# Parent 2c7c038a766e59346b0bae8924db4f343990edf2
Show the "broken xine-lib" (no demuxer for the logo image) message at most once.
diff -r bced04006cac67e2d2eb2eaea22ad8a1833976bf -r
2c7c038a766e59346b0bae8924db4f343990edf2 ChangeLog
--- a/ChangeLog Sat Feb 03 21:03:34 2007 +0000
+++ b/ChangeLog Fri Feb 02 17:51:39 2007 +0000
@@ -27,6 +27,8 @@ 0.5.900:2007/??/??
* Brought vo_deinterlace into line with the other two chain objects
by adding the missing property & method.
* Reworked the JS property code somewhat. No user-visible changes.
+ * Only display the "broken xine-lib" message (for when there is no
+ demuxer for the logo image) at most once.
0.5.11: 2007/02/01
[dsalt]
diff -r bced04006cac67e2d2eb2eaea22ad8a1833976bf -r
2c7c038a766e59346b0bae8924db4f343990edf2 src/player.c
--- a/src/player.c Sat Feb 03 21:03:34 2007 +0000
+++ b/src/player.c Fri Feb 02 17:51:39 2007 +0000
@@ -59,6 +59,8 @@ static pthread_t play_thread;
static pthread_t play_thread;
static char *cur_mrl = NULL, *cur_title = NULL;
+static gboolean demuxer_for_logo = TRUE;
+
static __attribute__ ((noreturn)) void *play_exec (void *data)
{
xine_cfg_entry_t entry;
@@ -147,11 +149,20 @@ static __attribute__ ((noreturn)) void *
break;
case XINE_ERROR_NO_DEMUX_PLUGIN:
- display_error (FROM_XINE,
- playlist_showing_logo ()
- ? _("Whoops. You seem to have a broken xine-lib.")
- : _("The xine engine failed to start."),
- _("No demuxer found - stream format not recognised."));
+ if (playlist_showing_logo ())
+ {
+ g_idle_add (infobar_show_metadata, infobars);
+ if (demuxer_for_logo)
+ {
+ demuxer_for_logo = FALSE;
+ display_error (FROM_XINE,
+ _("Whoops. You seem to have a broken xine-lib."),
+ _("No demuxer found - stream format not recognised."));
+ }
+ }
+ else
+ display_error (FROM_XINE, _("The xine engine failed to start."),
+ _("No demuxer found - stream format not recognised."));
break;
case XINE_ERROR_DEMUX_FAILED:
@@ -217,6 +228,9 @@ void player_launch (const char *title, c
cur_mrl = strdup (mrl);
gtk_video_unblank_screen ((GtkVideo *)gtv);
+
+ if (!demuxer_for_logo && playlist_showing_logo ())
+ return;
/* start separate thread, so xine_open will not block ui */
pthread_attr_init (&attr);
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Xine-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
