Dart: Futures -> Callbacks.

mojo/dart/packages/mojo_services/lib/mojo/media/media_demux.mojom.dart

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 library media_demux_mojom;
 import 'dart:async';
 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_transport.mojom.dart' as media_transport_mojom;
 import 'package:mojo_services/mojo/media/media_types.mojom.dart' as media_types_mojom;
 
 
 
 class _MediaDemuxDescribeParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(8, 0)
   ];
 
   _MediaDemuxDescribeParams() : super(kVersions.last.size);
 
+  _MediaDemuxDescribeParams.init(
+  ) : super(kVersions.last.size);
+
   static _MediaDemuxDescribeParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static _MediaDemuxDescribeParams decode(bindings.Decoder decoder0) {
@@ skipping 39 matching lines @@
 
 
 class MediaDemuxDescribeResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   List<media_types_mojom.MediaType> streamTypes = null;
 
   MediaDemuxDescribeResponseParams() : super(kVersions.last.size);
 
+  MediaDemuxDescribeResponseParams.init(
+    List<media_types_mojom.MediaType> this.streamTypes
+  ) : super(kVersions.last.size);
+
   static MediaDemuxDescribeResponseParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static MediaDemuxDescribeResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 69 matching lines @@
 
 class _MediaDemuxGetProducerParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   int streamIndex = 0;
   media_transport_mojom.MediaProducerInterfaceRequest producer = null;
 
   _MediaDemuxGetProducerParams() : super(kVersions.last.size);
 
+  _MediaDemuxGetProducerParams.init(
+    int this.streamIndex, 
+    media_transport_mojom.MediaProducerInterfaceRequest this.producer
+  ) : super(kVersions.last.size);
+
   static _MediaDemuxGetProducerParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static _MediaDemuxGetProducerParams decode(bindings.Decoder decoder0) {
@@ skipping 63 matching lines @@
 
 
 class _MediaDemuxGetMetadataParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   int versionLastSeen = 0;
 
   _MediaDemuxGetMetadataParams() : super(kVersions.last.size);
 
+  _MediaDemuxGetMetadataParams.init(
+    int this.versionLastSeen
+  ) : super(kVersions.last.size);
+
   static _MediaDemuxGetMetadataParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static _MediaDemuxGetMetadataParams decode(bindings.Decoder decoder0) {
@@ skipping 53 matching lines @@
 
 class MediaDemuxGetMetadataResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(24, 0)
   ];
   int version = 0;
   media_metadata_mojom.MediaMetadata metadata = null;
 
   MediaDemuxGetMetadataResponseParams() : super(kVersions.last.size);
 
+  MediaDemuxGetMetadataResponseParams.init(
+    int this.version, 
+    media_metadata_mojom.MediaMetadata this.metadata
+  ) : super(kVersions.last.size);
+
   static MediaDemuxGetMetadataResponseParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static MediaDemuxGetMetadataResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 65 matching lines @@
 }
 
 
 class _MediaDemuxPrimeParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(8, 0)
   ];
 
   _MediaDemuxPrimeParams() : super(kVersions.last.size);
 
+  _MediaDemuxPrimeParams.init(
+  ) : super(kVersions.last.size);
+
   static _MediaDemuxPrimeParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static _MediaDemuxPrimeParams decode(bindings.Decoder decoder0) {
@@ skipping 38 matching lines @@
 }
 
 
 class MediaDemuxPrimeResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(8, 0)
   ];
 
   MediaDemuxPrimeResponseParams() : super(kVersions.last.size);
 
+  MediaDemuxPrimeResponseParams.init(
+  ) : super(kVersions.last.size);
+
   static MediaDemuxPrimeResponseParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static MediaDemuxPrimeResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 38 matching lines @@
 }
 
 
 class _MediaDemuxFlushParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(8, 0)
   ];
 
   _MediaDemuxFlushParams() : super(kVersions.last.size);
 
+  _MediaDemuxFlushParams.init(
+  ) : super(kVersions.last.size);
+
   static _MediaDemuxFlushParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static _MediaDemuxFlushParams decode(bindings.Decoder decoder0) {
@@ skipping 38 matching lines @@
 }
 
 
 class MediaDemuxFlushResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(8, 0)
   ];
 
   MediaDemuxFlushResponseParams() : super(kVersions.last.size);
 
