summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2007-10-01 13:52:51 +0000
committerBastien Nocera <hadess@src.gnome.org>2007-10-01 13:52:51 +0000
commitf59ede4c52354662287add0120d1f8f6b6d1ae5f (patch)
treeb82e7e4ceb5cd8333d1e972d4a17cb483f427407
parent37aea954ce266686703db5b8c77d0bdc2fd767db (diff)
More float/double problems, especially in the browser viewer, which was
2007-10-01 Bastien Nocera <hadess@hadess.net> * browser-plugin/totem-plugin-viewer.c: (on_tick): * src/backend/bacon-video-widget-xine.c: (bacon_video_widget_tick_send): More float/double problems, especially in the browser viewer, which was causing the seekbar to yo-yo with some streams svn path=/trunk/; revision=4738
-rw-r--r--ChangeLog8
-rw-r--r--browser-plugin/totem-plugin-viewer.c2
-rw-r--r--src/backend/bacon-video-widget-xine.c8
3 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 21f6706a..2fb9e928 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2007-10-01 Bastien Nocera <hadess@hadess.net>
+ * browser-plugin/totem-plugin-viewer.c: (on_tick):
+ * src/backend/bacon-video-widget-xine.c:
+ (bacon_video_widget_tick_send): More float/double problems,
+ especially in the browser viewer, which was causing the seekbar
+ to yo-yo with some streams
+
+2007-10-01 Bastien Nocera <hadess@hadess.net>
+
* src/totem-uri.c: (totem_uri_get_subtitle_for_uri),
(totem_uri_get_subtitle_in_subdir), (totem_uri_get_subtitle_uri):
Look for subtitles in the subtitles/ directory as well
diff --git a/browser-plugin/totem-plugin-viewer.c b/browser-plugin/totem-plugin-viewer.c
index 561b4f5b..5bf36a98 100644
--- a/browser-plugin/totem-plugin-viewer.c
+++ b/browser-plugin/totem-plugin-viewer.c
@@ -1557,7 +1557,7 @@ static void
on_tick (GtkWidget *bvw,
gint64 current_time,
gint64 stream_length,
- float current_position,
+ double current_position,
gboolean seekable,
TotemEmbedded *emb)
{
diff --git a/src/backend/bacon-video-widget-xine.c b/src/backend/bacon-video-widget-xine.c
index 005e3a32..ac79fbfd 100644
--- a/src/backend/bacon-video-widget-xine.c
+++ b/src/backend/bacon-video-widget-xine.c
@@ -2004,7 +2004,7 @@ static gboolean
bacon_video_widget_tick_send (BaconVideoWidget *bvw)
{
int current_time, stream_length, current_position;
- float current_position_f;
+ double current_position_f;
gboolean ret = TRUE, seekable;
g_return_val_if_fail (bvw->priv->stream != NULL, FALSE);
@@ -2033,16 +2033,16 @@ bacon_video_widget_tick_send (BaconVideoWidget *bvw)
current_time = bvw->priv->seek_dest_time;
if (stream_length == 0)
stream_length = current_time;
- current_position_f = (float) current_time / stream_length;
+ current_position_f = (double) current_time / stream_length;
} else {
/* xine-lib doesn't update current_position if the stream
* isn't seekable */
if ((current_position == 0 || current_position == 65535) && current_time > 0) {
if (stream_length == 0)
stream_length = current_time;
- current_position_f = (float) current_time / stream_length;
+ current_position_f = (double) current_time / stream_length;
} else {
- current_position_f = ((float) current_position) / 65535;
+ current_position_f = ((double) current_position) / 65535;
}
}