Update of /cvsroot/xine/gnome-xine/src
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9266/src
Modified Files:
gtkvideo.c http.c info_widgets.c play_item.c
Log Message:
Resync for release.
Index: gtkvideo.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/gtkvideo.c,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- gtkvideo.c 9 Dec 2006 14:05:29 -0000 1.130
+++ gtkvideo.c 16 Dec 2006 23:42:20 -0000 1.131
@@ -1503,10 +1503,10 @@
if (args > next)
args = NULL;
- logprintf ("plugin: %p %.*s\n", plugins, (args?:next) - plugins,
plugins);
+ logprintf ("plugin: %p %.*s\n", plugins, (int)((args?:next) - plugins),
plugins);
if (args)
logprintf ("args : %p %.*s\n", args ? args + 1 : NULL,
- args ? next - args - 1 : 0, args ? args + 1 : NULL);
+ (int)(args ? next - args - 1 : 0), args ? args + 1 : NULL);
logprintf ("next : %p\n", next);
name = g_strndup (plugins, (args ? : next) - plugins);
@@ -1976,10 +1976,7 @@
&& xine_get_param (gtv->priv->stream, XINE_PARAM_SPEED)))
return FALSE;
- gtk_video_private_t *priv = gtv->priv;
- Display *display;
-
- display = gtv_get_xdisplay (gtv);
+ Display *display = gtv_get_xdisplay (gtv);
XLockDisplay (display);
#ifdef HAVE_DPMS_EXTENSION
union { int i; CARD16 c; } dummy;
@@ -1989,6 +1986,7 @@
DPMSForceLevel (display, DPMSModeOn);
#endif
#ifdef HAVE_XTESTEXTENSION
+ gtk_video_private_t *priv = gtv->priv;
if (priv->have_xtest == True)
{
static unsigned char flip = 0;
Index: http.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/http.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- http.c 9 Dec 2006 14:05:29 -0000 1.35
+++ http.c 16 Dec 2006 23:42:20 -0000 1.36
@@ -581,7 +581,7 @@
}
}
- logprintf ("http: got %d bytes of content\n%s", total, buf);
+ logprintf ("http: got %zd bytes of content\n%s", total, buf);
close (http->fh);
@@ -603,7 +603,7 @@
ssize_t http_peek (const char *url, char *buffer, size_t buffer_size,
char *mime_type, size_t mime_type_size)
{
- logprintf ("http: attempt to download %u bytes from %s\n", buffer_size, url);
+ logprintf ("http: attempt to download %zu bytes from %s\n", buffer_size,
url);
http_t *http = http_open (url);
if (!http)
Index: info_widgets.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/info_widgets.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- info_widgets.c 9 Dec 2006 14:05:29 -0000 1.22
+++ info_widgets.c 16 Dec 2006 23:42:20 -0000 1.23
@@ -384,18 +384,19 @@
time.length[0] = time.current[0] = 0;
+ xine_cfg_entry_t entry;
+ gboolean state = priv->data ^
+ !!(xine_config_lookup_entry
+ (xine, "gui.show_time_remaining", &entry)
+ && entry.num_value);
+ gtk_widget_set_state (widget, state ? GTK_STATE_ACTIVE : GTK_STATE_NORMAL);
+
if (xine_get_status (stream) == XINE_STATUS_PLAY && !playlist_showing_logo
())
{
if (!xine_get_pos_length (stream, &pos_stream, &pos_time, &length_time))
pos_stream = pos_time = length_time = 0;
- xine_cfg_entry_t entry;
- gboolean state = priv->data ^
- !!(xine_config_lookup_entry
- (xine, "gui.show_time_remaining", &entry)
- && entry.num_value);
- gtk_widget_set_state (widget, state ? GTK_STATE_ACTIVE : GTK_STATE_NORMAL);
if (state)
pos_time = length_time - pos_time;
@@ -410,6 +411,8 @@
xine_get_stream_info (stream, XINE_STREAM_INFO_SEEKABLE)
? _("??:??:??") : _("live"));
}
+ else
+ strcpy (time.current, "â¢");
if (priv->line[1])
{
gtk_label_set_text (GTK_LABEL (priv->line[0]), time.current);
Index: play_item.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/play_item.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- play_item.c 9 Dec 2006 14:05:30 -0000 1.51
+++ play_item.c 16 Dec 2006 23:42:20 -0000 1.52
@@ -272,7 +272,7 @@
{
/* DEPRECATED; for compatibility with older versions of gxine */
play_item->start_time = xml_parser_get_property_int (node, "START", 0);
- logprintf ("play_item: start time = %lf s\n", play_item->start_time);
+ logprintf ("play_item: start time = %d s\n", play_item->start_time);
}
/*
else if (!strcasecmp (node->name, "DURATION"))
-------------------------------------------------------------------------
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