+  MediaDemuxFlushResponseParams.init(
+  ) : super(kVersions.last.size);
+
   static MediaDemuxFlushResponseParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static MediaDemuxFlushResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 39 matching lines @@
 
 
 class _MediaDemuxSeekParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   int position = 0;
 
   _MediaDemuxSeekParams() : super(kVersions.last.size);
 
+  _MediaDemuxSeekParams.init(
+    int this.position
+  ) : super(kVersions.last.size);
+
   static _MediaDemuxSeekParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static _MediaDemuxSeekParams decode(bindings.Decoder decoder0) {
@@ skipping 51 matching lines @@
 }
 
 
 class MediaDemuxSeekResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(8, 0)
   ];
 
   MediaDemuxSeekResponseParams() : super(kVersions.last.size);
 
+  MediaDemuxSeekResponseParams.init(
+  ) : super(kVersions.last.size);
+
   static MediaDemuxSeekResponseParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static MediaDemuxSeekResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 38 matching lines @@
 }
 
 const int _mediaDemuxMethodDescribeName = 0;
 const int _mediaDemuxMethodGetProducerName = 1;
 const int _mediaDemuxMethodGetMetadataName = 2;
 const int _mediaDemuxMethodPrimeName = 3;
 const int _mediaDemuxMethodFlushName = 4;
 const int _mediaDemuxMethodSeekName = 5;
 
 class _MediaDemuxServiceDescription implements service_describer.ServiceDescription {
-  dynamic getTopLevelInterface([Function responseFactory]) =>
-      responseFactory(null);
+  void getTopLevelInterface(Function responder) {
+    responder(null);
+  }
 
-  dynamic getTypeDefinition(String typeKey, [Function responseFactory]) =>
-      responseFactory(null);
+  void getTypeDefinition(String typeKey, Function responder) {
+    responder(null);
+  }
 
-  dynamic getAllTypeDefinitions([Function responseFactory]) =>
-      responseFactory(null);
+  void getAllTypeDefinitions(Function responder) {
+    responder(null);
+  }
 }
 
 abstract class MediaDemux {
   static const String serviceName = null;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _MediaDemuxServiceDescription();
     }
     return _cachedServiceDescription;
   }
 
   static MediaDemuxProxy connectToService(
       bindings.ServiceConnector s, String url, [String serviceName]) {
     MediaDemuxProxy p = new MediaDemuxProxy.unbound();
     String name = serviceName ?? MediaDemux.serviceName;
     if ((name == null) || name.isEmpty) {
       throw new core.MojoApiError(
           "If an interface has no ServiceName, then one must be provided.");
     }
     s.connectToService(url, p, name);
     return p;
   }
-  dynamic describe([Function responseFactory = null]);
+  void describe(void callback(List<media_types_mojom.MediaType> streamTypes));
   void getProducer(int streamIndex, media_transport_mojom.MediaProducerInterfaceRequest producer);
