[Mono-patches] r86896 - trunk/moon/src

[Chris Toshok]

Author: toshok
Date: 2007-10-04 13:35:52 -0400 (Thu, 04 Oct 2007)
New Revision: 86896

Modified:
   trunk/moon/src/clock.cpp
Log:
revert the latest patch, it breaks airlines

Modified: trunk/moon/src/clock.cpp
===================================================================
--- trunk/moon/src/clock.cpp    2007-10-04 17:24:29 UTC (rev 86895)
+++ trunk/moon/src/clock.cpp    2007-10-04 17:35:52 UTC (rev 86896)
@@ -252,8 +252,6 @@
        AddTimeout();
 
        previous_smoothed = current_smoothed;
-
-//     time_manager_list_clocks();
 }
 
 void
@@ -312,10 +310,12 @@
 {
        spaces (level);
        printf (clock->Is(Type::CLOCKGROUP) ? "ClockGroup " : "Clock ");
-       printf ("(%p) ", clock);
        if (clock->GetName ()) {
                printf ("'%s', ", clock->GetName());
        }
+       else {
+               printf ("(%p), ", clock);
+       }
 
        printf ("%lld (%.2f) ", clock->GetCurrentTime(), 
clock->GetCurrentProgress());
 
@@ -467,7 +467,7 @@
 #if CLOCK_DEBUG
                printf ("+ clock %p (%s) duration is %lld, and new_time == 
%lld\n", this, timeline->GetName(), duration_timespan, new_time);
 #endif
-               if (!is_reversed && new_time >= duration_timespan) {
+               if (new_time >= duration_timespan) {
 #if CLOCK_DEBUG
                        printf ("+ clock %p (%s) hit its duration\n", this, 
timeline->GetName());
 #endif
@@ -506,7 +506,7 @@
                                }
                        }
                }
-               else if (is_reversed && new_time <= 0) {
+               else if (new_time <= 0) {
                        is_reversed = false;
                        new_time = -new_time;
 
@@ -758,7 +758,7 @@
                   otherwise just call its Tick
                   method */
                Clock *c = (Clock*)l->data;
-               if (c->GetClockState() != Clock::Stopped && 
c->GetNewClockState() != Clock::Stopped) {
+               if (c->GetClockState() != Clock::Stopped) {
                        c->Tick ();
                }
                else if ((c->GetClockState() == Clock::Stopped) && 
(!c->GetHasStarted() && c->GetBeginTime () <= current_time)) {

_______________________________________________
Mono-patches maillist  -  Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches