Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(179)

Side by Side Diff: services/media/factory_service/media_player_impl.cc

Issue 1916233002: Mark ApplicationImpl::ConnectTo{Application,Service}() as deprecated. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/logging.h" 5 #include "base/logging.h"
6 #include "services/media/factory_service/media_player_impl.h" 6 #include "services/media/factory_service/media_player_impl.h"
7 #include "services/media/framework/parts/reader.h" 7 #include "services/media/framework/parts/reader.h"
8 #include "services/media/framework/util/callback_joiner.h" 8 #include "services/media/framework/util/callback_joiner.h"
9 9
10 namespace mojo { 10 namespace mojo {
(...skipping 21 matching lines...) Expand all
32 status->timeline_transform = transform_.Clone(); 32 status->timeline_transform = transform_.Clone();
33 status->metadata = metadata_.Clone(); 33 status->metadata = metadata_.Clone();
34 callback.Run(version, status.Pass()); 34 callback.Run(version, status.Pass());
35 }); 35 });
36 36
37 state_ = State::kWaiting; 37 state_ = State::kWaiting;
38 38
39 // Go away when the client is no longer connected. 39 // Go away when the client is no longer connected.
40 binding_.set_connection_error_handler([this]() { ReleaseFromOwner(); }); 40 binding_.set_connection_error_handler([this]() { ReleaseFromOwner(); });
41 41
42 app()->ConnectToService("mojo:media_factory", &factory_); 42 app()->ConnectToServiceDeprecated("mojo:media_factory", &factory_);
43 43
44 factory_->CreateDemux(reader.Pass(), GetProxy(&demux_)); 44 factory_->CreateDemux(reader.Pass(), GetProxy(&demux_));
45 45
46 HandleDemuxMetadataUpdates(); 46 HandleDemuxMetadataUpdates();
47 47
48 demux_->Describe([this](mojo::Array<MediaTypePtr> stream_types) { 48 demux_->Describe([this](mojo::Array<MediaTypePtr> stream_types) {
49 // Populate streams_ and enable the streams we want. 49 // Populate streams_ and enable the streams we want.
50 std::shared_ptr<CallbackJoiner> callback_joiner = CallbackJoiner::Create(); 50 std::shared_ptr<CallbackJoiner> callback_joiner = CallbackJoiner::Create();
51 51
52 for (MediaTypePtr& stream_type : stream_types) { 52 for (MediaTypePtr& stream_type : stream_types) {
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 }); 352 });
353 } 353 }
354 354
355 MediaPlayerImpl::Stream::Stream(size_t index, MediaTypePtr media_type) 355 MediaPlayerImpl::Stream::Stream(size_t index, MediaTypePtr media_type)
356 : index_(index), media_type_(media_type.Pass()) {} 356 : index_(index), media_type_(media_type.Pass()) {}
357 357
358 MediaPlayerImpl::Stream::~Stream() {} 358 MediaPlayerImpl::Stream::~Stream() {}
359 359
360 } // namespace media 360 } // namespace media
361 } // namespace mojo 361 } // namespace mojo
OLDNEW
« no previous file with comments | « services/media/factory_service/audio_track_controller.cc ('k') | services/media/factory_service/network_reader_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698