@@ -29,8 +29,7 @@ class VideoPlayerTizenPlugin : public flutter::Plugin, public VideoPlayerApi {
2929 flutter::PluginRegistrar *plugin_registrar);
3030 virtual ~VideoPlayerTizenPlugin ();
3131 std::optional<FlutterError> Initialize () override ;
32- ErrorOr<std::unique_ptr<PlayerMessage>> Create (
33- const CreateMessage &createMsg) override ;
32+ ErrorOr<PlayerMessage> Create (const CreateMessage &createMsg) override ;
3433 std::optional<FlutterError> Dispose (const PlayerMessage &playerMsg) override ;
3534 std::optional<FlutterError> SetLooping (
3635 const LoopingMessage &loopingMsg) override ;
@@ -40,8 +39,7 @@ class VideoPlayerTizenPlugin : public flutter::Plugin, public VideoPlayerApi {
4039 const PlaybackSpeedMessage &speedMsg) override ;
4140 std::optional<FlutterError> Play (const PlayerMessage &playerMsg) override ;
4241 std::optional<FlutterError> Pause (const PlayerMessage &playerMsg) override ;
43- ErrorOr<std::unique_ptr<PositionMessage>> Position (
44- const PlayerMessage &playerMsg) override ;
42+ ErrorOr<PositionMessage> Position (const PlayerMessage &playerMsg) override ;
4543 std::optional<FlutterError> SeekTo (
4644 const PositionMessage &positionMsg) override ;
4745 std::optional<FlutterError> SetMixWithOthers (
@@ -88,19 +86,18 @@ std::optional<FlutterError> VideoPlayerTizenPlugin::Initialize() {
8886 return {};
8987}
9088
91- ErrorOr<std::unique_ptr< PlayerMessage> > VideoPlayerTizenPlugin::Create (
89+ ErrorOr<PlayerMessage> VideoPlayerTizenPlugin::Create (
9290 const CreateMessage &createMsg) {
9391 std::unique_ptr<VideoPlayer> player =
9492 std::make_unique<VideoPlayer>(registrar_ref_, createMsg);
9593 DrmManager::GetChallengeData (ChallengeCb);
96- std::unique_ptr<PlayerMessage> player_message =
97- std::make_unique<PlayerMessage>();
94+ PlayerMessage player_message;
9895 int64_t playerId = player->Create ();
9996 if (playerId != -1 ) {
10097 players_[playerId] = std::move (player);
101- player_message-> set_player_id (playerId);
98+ player_message. set_player_id (playerId);
10299 }
103- return ErrorOr<PlayerMessage>:: MakeWithUniquePtr ( std::move ( player_message)) ;
100+ return player_message;
104101}
105102
106103std::optional<FlutterError> VideoPlayerTizenPlugin::Dispose (
@@ -158,15 +155,15 @@ std::optional<FlutterError> VideoPlayerTizenPlugin::Pause(
158155 return {};
159156}
160157
161- ErrorOr<std::unique_ptr< PositionMessage> > VideoPlayerTizenPlugin::Position (
158+ ErrorOr<PositionMessage> VideoPlayerTizenPlugin::Position (
162159 const PlayerMessage &playerMsg) {
163- std::unique_ptr< PositionMessage> result = std::make_unique<PositionMessage>() ;
160+ PositionMessage result;
164161 auto iter = players_.find (playerMsg.player_id ());
165162 if (iter != players_.end ()) {
166- result-> set_player_id (playerMsg.player_id ());
167- result-> set_position (iter->second ->GetPosition ());
163+ result. set_player_id (playerMsg.player_id ());
164+ result. set_position (iter->second ->GetPosition ());
168165 }
169- return ErrorOr<PositionMessage>:: MakeWithUniquePtr ( std::move ( result)) ;
166+ return result;
170167}
171168
172169std::optional<FlutterError> VideoPlayerTizenPlugin::SeekTo (
0 commit comments