Author: rolf
Date: 2008-01-25 13:45:29 -0500 (Fri, 25 Jan 2008)
New Revision: 93943
Modified:
trunk/moon/src/ChangeLog
trunk/moon/src/media.h
Log:
* media.h: Add some descriptive comments.
Modified: trunk/moon/src/ChangeLog
===================================================================
--- trunk/moon/src/ChangeLog 2008-01-25 18:44:48 UTC (rev 93942)
+++ trunk/moon/src/ChangeLog 2008-01-25 18:45:29 UTC (rev 93943)
@@ -1,3 +1,7 @@
+2008-01-25 Rolf Bjarne Kvinge <[EMAIL PROTECTED]>
+
+ * media.h: Add some descriptive comments.
+
2008-01-25 Sebastien Pouliot <[EMAIL PROTECTED]>
* shape.cpp: Merge UIElement::InsideClip inside Shape::InsideObject
Modified: trunk/moon/src/media.h
===================================================================
--- trunk/moon/src/media.h 2008-01-25 18:44:48 UTC (rev 93942)
+++ trunk/moon/src/media.h 2008-01-25 18:45:29 UTC (rev 93943)
@@ -204,23 +204,45 @@
};
private:
+ // The current state of the media element.
State state;
// this is used to know what to do after a Buffering state finishes
State previous_state;
+ // we can't do anything until OnLoaded has been called
+ // so track if it has been called, and if we're waiting
+ // for it to be called
+ bool loaded;
bool waiting_for_loaded;
// When enough of a file has been downloaded to try to open
// and buffer it, and the open fails, don't try again.
bool tried_buffering;
+ // Don't try to buffer if the download is already finished.
bool download_complete;
// If SetSource is called with a Downloader that has started,
// disable buffering (since can't get the start of the file).
bool disable_buffering;
+ // Halo seems to require this
+ // set to true the Play () is called before the media has
+ // been opened, and causes Play () to be called when the
+ // media has been loaded.
+ bool play_pending;
+
+ // The position property is not
+ // updated as we're playing, it's updated when
+ // requested in GetValue, and only then the current
+ // position is saved in SetValue.
+ // This should however not cause SetValue's handling
+ // of the position property to do anything, so keep
+ // track of when we're setting the position property
+ // ourselves.
+ bool updating;
+
int64_t buffering_start;
ProgressiveSource *downloaded_file;
@@ -228,9 +250,10 @@
bool recalculate_matrix;
cairo_matrix_t matrix;
- bool updating;
- bool loaded;
- bool play_pending;
+
+ // When checking if a marker has been reached, we need to
+ // know the last time the check was made, to see if
+ // the marker's pts hit the region.
uint64_t previous_position;
TimelineMarkerCollection *streamed_markers;
@@ -326,7 +349,6 @@
void SetState (State new_state);
State GetState () { return state; }
-
static const char *GetStateName (State state);
virtual bool EnableAntiAlias ()
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
