commit 1098cf93de26c93936a09aa7511ffdbda305e2f9
author Dale Sather <dalesat@google.com> Mon Apr 08 21:51:18 2019 +0000
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Mon Apr 08 21:51:18 2019 +0000
tree 0d718733be160edba9f9bea333c2f9160109f1c5
parent 48f5fb8a915fc0a2b1a3dcec24f228d281606abd

[media] remove reference to lib/media/timeline/timeline.h

lib/media/timeline/timeline.h will soon be removed. This CL removes
references to it in topaz.

TEST: no behavior change
Change-Id: I3208fd6dd4243add881c983f62ea0996aa194e0c

examples/mediaplayer/mediaplayer_skia/mediaplayer_view.cc

diff --git a/examples/mediaplayer/mediaplayer_skia/mediaplayer_view.cc b/examples/mediaplayer/mediaplayer_skia/mediaplayer_view.cc
index d83fabd..9ff4b0b 100644
--- a/examples/mediaplayer/mediaplayer_skia/mediaplayer_view.cc
+++ b/examples/mediaplayer/mediaplayer_skia/mediaplayer_view.cc
@@ -6,17 +6,15 @@
 
 #include <fcntl.h>
 #include <hid/usages.h>
-
 #include <iomanip>
-
 #include "lib/component/cpp/connect.h"
 #include "lib/fidl/cpp/clone.h"
 #include "lib/fidl/cpp/optional.h"
 #include "lib/fsl/io/fd.h"
-#include "src/lib/fxl/logging.h"
-#include "lib/media/timeline/timeline.h"
 #include "lib/media/timeline/type_converters.h"
 #include "lib/ui/scenic/cpp/view_token_pair.h"
+#include "src/lib/fxl/logging.h"
+#include "src/lib/fxl/time/time_delta.h"
 #include "src/lib/url/gurl.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPath.h"
@@ -73,8 +71,9 @@
   pixel_aspect_ratio_.width = 1;
   pixel_aspect_ratio_.height = 1;
 
-  player_ = startup_context()
-                ->ConnectToEnvironmentService<fuchsia::media::playback::Player>();
+  player_ =
+      startup_context()
+          ->ConnectToEnvironmentService<fuchsia::media::playback::Player>();
   player_.events().OnStatusChanged =
       [this](fuchsia::media::playback::PlayerStatus status) {
         HandleStatusChanged(status);
@@ -104,7 +103,7 @@
   }
 
   // These are for calculating frame rate.
-  frame_time_ = media::Timeline::local_now();
+  frame_time_ = zx::clock::get_monotonic().get();
   prev_frame_time_ = frame_time_;
 }
 
@@ -288,7 +287,7 @@
     return;
 
   prev_frame_time_ = frame_time_;
-  frame_time_ = media::Timeline::local_now();
+  frame_time_ = zx::clock::get_monotonic().get();
 
   // Log the frame rate every five seconds.
   if (state_ == State::kPlaying &&
@@ -444,7 +443,7 @@
   }
 
   // Apply the timeline function to the current time.
-  int64_t position = timeline_function_(media::Timeline::local_now());
+  int64_t position = timeline_function_(zx::clock::get_monotonic().get());
 
   if (position < 0) {
     position = 0;