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

Unified Diff: mojo/dart/packages/mojo_services/lib/mojo/media/media_player.mojom.dart

Issue 2006093004: Motown: Convert MediaSink to expose MediaTimelineControlSite (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 4 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: mojo/dart/packages/mojo_services/lib/mojo/media/media_player.mojom.dart
diff --git a/mojo/dart/packages/mojo_services/lib/mojo/media/media_player.mojom.dart b/mojo/dart/packages/mojo_services/lib/mojo/media/media_player.mojom.dart
index d570d961b59ef12b32aaca2733450826ef74dc0b..07e4b284cb35d187708f69ceccfc4e698c95b253 100644
--- a/mojo/dart/packages/mojo_services/lib/mojo/media/media_player.mojom.dart
+++ b/mojo/dart/packages/mojo_services/lib/mojo/media/media_player.mojom.dart
@@ -8,7 +8,6 @@ import 'package:mojo/bindings.dart' as bindings;
import 'package:mojo/core.dart' as core;
import 'package:mojo/mojo/bindings/types/service_describer.mojom.dart' as service_describer;
import 'package:mojo_services/mojo/media/media_metadata.mojom.dart' as media_metadata_mojom;
-import 'package:mojo_services/mojo/media/media_state.mojom.dart' as media_state_mojom;
import 'package:mojo_services/mojo/timelines.mojom.dart' as timelines_mojom;
@@ -17,8 +16,8 @@ class MediaPlayerStatus extends bindings.Struct {
static const List<bindings.StructDataHeader> kVersions = const [
const bindings.StructDataHeader(32, 0)
];
- media_state_mojom.MediaState state = null;
timelines_mojom.TimelineTransform timelineTransform = null;
+ bool endOfStream = false;
media_metadata_mojom.MediaMetadata metadata = null;
MediaPlayerStatus() : super(kVersions.last.size);
@@ -58,16 +57,12 @@ class MediaPlayerStatus extends bindings.Struct {
}
if (mainDataHeader.version >= 0) {
- result.state = media_state_mojom.MediaState.decode(decoder0, 8);
- if (result.state == null) {
- throw new bindings.MojoCodecError(
- 'Trying to decode null union for non-nullable media_state_mojom.MediaState.');
- }
+ var decoder1 = decoder0.decodePointer(8, true);
+ result.timelineTransform = timelines_mojom.TimelineTransform.decode(decoder1);
}
if (mainDataHeader.version >= 0) {
- var decoder1 = decoder0.decodePointer(16, true);
- result.timelineTransform = timelines_mojom.TimelineTransform.decode(decoder1);
+ result.endOfStream = decoder0.decodeBool(16, 0);
}
if (mainDataHeader.version >= 0) {
@@ -80,17 +75,17 @@ class MediaPlayerStatus extends bindings.Struct {
void encode(bindings.Encoder encoder) {
var encoder0 = encoder.getStructEncoderAtOffset(kVersions.last);
try {
- encoder0.encodeEnum(state, 8);
+ encoder0.encodeStruct(timelineTransform, 8, true);
} on bindings.MojoCodecError catch(e) {
e.message = "Error encountered while encoding field "
- "state of struct MediaPlayerStatus: $e";
+ "timelineTransform of struct MediaPlayerStatus: $e";
rethrow;
}
try {
- encoder0.encodeStruct(timelineTransform, 16, true);
+ encoder0.encodeBool(endOfStream, 16, 0);
} on bindings.MojoCodecError catch(e) {
e.message = "Error encountered while encoding field "
- "timelineTransform of struct MediaPlayerStatus: $e";
+ "endOfStream of struct MediaPlayerStatus: $e";
rethrow;
}
try {
@@ -104,15 +99,15 @@ class MediaPlayerStatus extends bindings.Struct {
String toString() {
return "MediaPlayerStatus("
- "state: $state" ", "
"timelineTransform: $timelineTransform" ", "
+ "endOfStream: $endOfStream" ", "
"metadata: $metadata" ")";
}
Map toJson() {
Map map = new Map();
- map["state"] = state;
map["timelineTransform"] = timelineTransform;
+ map["endOfStream"] = endOfStream;
map["metadata"] = metadata;
return map;
}

Powered by Google App Engine
This is Rietveld 408576698