Author: toshok
Date: 2007-11-21 18:40:26 -0500 (Wed, 21 Nov 2007)
New Revision: 90115
Modified:
trunk/moon/src/ChangeLog
trunk/moon/src/media.cpp
Log:
2007-11-21 Chris Toshok <[EMAIL PROTECTED]>
* media.cpp (MediaElement::UpdateProgress): only set 1 of
DownloadProgressProperty and BufferingProgressProperty. The
former is used if we're playing progressively, the latter if we're
buffering before playing. This fixes the buffering animation on
the halo site.
Modified: trunk/moon/src/ChangeLog
===================================================================
--- trunk/moon/src/ChangeLog 2007-11-21 22:58:20 UTC (rev 90114)
+++ trunk/moon/src/ChangeLog 2007-11-21 23:40:26 UTC (rev 90115)
@@ -1,5 +1,13 @@
2007-11-21 Chris Toshok <[EMAIL PROTECTED]>
+ * media.cpp (MediaElement::UpdateProgress): only set 1 of
+ DownloadProgressProperty and BufferingProgressProperty. The
+ former is used if we're playing progressively, the latter if we're
+ buffering before playing. This fixes the buffering animation on
+ the halo site.
+
+2007-11-21 Chris Toshok <[EMAIL PROTECTED]>
+
* runtime.cpp (Surface::Invalidate): add the int case around the
complete expression to quiet gcc.
Modified: trunk/moon/src/media.cpp
===================================================================
--- trunk/moon/src/media.cpp 2007-11-21 22:58:20 UTC (rev 90114)
+++ trunk/moon/src/media.cpp 2007-11-21 23:40:26 UTC (rev 90115)
@@ -558,13 +558,13 @@
MediaElement::UpdateProgress ()
{
double progress = downloader->GetValue
(Downloader::DownloadProgressProperty)->AsDouble ();
-
- SetValue (MediaElement::DownloadProgressProperty, Value (progress));
-
- // Note: until we start streaming media as we download it,
- // we'll use the downloader progress as the buffering progress
- // too.
- SetValue (MediaElement::BufferingProgressProperty, Value (progress));
+
+ if (false /* XXX if we're playing progressively */) {
+ SetValue (MediaElement::DownloadProgressProperty, Value
(progress));
+ }
+ else {
+ SetValue (MediaElement::BufferingProgressProperty, Value
(progress));
+ }
}
void
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
