Author: fejj
Date: 2007-07-31 16:50:50 -0400 (Tue, 31 Jul 2007)
New Revision: 83145
Modified:
trunk/moon/src/ChangeLog
trunk/moon/src/media.cpp
trunk/moon/src/media.h
Log:
2007-07-31 Jeffrey Stedfast <[EMAIL PROTECTED]>
* media.cpp: NaturalDuration is actually a TimeSpan, not a
Duration.
Modified: trunk/moon/src/ChangeLog
===================================================================
--- trunk/moon/src/ChangeLog 2007-07-31 20:37:59 UTC (rev 83144)
+++ trunk/moon/src/ChangeLog 2007-07-31 20:50:50 UTC (rev 83145)
@@ -1,3 +1,8 @@
+2007-07-31 Jeffrey Stedfast <[EMAIL PROTECTED]>
+
+ * media.cpp: NaturalDuration is actually a TimeSpan, not a
+ Duration.
+
2007-07-31 Chris Toshok <[EMAIL PROTECTED]>
* media.h, media.cpp: move the MediaBase events to MediaElement.
Modified: trunk/moon/src/media.cpp
===================================================================
--- trunk/moon/src/media.cpp 2007-07-31 20:37:59 UTC (rev 83144)
+++ trunk/moon/src/media.cpp 2007-07-31 20:50:50 UTC (rev 83145)
@@ -556,14 +556,14 @@
media->SetValue (MediaElement::MarkersProperty, Value (value));
}
-Duration *
+TimeSpan
media_element_get_natural_duration (MediaElement *media)
{
- return (Duration *) media->GetValue
(MediaElement::NaturalDurationProperty)->AsDuration ();
+ return (TimeSpan) media->GetValue
(MediaElement::NaturalDurationProperty)->AsTimeSpan ();
}
void
-media_element_set_natural_duration (MediaElement *media, Duration value)
+media_element_set_natural_duration (MediaElement *media, TimeSpan value)
{
media->SetValue (MediaElement::NaturalDurationProperty, Value (value));
}
@@ -1057,7 +1057,7 @@
MediaElement::DownloadProgressProperty = DependencyObject::Register
(Type::MEDIAELEMENT, "DownloadProgress", new Value (0.0));
MediaElement::IsMutedProperty = DependencyObject::Register
(Type::MEDIAELEMENT, "IsMuted", new Value (false));
MediaElement::MarkersProperty = DependencyObject::Register
(Type::MEDIAELEMENT, "Markers", Type::TIMELINEMARKER_COLLECTION);
- MediaElement::NaturalDurationProperty = DependencyObject::Register
(Type::MEDIAELEMENT, "NaturalDuration", Type::DURATION);
+ MediaElement::NaturalDurationProperty = DependencyObject::Register
(Type::MEDIAELEMENT, "NaturalDuration", Type::TIMESPAN);
MediaElement::NaturalVideoHeightProperty = DependencyObject::Register
(Type::MEDIAELEMENT, "NaturalVideoHeight", Type::DOUBLE);
MediaElement::NaturalVideoWidthProperty = DependencyObject::Register
(Type::MEDIAELEMENT, "NaturalVideoWidth", Type::DOUBLE);
MediaElement::PositionProperty = DependencyObject::Register
(Type::MEDIAELEMENT, "Position", Type::TIMESPAN);
Modified: trunk/moon/src/media.h
===================================================================
--- trunk/moon/src/media.h 2007-07-31 20:37:59 UTC (rev 83144)
+++ trunk/moon/src/media.h 2007-07-31 20:50:50 UTC (rev 83145)
@@ -215,8 +215,8 @@
TimelineMarkerCollection *media_element_get_markers (MediaElement *media);
void media_element_set_markers (MediaElement *media, TimelineMarkerCollection
*value);
-Duration *media_element_get_natural_duration (MediaElement *media);
-void media_element_set_natural_duration (MediaElement *media, Duration value);
+TimeSpan media_element_get_natural_duration (MediaElement *media);
+void media_element_set_natural_duration (MediaElement *media, TimeSpan value);
double media_element_get_natural_video_height (MediaElement *media);
void media_element_set_natural_video_height (MediaElement *media, double
value);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