-  dynamic getMetadata(int versionLastSeen,[Function responseFactory = null]);
-  dynamic prime([Function responseFactory = null]);
-  dynamic flush([Function responseFactory = null]);
-  dynamic seek(int position,[Function responseFactory = null]);
+  void getMetadata(int versionLastSeen,void callback(int version, media_metadata_mojom.MediaMetadata metadata));
+  void prime(void callback());
+  void flush(void callback());
+  void seek(int position,void callback());
   static const int kInitialMetadata = 0;
 }
 
 abstract class MediaDemuxInterface
     implements bindings.MojoInterface<MediaDemux>,
                MediaDemux {
   factory MediaDemuxInterface([MediaDemux impl]) =>
       new MediaDemuxStub.unbound(impl);
   factory MediaDemuxInterface.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint,
@@ skipping 23 matching lines @@
 
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _mediaDemuxMethodDescribeName:
         var r = MediaDemuxDescribeResponseParams.deserialize(
             message.payload);
         if (!message.header.hasRequestId) {
           proxyError("Expected a message with a valid request Id.");
           return;
         }
-        Completer c = completerMap[message.header.requestId];
-        if (c == null) {
+        Function callback = callbackMap[message.header.requestId];
+        if (callback == null) {
           proxyError(
               "Message had unknown request Id: ${message.header.requestId}");
           return;
         }
-        completerMap.remove(message.header.requestId);
-        if (c.isCompleted) {
-          proxyError("Response completer already completed");
-          return;
-        }
-        c.complete(r);
+        callbackMap.remove(message.header.requestId);
+        callback(r.streamTypes );
         break;
       case _mediaDemuxMethodGetMetadataName:
         var r = MediaDemuxGetMetadataResponseParams.deserialize(
             message.payload);
         if (!message.header.hasRequestId) {
           proxyError("Expected a message with a valid request Id.");
           return;
         }
-        Completer c = completerMap[message.header.requestId];
-        if (c == null) {
+        Function callback = callbackMap[message.header.requestId];
+        if (callback == null) {
           proxyError(
               "Message had unknown request Id: ${message.header.requestId}");
           return;
         }
-        completerMap.remove(message.header.requestId);
-        if (c.isCompleted) {
-          proxyError("Response completer already completed");
-          return;
-        }
-        c.complete(r);
+        callbackMap.remove(message.header.requestId);
+        callback(r.version , r.metadata );
         break;
       case _mediaDemuxMethodPrimeName:
         var r = MediaDemuxPrimeResponseParams.deserialize(
             message.payload);
         if (!message.header.hasRequestId) {
           proxyError("Expected a message with a valid request Id.");
           return;
         }
-        Completer c = completerMap[message.header.requestId];
-        if (c == null) {
+        Function callback = callbackMap[message.header.requestId];
+        if (callback == null) {
           proxyError(
               "Message had unknown request Id: ${message.header.requestId}");
           return;
         }
-        completerMap.remove(message.header.requestId);
-        if (c.isCompleted) {
-          proxyError("Response completer already completed");
-          return;
-        }
-        c.complete(r);
+        callbackMap.remove(message.header.requestId);
+        callback();
         break;
       case _mediaDemuxMethodFlushName:
         var r = MediaDemuxFlushResponseParams.deserialize(
             message.payload);
         if (!message.header.hasRequestId) {
           proxyError("Expected a message with a valid request Id.");
           return;
         }
-        Completer c = completerMap[message.header.requestId];
-        if (c == null) {
+        Function callback = callbackMap[message.header.requestId];
+        if (callback == null) {
           proxyError(
               "Message had unknown request Id: ${message.header.requestId}");
           return;
         }
-        completerMap.remove(message.header.requestId);
-        if (c.isCompleted) {
-          proxyError("Response completer already completed");
-          return;
-        }
-        c.complete(r);
+        callbackMap.remove(message.header.requestId);
+        callback();
         break;
       case _mediaDemuxMethodSeekName:
         var r = MediaDemuxSeekResponseParams.deserialize(
             message.payload);
         if (!message.header.hasRequestId) {
           proxyError("Expected a message with a valid request Id.");
           return;
         }
-        Completer c = completerMap[message.header.requestId];
-        if (c == null) {
+        Function callback = callbackMap[message.header.requestId];
+        if (callback == null) {
           proxyError(
               "Message had unknown request Id: ${message.header.requestId}");
           return;
         }
-        completerMap.remove(message.header.requestId);
-        if (c.isCompleted) {
-          proxyError("Response completer already completed");
-          return;
-        }
-        c.complete(r);
+        callbackMap.remove(message.header.requestId);
+        callback();
         break;
       default:
         proxyError("Unexpected message type: ${message.header.type}");
         close(immediate: true);
         break;
     }
   }
 
   MediaDemux get impl => null;
   set impl(MediaDemux _) {
@@ skipping 22 matching lines @@
   MediaDemuxProxy.unbound()
       : super(new _MediaDemuxProxyControl.unbound());
 
   static MediaDemuxProxy newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For MediaDemuxProxy"));
     return new MediaDemuxProxy.fromEndpoint(endpoint);
   }
 
 
-  dynamic describe([Function responseFactory = null]) {
+  void describe(void callback(List<media_types_mojom.MediaType> streamTypes)) {
     var params = new _MediaDemuxDescribeParams();
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _mediaDemuxMethodDescribeName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
   void getProducer(int streamIndex, media_transport_mojom.MediaProducerInterfaceRequest producer) {
     if (!ctrl.isBound) {
       ctrl.proxyError("The Proxy is closed.");
       return;
     }
     var params = new _MediaDemuxGetProducerParams();
     params.streamIndex = streamIndex;
     params.producer = producer;
     ctrl.sendMessage(params,
         _mediaDemuxMethodGetProducerName);
   }
-  dynamic getMetadata(int versionLastSeen,[Function responseFactory = null]) {
+  void getMetadata(int versionLastSeen,void callback(int version, media_metadata_mojom.MediaMetadata metadata)) {
     var params = new _MediaDemuxGetMetadataParams();
     params.versionLastSeen = versionLastSeen;
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _mediaDemuxMethodGetMetadataName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
-  dynamic prime([Function responseFactory = null]) {
+  void prime(void callback()) {
     var params = new _MediaDemuxPrimeParams();
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _mediaDemuxMethodPrimeName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
-  dynamic flush([Function responseFactory = null]) {
+  void flush(void callback()) {
     var params = new _MediaDemuxFlushParams();
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _mediaDemuxMethodFlushName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
-  dynamic seek(int position,[Function responseFactory = null]) {
+  void seek(int position,void callback()) {
     var params = new _MediaDemuxSeekParams();
     params.position = position;
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _mediaDemuxMethodSeekName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
 }
 
 class _MediaDemuxStubControl
     extends bindings.StubMessageHandler
     implements bindings.StubControl<MediaDemux> {
   MediaDemux _impl;
 
   _MediaDemuxStubControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [MediaDemux impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _MediaDemuxStubControl.fromHandle(
       core.MojoHandle handle, [MediaDemux impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _MediaDemuxStubControl.unbound([this._impl]) : super.unbound();
 
   String get serviceName => MediaDemux.serviceName;
 
 
-  MediaDemuxDescribeResponseParams _mediaDemuxDescribeResponseParamsFactory(List<media_types_mojom.MediaType> streamTypes) {
-    var result = new MediaDemuxDescribeResponseParams();
-    result.streamTypes = streamTypes;
-    return result;
+  Function _mediaDemuxDescribeResponseParamsResponder(
+      int requestId) {
+  return (List<media_types_mojom.MediaType> streamTypes) {
+      var result = new MediaDemuxDescribeResponseParams();
+      result.streamTypes = streamTypes;
+      sendResponse(buildResponseWithId(
+          result,
+          _mediaDemuxMethodDescribeName,
+          requestId,
+          bindings.MessageHeader.kMessageIsResponse));
+    };
   }
-  MediaDemuxGetMetadataResponseParams _mediaDemuxGetMetadataResponseParamsFactory(int version, media_metadata_mojom.MediaMetadata metadata) {
-    var result = new MediaDemuxGetMetadataResponseParams();
-    result.version = version;
-    result.metadata = metadata;
-    return result;
+  Function _mediaDemuxGetMetadataResponseParamsResponder(
+      int requestId) {
+  return (int version, media_metadata_mojom.MediaMetadata metadata) {
+      var result = new MediaDemuxGetMetadataResponseParams();
+      result.version = version;
+      result.metadata = metadata;
+      sendResponse(buildResponseWithId(
+          result,
+          _mediaDemuxMethodGetMetadataName,
+          requestId,
+          bindings.MessageHeader.kMessageIsResponse));
+    };
   }
-  MediaDemuxPrimeResponseParams _mediaDemuxPrimeResponseParamsFactory() {
-    var result = new MediaDemuxPrimeResponseParams();
-    return result;
+  Function _mediaDemuxPrimeResponseParamsResponder(
+      int requestId) {
+  return () {
+      var result = new MediaDemuxPrimeResponseParams();
+      sendResponse(buildResponseWithId(
+          result,
+          _mediaDemuxMethodPrimeName,
+          requestId,
+          bindings.MessageHeader.kMessageIsResponse));
+    };
   }
-  MediaDemuxFlushResponseParams _mediaDemuxFlushResponseParamsFactory() {
-    var result = new MediaDemuxFlushResponseParams();
-    return result;
+  Function _mediaDemuxFlushResponseParamsResponder(
+      int requestId) {
+  return () {
+      var result = new MediaDemuxFlushResponseParams();
+      sendResponse(buildResponseWithId(
+          result,
+          _mediaDemuxMethodFlushName,
+          requestId,
+          bindings.MessageHeader.kMessageIsResponse));
+    };
   }
-  MediaDemuxSeekResponseParams _mediaDemuxSeekResponseParamsFactory() {
-    var result = new MediaDemuxSeekResponseParams();
-    return result;
+  Function _mediaDemuxSeekResponseParamsResponder(
+      int requestId) {
+  return () {
+      var result = new MediaDemuxSeekResponseParams();
+      sendResponse(buildResponseWithId(
+          result,
+          _mediaDemuxMethodSeekName,
+          requestId,
+          bindings.MessageHeader.kMessageIsResponse));
+    };
   }
 
-  dynamic handleMessage(bindings.ServiceMessage message) {
+  void handleMessage(bindings.ServiceMessage message) {
     if (bindings.ControlMessageHandler.isControlMessage(message)) {
-      return bindings.ControlMessageHandler.handleMessage(this,
-                                                          0,
-                                                          message);
+      bindings.ControlMessageHandler.handleMessage(
+          this, 0, message);
+      return;
     }
     if (_impl == null) {
       throw new core.MojoApiError("$this has no implementation set");
     }
     switch (message.header.type) {
       case _mediaDemuxMethodDescribeName:
-        var response = _impl.describe(_mediaDemuxDescribeResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _mediaDemuxMethodDescribeName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _mediaDemuxMethodDescribeName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.describe(_mediaDemuxDescribeResponseParamsResponder(message.header.requestId));
         break;
       case _mediaDemuxMethodGetProducerName:
         var params = _MediaDemuxGetProducerParams.deserialize(
             message.payload);
         _impl.getProducer(params.streamIndex, params.producer);
         break;
       case _mediaDemuxMethodGetMetadataName:
         var params = _MediaDemuxGetMetadataParams.deserialize(
             message.payload);
-        var response = _impl.getMetadata(params.versionLastSeen,_mediaDemuxGetMetadataResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _mediaDemuxMethodGetMetadataName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _mediaDemuxMethodGetMetadataName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.getMetadata(params.versionLastSeen, _mediaDemuxGetMetadataResponseParamsResponder(message.header.requestId));
         break;
       case _mediaDemuxMethodPrimeName:
-        var response = _impl.prime(_mediaDemuxPrimeResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _mediaDemuxMethodPrimeName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _mediaDemuxMethodPrimeName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.prime(_mediaDemuxPrimeResponseParamsResponder(message.header.requestId));
         break;
       case _mediaDemuxMethodFlushName:
-        var response = _impl.flush(_mediaDemuxFlushResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _mediaDemuxMethodFlushName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _mediaDemuxMethodFlushName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.flush(_mediaDemuxFlushResponseParamsResponder(message.header.requestId));
         break;
       case _mediaDemuxMethodSeekName:
         var params = _MediaDemuxSeekParams.deserialize(
             message.payload);
-        var response = _impl.seek(params.position,_mediaDemuxSeekResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _mediaDemuxMethodSeekName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _mediaDemuxMethodSeekName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.seek(params.position, _mediaDemuxSeekResponseParamsResponder(message.header.requestId));
         break;
       default:
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   MediaDemux get impl => _impl;
   set impl(MediaDemux d) {
     if (d == null) {
       throw new core.MojoApiError("$this: Cannot set a null implementation");
     }
     if (isBound && (_impl == null)) {
       beginHandlingEvents();
     }
@@ skipping 33 matching lines @@
       core.MojoHandle handle, [MediaDemux impl])
       : super(new _MediaDemuxStubControl.fromHandle(handle, impl));
 
   static MediaDemuxStub newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For MediaDemuxStub"));
     return new MediaDemuxStub.fromEndpoint(endpoint);
   }
 
 
-  dynamic describe([Function responseFactory = null]) {
-    return impl.describe(responseFactory);
+  void describe(void callback(List<media_types_mojom.MediaType> streamTypes)) {
+    return impl.describe(callback);
   }
   void getProducer(int streamIndex, media_transport_mojom.MediaProducerInterfaceRequest producer) {
     return impl.getProducer(streamIndex, producer);
   }
-  dynamic getMetadata(int versionLastSeen,[Function responseFactory = null]) {
-    return impl.getMetadata(versionLastSeen,responseFactory);
+  void getMetadata(int versionLastSeen,void callback(int version, media_metadata_mojom.MediaMetadata metadata)) {
+    return impl.getMetadata(versionLastSeen,callback);
   }
-  dynamic prime([Function responseFactory = null]) {
-    return impl.prime(responseFactory);
+  void prime(void callback()) {
+    return impl.prime(callback);
   }
-  dynamic flush([Function responseFactory = null]) {
-    return impl.flush(responseFactory);
+  void flush(void callback()) {
+    return impl.flush(callback);
   }
-  dynamic seek(int position,[Function responseFactory = null]) {
-    return impl.seek(position,responseFactory);
+  void seek(int position,void callback()) {
+    return impl.seek(position,callback);
   }
 }