Commit faf8ed36 authored by Bernhard Kölbl's avatar Bernhard Kölbl Committed by Alexandre Julliard

include/windows.media.speechsynthesis.idl: Update file to newer formatting.

I.e. get rid of nested namespaces and forward declares, separate attributes with commas and right align pointer declarations. Signed-off-by: 's avatarBernhard Kölbl <besentv@gmail.com>
parent 6e26dc6b
...@@ -23,181 +23,162 @@ ...@@ -23,181 +23,162 @@
import "inspectable.idl"; import "inspectable.idl";
import "windows.foundation.idl"; import "windows.foundation.idl";
import "windows.media.idl"; import "windows.media.idl";
import "windows.storage.streams.idl";
namespace Windows { namespace Windows.Media.SpeechSynthesis
namespace Foundation { {
interface IClosable; typedef enum VoiceGender VoiceGender;
} interface IInstalledVoicesStatic;
namespace Media { interface IInstalledVoicesStatic2;
namespace SpeechSynthesis { interface ISpeechSynthesizer;
typedef enum VoiceGender VoiceGender; interface ISpeechSynthesizer2;
interface IInstalledVoicesStatic; interface IVoiceInformation;
interface IInstalledVoicesStatic2; interface ISpeechSynthesisStream;
interface ISpeechSynthesizer; runtimeclass SpeechSynthesizer;
interface ISpeechSynthesizer2; runtimeclass VoiceInformation;
interface IVoiceInformation; runtimeclass SpeechSynthesizerOptions;
interface ISpeechSynthesisStream; runtimeclass SpeechSynthesisStream;
runtimeclass SpeechSynthesizer;
runtimeclass VoiceInformation;
runtimeclass SpeechSynthesizerOptions;
runtimeclass SpeechSynthesisStream;
}
}
namespace Storage {
namespace Streams {
interface IRandomAccessStreamWithContentType;
interface IRandomAccessStream;
interface IInputStream;
interface IOutputStream;
interface IContentTypeProvider;
}
}
}
namespace Windows { declare
namespace Media { {
namespace SpeechSynthesis { interface Windows.Foundation.Collections.IIterable<Windows.Media.SpeechSynthesis.VoiceInformation*>;
declare { interface Windows.Foundation.Collections.IIterator<Windows.Media.SpeechSynthesis.VoiceInformation*>;
interface Windows.Foundation.Collections.IIterator<Windows.Media.SpeechSynthesis.VoiceInformation*>; interface Windows.Foundation.Collections.IVectorView<Windows.Media.SpeechSynthesis.VoiceInformation*>;
interface Windows.Foundation.Collections.IIterable<Windows.Media.SpeechSynthesis.VoiceInformation*>; interface Windows.Foundation.IAsyncOperation<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*>;
interface Windows.Foundation.Collections.IVectorView<Windows.Media.SpeechSynthesis.VoiceInformation*>; interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*>;
interface Windows.Foundation.IAsyncOperation<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*>;
interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*>;
}
}
} }
}
namespace Windows { [
namespace Media { contract(Windows.Foundation.UniversalApiContract, 1.0)
namespace SpeechSynthesis { ]
[contract(Windows.Foundation.UniversalApiContract, 1.0)] enum VoiceGender
enum VoiceGender {
{ Male = 0,
Male = 0, Female = 1
Female = 1 };
};
[contract(Windows.Foundation.UniversalApiContract, 1.0)] [
[exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesisStream)] contract(Windows.Foundation.UniversalApiContract, 1.0),
[uuid(83e46e93-244c-4622-ba0b-6229c4d0d65d)] exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesisStream),
interface ISpeechSynthesisStream : IInspectable uuid(83e46e93-244c-4622-ba0b-6229c4d0d65d)
requires ]
Windows.Storage.Streams.IRandomAccessStreamWithContentType, interface ISpeechSynthesisStream : IInspectable
Windows.Storage.Streams.IRandomAccessStream, requires
Windows.Foundation.IClosable, Windows.Storage.Streams.IRandomAccessStreamWithContentType,
Windows.Storage.Streams.IInputStream, Windows.Storage.Streams.IRandomAccessStream,
Windows.Storage.Streams.IOutputStream, Windows.Foundation.IClosable,
Windows.Storage.Streams.IContentTypeProvider Windows.Storage.Streams.IInputStream,
{ Windows.Storage.Streams.IOutputStream,
[propget] HRESULT Markers([out] [retval] Windows.Foundation.Collections.IVectorView<Windows.Media.IMediaMarker*>** value); Windows.Storage.Streams.IContentTypeProvider
} {
[propget] HRESULT Markers([out, retval] Windows.Foundation.Collections.IVectorView<Windows.Media.IMediaMarker*> **value);
}
[ [
contract(Windows.Foundation.UniversalApiContract, 1.0), contract(Windows.Foundation.UniversalApiContract, 1.0),
exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesizer), exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesizer),
uuid(ce9f7c76-97f4-4ced-ad68-d51c458e45c6) uuid(ce9f7c76-97f4-4ced-ad68-d51c458e45c6)
] ]
interface ISpeechSynthesizer : IInspectable interface ISpeechSynthesizer : IInspectable
{ {
HRESULT SynthesizeTextToStreamAsync([in] HSTRING text, [out] [retval] Windows.Foundation.IAsyncOperation<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*> **operation); HRESULT SynthesizeTextToStreamAsync([in] HSTRING text, [out, retval] Windows.Foundation.IAsyncOperation<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*> **operation);
HRESULT SynthesizeSsmlToStreamAsync([in] HSTRING Ssml, [out] [retval] Windows.Foundation.IAsyncOperation<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*> **operation); HRESULT SynthesizeSsmlToStreamAsync([in] HSTRING Ssml, [out, retval] Windows.Foundation.IAsyncOperation<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*> **operation);
[propput] HRESULT Voice([in] VoiceInformation *value); [propput] HRESULT Voice([in] VoiceInformation *value);
[propget] HRESULT Voice([out] [retval] VoiceInformation **value); [propget] HRESULT Voice([out, retval] VoiceInformation **value);
} }
[ [
contract(Windows.Foundation.UniversalApiContract, 1.0), contract(Windows.Foundation.UniversalApiContract, 1.0),
exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesizer), exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesizer),
uuid(a7c5ecb2-4339-4d6a-bbf8-c7a4f1544c2e) uuid(a7c5ecb2-4339-4d6a-bbf8-c7a4f1544c2e)
] ]
interface ISpeechSynthesizer2 : IInspectable interface ISpeechSynthesizer2 : IInspectable
{ {
[propget] HRESULT Options([out, retval] SpeechSynthesizerOptions **value); [propget] HRESULT Options([out, retval] SpeechSynthesizerOptions **value);
} }
[ [
contract(Windows.Foundation.UniversalApiContract, 1.0), contract(Windows.Foundation.UniversalApiContract, 1.0),
exclusiveto(Windows.Media.SpeechSynthesis.VoiceInformation), exclusiveto(Windows.Media.SpeechSynthesis.VoiceInformation),
uuid(b127d6a4-1291-4604-aa9c-83134083352c) uuid(b127d6a4-1291-4604-aa9c-83134083352c)
] ]
interface IVoiceInformation : IInspectable interface IVoiceInformation : IInspectable
{ {
[propget] HRESULT DisplayName([out] [retval] HSTRING* value); [propget] HRESULT DisplayName([out, retval] HSTRING *value);
[propget] HRESULT Id([out] [retval] HSTRING* value); [propget] HRESULT Id([out, retval] HSTRING *value);
[propget] HRESULT Language([out] [retval] HSTRING* value); [propget] HRESULT Language([out, retval] HSTRING *value);
[propget] HRESULT Description([out] [retval] HSTRING* value); [propget] HRESULT Description([out, retval] HSTRING *value);
[propget] HRESULT Gender([out] [retval] VoiceGender* value); [propget] HRESULT Gender([out, retval] VoiceGender *value);
} }
[ [
contract(Windows.Foundation.UniversalApiContract, 1.0), contract(Windows.Foundation.UniversalApiContract, 1.0),
exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesizerOptions), exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesizerOptions),
uuid(a0e23871-cc3d-43c9-91b1-ee185324d83d) uuid(a0e23871-cc3d-43c9-91b1-ee185324d83d)
] ]
interface ISpeechSynthesizerOptions : IInspectable interface ISpeechSynthesizerOptions : IInspectable
{ {
[propget] HRESULT IncludeWordBoundaryMetadata([out, retval] boolean *value); [propget] HRESULT IncludeWordBoundaryMetadata([out, retval] boolean *value);
[propput] HRESULT IncludeWordBoundaryMetadata([in] boolean value); [propput] HRESULT IncludeWordBoundaryMetadata([in] boolean value);
[propget] HRESULT IncludeSentenceBoundaryMetadata([out, retval] boolean *value); [propget] HRESULT IncludeSentenceBoundaryMetadata([out, retval] boolean *value);
[propput] HRESULT IncludeSentenceBoundaryMetadata([in] boolean value); [propput] HRESULT IncludeSentenceBoundaryMetadata([in] boolean value);
} }
[ [
contract(Windows.Foundation.UniversalApiContract, 1.0), contract(Windows.Foundation.UniversalApiContract, 1.0),
exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesizer), exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesizer),
uuid(7d526ecc-7533-4c3f-85be-888c2baeebdc) uuid(7d526ecc-7533-4c3f-85be-888c2baeebdc)
] ]
interface IInstalledVoicesStatic : IInspectable interface IInstalledVoicesStatic : IInspectable
{ {
[propget] HRESULT AllVoices([out, retval] Windows.Foundation.Collections.IVectorView<VoiceInformation*>** value); [propget] HRESULT AllVoices([out, retval] Windows.Foundation.Collections.IVectorView<VoiceInformation*> **value);
[propget] HRESULT DefaultVoice([out, retval] VoiceInformation** value); [propget] HRESULT DefaultVoice([out, retval] VoiceInformation **value);
} }
[ [
contract(Windows.Foundation.UniversalApiContract, 1.0), contract(Windows.Foundation.UniversalApiContract, 1.0),
marshaling_behavior(agile) marshaling_behavior(agile)
] ]
runtimeclass VoiceInformation runtimeclass VoiceInformation
{ {
[default] interface Windows.Media.SpeechSynthesis.IVoiceInformation; [default] interface Windows.Media.SpeechSynthesis.IVoiceInformation;
} }
[ [
contract(Windows.Foundation.UniversalApiContract, 1.0), contract(Windows.Foundation.UniversalApiContract, 1.0),
marshaling_behavior(agile) marshaling_behavior(agile)
] ]
runtimeclass SpeechSynthesizerOptions runtimeclass SpeechSynthesizerOptions
{ {
[default] interface Windows.Media.SpeechSynthesis.ISpeechSynthesizerOptions; [default] interface Windows.Media.SpeechSynthesis.ISpeechSynthesizerOptions;
} }
[contract(Windows.Foundation.UniversalApiContract, 1.0)] [
[marshaling_behavior(agile)] contract(Windows.Foundation.UniversalApiContract, 1.0),
runtimeclass SpeechSynthesisStream marshaling_behavior(agile)
{ ]
[default] interface Windows.Media.SpeechSynthesis.ISpeechSynthesisStream; runtimeclass SpeechSynthesisStream
interface Windows.Storage.Streams.IRandomAccessStreamWithContentType; {
interface Windows.Storage.Streams.IContentTypeProvider; [default] interface Windows.Media.SpeechSynthesis.ISpeechSynthesisStream;
interface Windows.Storage.Streams.IRandomAccessStream; interface Windows.Storage.Streams.IRandomAccessStreamWithContentType;
interface Windows.Storage.Streams.IOutputStream; interface Windows.Storage.Streams.IContentTypeProvider;
interface Windows.Foundation.IClosable; interface Windows.Storage.Streams.IRandomAccessStream;
interface Windows.Storage.Streams.IInputStream; interface Windows.Storage.Streams.IOutputStream;
} interface Windows.Foundation.IClosable;
interface Windows.Storage.Streams.IInputStream;
}
[ [
activatable(Windows.Foundation.UniversalApiContract, 1.0), activatable(Windows.Foundation.UniversalApiContract, 1.0),
contract(Windows.Foundation.UniversalApiContract, 1.0), contract(Windows.Foundation.UniversalApiContract, 1.0),
marshaling_behavior(agile), marshaling_behavior(agile),
static(Windows.Media.SpeechSynthesis.IInstalledVoicesStatic, Windows.Foundation.UniversalApiContract, 1.0), static(Windows.Media.SpeechSynthesis.IInstalledVoicesStatic, Windows.Foundation.UniversalApiContract, 1.0),
static(Windows.Media.SpeechSynthesis.IInstalledVoicesStatic2, Windows.Foundation.UniversalApiContract, 5.0) static(Windows.Media.SpeechSynthesis.IInstalledVoicesStatic2, Windows.Foundation.UniversalApiContract, 5.0)
] ]
runtimeclass SpeechSynthesizer runtimeclass SpeechSynthesizer
{ {
[default] interface Windows.Media.SpeechSynthesis.ISpeechSynthesizer; [default] interface Windows.Media.SpeechSynthesis.ISpeechSynthesizer;
interface Windows.Foundation.IClosable; interface Windows.Foundation.IClosable;
[contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.Media.SpeechSynthesis.ISpeechSynthesizer2; [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.Media.SpeechSynthesis.ISpeechSynthesizer2;
}
}
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment