[media] Convert to ViewToken
Test: mediaplayer_tests
SCN-1018 #comment
SCN-1291 #comment
Change-Id: I2b2bea29e70d50d12a69c29cfc53399a5b8990d7
diff --git a/sdk/fidl/fuchsia.media.playback/fuchsia.media.playback.api b/sdk/fidl/fuchsia.media.playback/fuchsia.media.playback.api
index 2414607..a6bfaef 100644
--- a/sdk/fidl/fuchsia.media.playback/fuchsia.media.playback.api
+++ b/sdk/fidl/fuchsia.media.playback/fuchsia.media.playback.api
@@ -1,5 +1,5 @@
{
- "fidl/fuchsia.media.playback/player.fidl": "9a383f31d8a2a10d82cedfb43f6fce90",
+ "fidl/fuchsia.media.playback/player.fidl": "260c51d9309d239c78362907736b6095",
"fidl/fuchsia.media.playback/problem.fidl": "87a4097616967869a35d9b62dec59677",
"fidl/fuchsia.media.playback/seeking_reader.fidl": "4d6a1e04aa6f66ccafaeac1985fb7acc",
"fidl/fuchsia.media.playback/source_manager.fidl": "316c942a32f6559bb1f0482af6b6e022"
diff --git a/sdk/fidl/fuchsia.media.playback/player.fidl b/sdk/fidl/fuchsia.media.playback/player.fidl
index db903e6..c5bf060 100644
--- a/sdk/fidl/fuchsia.media.playback/player.fidl
+++ b/sdk/fidl/fuchsia.media.playback/player.fidl
@@ -38,11 +38,11 @@
Seek(int64 position);
/// Creates a video view.
- [Transitional]
CreateView(fuchsia.ui.views.ViewToken view_token);
/// Creates a video view.
// Temporary, in use for V2 transition.
+ [Transitional]
CreateView2(handle<eventpair> view_owner_token);
/// Binds to the gain control for this player.
diff --git a/src/media/playback/mediaplayer/BUILD.gn b/src/media/playback/mediaplayer/BUILD.gn
index 1b5336d..a0f635f 100644
--- a/src/media/playback/mediaplayer/BUILD.gn
+++ b/src/media/playback/mediaplayer/BUILD.gn
@@ -55,7 +55,6 @@
"//src/media/playback/mediaplayer/util",
"//zircon/public/lib/async-loop-cpp",
"//zircon/public/lib/trace-provider",
- "//zircon/public/lib/zx",
]
}
@@ -83,7 +82,6 @@
"//src/media/playback/mediaplayer/graph",
"//zircon/public/lib/async-loop-cpp",
"//zircon/public/lib/hid",
- "//zircon/public/lib/zx",
]
}
diff --git a/src/media/playback/mediaplayer/player_impl.cc b/src/media/playback/mediaplayer/player_impl.cc
index 1b38e37..367217d 100644
--- a/src/media/playback/mediaplayer/player_impl.cc
+++ b/src/media/playback/mediaplayer/player_impl.cc
@@ -505,13 +505,17 @@
Update();
}
-void PlayerImpl::CreateView2(zx::eventpair view_token) {
+void PlayerImpl::CreateView(fuchsia::ui::views::ViewToken view_token) {
MaybeCreateRenderer(StreamType::Medium::kVideo);
if (!video_renderer_) {
return;
}
- video_renderer_->CreateView(scenic::ToViewToken(std::move(view_token)));
+ video_renderer_->CreateView(std::move(view_token));
+}
+
+void PlayerImpl::CreateView2(zx::eventpair view_token) {
+ CreateView(scenic::ToViewToken(std::move(view_token)));
}
void PlayerImpl::BindGainControl(
diff --git a/src/media/playback/mediaplayer/player_impl.h b/src/media/playback/mediaplayer/player_impl.h
index 9de63a5..4d9cc16 100644
--- a/src/media/playback/mediaplayer/player_impl.h
+++ b/src/media/playback/mediaplayer/player_impl.h
@@ -6,9 +6,9 @@
#define SRC_MEDIA_PLAYBACK_MEDIAPLAYER_PLAYER_IMPL_H_
#include <fuchsia/media/cpp/fidl.h>
+#include <fuchsia/ui/views/cpp/fidl.h>
#include <lib/async/default.h>
#include <lib/fit/function.h>
-#include <lib/zx/eventpair.h>
#include <unordered_map>
@@ -53,6 +53,8 @@
void Seek(int64_t position) override;
+ void CreateView(fuchsia::ui::views::ViewToken view_token) override;
+
void CreateView2(zx::eventpair view_token) override;
void BindGainControl(
diff --git a/src/media/playback/mediaplayer/test/mediaplayer_test_util_view.cc b/src/media/playback/mediaplayer/test/mediaplayer_test_util_view.cc
index 46ddddaa..946dea7 100644
--- a/src/media/playback/mediaplayer/test/mediaplayer_test_util_view.cc
+++ b/src/media/playback/mediaplayer/test/mediaplayer_test_util_view.cc
@@ -6,13 +6,12 @@
#include <fcntl.h>
#include <hid/usages.h>
-#include <lib/zx/eventpair.h>
+#include <lib/ui/scenic/cpp/view_token_pair.h>
#include "lib/fidl/cpp/clone.h"
#include "lib/fidl/cpp/optional.h"
#include "lib/fsl/io/fd.h"
#include "lib/media/timeline/type_converters.h"
-#include "lib/ui/scenic/cpp/view_token_pair.h"
#include "src/lib/url/gurl.h"
#include "src/media/playback/mediaplayer/graph/formatting.h"
#include "src/media/playback/mediaplayer/test/mediaplayer_test_util_params.h"
@@ -88,7 +87,7 @@
// Create the video view.
auto [view_token, view_holder_token] = scenic::NewViewTokenPair();
- player_->CreateView2(std::move(view_token.value));
+ player_->CreateView(std::move(view_token));
video_host_node_.reset(new scenic::EntityNode(session()));
video_view_holder_.reset(new scenic::ViewHolder(
diff --git a/src/media/playback/mediaplayer/test/mediaplayer_tests.cc b/src/media/playback/mediaplayer/test/mediaplayer_tests.cc
index 078296c..1550bba 100644
--- a/src/media/playback/mediaplayer/test/mediaplayer_tests.cc
+++ b/src/media/playback/mediaplayer/test/mediaplayer_tests.cc
@@ -85,9 +85,9 @@
// Creates a view.
void CreateView() {
- auto tokens = scenic::NewViewTokenPair();
- view_holder_token_ = std::move(tokens.second);
- player_->CreateView2(std::move(tokens.first.value));
+ auto [view_token, view_holder_token] = scenic::NewViewTokenPair();
+ player_->CreateView(std::move(view_token));
+ view_holder_token_ = std::move(view_holder_token);
}
fuchsia::media::playback::PlayerPtr player_;
