Skip to content

W
wine-winehq
Commit faf8ed36 authored by Bernhard Kölbl's avatar Bernhard Kölbl Committed by Alexandre Julliard
Browse files
Options

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
Show whitespace changes
Inline Side-by-side
Showing with 29 additions and 48 deletions
include/windows.media.speechsynthesis.idl
View file @ faf8ed36
......@@ -23,13 +23,10 @@
import "inspectable.idl";
import "windows.foundation.idl";
import "windows.media.idl";
import "windows.storage.streams.idl";
namespace Windows {
namespace Foundation {
interface IClosable;
}
namespace Media {
namespace SpeechSynthesis {
namespace Windows.Media.SpeechSynthesis
{
typedef enum VoiceGender VoiceGender;
interface IInstalledVoicesStatic;
interface IInstalledVoicesStatic2;
......@@ -41,46 +38,30 @@ namespace Windows {
runtimeclass VoiceInformation;
runtimeclass SpeechSynthesizerOptions;
runtimeclass SpeechSynthesisStream;
}
}
namespace Storage {
namespace Streams {
interface IRandomAccessStreamWithContentType;
interface IRandomAccessStream;
interface IInputStream;
interface IOutputStream;
interface IContentTypeProvider;
}
}
}
namespace Windows {
namespace Media {
namespace SpeechSynthesis {
declare {
interface Windows.Foundation.Collections.IIterator<Windows.Media.SpeechSynthesis.VoiceInformation*>;
declare
{
interface Windows.Foundation.Collections.IIterable<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.IAsyncOperation<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*>;
interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*>;
}
}
}
}
namespace Windows {
namespace Media {
namespace SpeechSynthesis {
[contract(Windows.Foundation.UniversalApiContract, 1.0)]
[
contract(Windows.Foundation.UniversalApiContract, 1.0)
]
enum VoiceGender
{
Male = 0,
Female = 1
};
[contract(Windows.Foundation.UniversalApiContract, 1.0)]
[exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesisStream)]
[uuid(83e46e93-244c-4622-ba0b-6229c4d0d65d)]
[
contract(Windows.Foundation.UniversalApiContract, 1.0),
exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesisStream),
uuid(83e46e93-244c-4622-ba0b-6229c4d0d65d)
]
interface ISpeechSynthesisStream : IInspectable
requires
Windows.Storage.Streams.IRandomAccessStreamWithContentType,
......@@ -90,7 +71,7 @@ namespace Windows {
Windows.Storage.Streams.IOutputStream,
Windows.Storage.Streams.IContentTypeProvider
{
[propget] HRESULT Markers([out] [retval] Windows.Foundation.Collections.IVectorView<Windows.Media.IMediaMarker*>** value);
[propget] HRESULT Markers([out, retval] Windows.Foundation.Collections.IVectorView<Windows.Media.IMediaMarker*> **value);
}
[
......@@ -100,10 +81,10 @@ namespace Windows {
]
interface ISpeechSynthesizer : IInspectable
{
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 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);
[propput] HRESULT Voice([in] VoiceInformation *value);
[propget] HRESULT Voice([out] [retval] VoiceInformation **value);
[propget] HRESULT Voice([out, retval] VoiceInformation **value);
}
[
......@@ -123,11 +104,11 @@ namespace Windows {
]
interface IVoiceInformation : IInspectable
{
[propget] HRESULT DisplayName([out] [retval] HSTRING* value);
[propget] HRESULT Id([out] [retval] HSTRING* value);
[propget] HRESULT Language([out] [retval] HSTRING* value);
[propget] HRESULT Description([out] [retval] HSTRING* value);
[propget] HRESULT Gender([out] [retval] VoiceGender* value);
[propget] HRESULT DisplayName([out, retval] HSTRING *value);
[propget] HRESULT Id([out, retval] HSTRING *value);
[propget] HRESULT Language([out, retval] HSTRING *value);
[propget] HRESULT Description([out, retval] HSTRING *value);
[propget] HRESULT Gender([out, retval] VoiceGender *value);
}
[
......@@ -150,8 +131,8 @@ namespace Windows {
]
interface IInstalledVoicesStatic : IInspectable
{
[propget] HRESULT AllVoices([out, retval] Windows.Foundation.Collections.IVectorView<VoiceInformation*>** value);
[propget] HRESULT DefaultVoice([out, retval] VoiceInformation** value);
[propget] HRESULT AllVoices([out, retval] Windows.Foundation.Collections.IVectorView<VoiceInformation*> **value);
[propget] HRESULT DefaultVoice([out, retval] VoiceInformation **value);
}
[
......@@ -172,8 +153,10 @@ namespace Windows {
[default] interface Windows.Media.SpeechSynthesis.ISpeechSynthesizerOptions;
}
[contract(Windows.Foundation.UniversalApiContract, 1.0)]
[marshaling_behavior(agile)]
[
contract(Windows.Foundation.UniversalApiContract, 1.0),
marshaling_behavior(agile)
]
runtimeclass SpeechSynthesisStream
{
[default] interface Windows.Media.SpeechSynthesis.ISpeechSynthesisStream;
......@@ -198,6 +181,4 @@ namespace Windows {
interface Windows.Foundation.IClosable;
[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