Commit 10208999 authored by Rob Shearman's avatar Rob Shearman Committed by Alexandre Julliard

include: Uncomment declaration of IDirectShowStream in amstream.idl.

Also remove incorrect [optional] attributes from parameters.
parent f399e6ec
......@@ -64,7 +64,6 @@ typedef [v1_enum] enum {
RenderData = 2
} OUTPUT_STATE;
/*
[
object,
uuid(7DB01C96-C0C3-11d0-8FF1-00C04FD9189D),
......@@ -81,7 +80,6 @@ interface IDirectShowStream : IDispatch
[propget, id(3), helpstring("property Audio")] HRESULT Audio([out, retval] OUTPUT_STATE *pVal);
[propput, id(3), helpstring("propetry Audio")] HRESULT Audio([in] OUTPUT_STATE newVal);
};
*/
[
object,
......@@ -93,7 +91,7 @@ interface IAMMultiMediaStream : IMultiMediaStream
HRESULT Initialize(
[in] STREAM_TYPE StreamType,
[in] DWORD dwFlags,
[in, optional] IGraphBuilder *pFilterGraph);
[in] IGraphBuilder *pFilterGraph);
HRESULT GetFilterGraph(
[out] IGraphBuilder **ppGraphBuilder);
......@@ -102,10 +100,10 @@ interface IAMMultiMediaStream : IMultiMediaStream
[out] IMediaStreamFilter **ppFilter);
HRESULT AddMediaStream(
[in, optional] IUnknown *pStreamObject,
[in, optional] const MSPID *PurposeId,
[in] IUnknown *pStreamObject,
[in] const MSPID *PurposeId,
[in] DWORD dwFlags,
[out, optional] IMediaStream **ppNewStream);
[out] IMediaStream **ppNewStream);
HRESULT OpenFile(
[in] LPCWSTR pszFileName,
......@@ -129,7 +127,7 @@ pointer_default(unique)
interface IAMMediaStream : IMediaStream
{
HRESULT Initialize(
[in, optional] IUnknown *pSourceObject,
[in] IUnknown *pSourceObject,
[in] DWORD dwFlags,
[in] REFMSPID PurposeId,
[in] const STREAM_TYPE StreamType);
......@@ -233,9 +231,9 @@ interface IAMMediaTypeStream : IMediaStream
HRESULT CreateSample(
[in] long lSampleSize,
[in, optional] BYTE * pbBuffer,
[in] BYTE * pbBuffer,
[in] DWORD dwFlags,
[in, optional] IUnknown *pUnkOuter,
[in] IUnknown *pUnkOuter,
[out] IAMMediaTypeSample ** ppAMMediaTypeSample);
HRESULT GetStreamAllocatorRequirements(
......
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