[xiph-commits] r6974 - in trunk/oggdsf: .

[illiminable at dactyl.lonelymoon.com]

src/lib/core/directshow/dsfOggDemux
Message-ID: <20040704101436.1EE8A9AAAD at dactyl.lonelymoon.com>

Author: illiminable
Date: Sun Jul  4 03:14:36 2004
New Revision: 6974

Modified:
trunk/oggdsf/README
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h
Log:
* Modifed readme about how to deal with flacs custom build steps
* Implemented IAMFilterMiscFlags on the demux filter to identify as source.

Modified: trunk/oggdsf/README
===================================================================
--- trunk/oggdsf/README	2004-07-04 07:58:46 UTC (rev 6973)
+++ trunk/oggdsf/README	2004-07-04 10:14:36 UTC (rev 6974)
@@ -18,6 +18,13 @@
delete some necessary header files. Don't ask me why !
Also ignore visual studio hassling you about sourcesafe for flac.

+If you do accidentally clean FLAC, you will get a message when you
+ try to build that says "ordinals.h" not found. You need to
+ go to the libFLAC directory and find the file called ordinals.h.in
+ and *copy* it to the same directory without the .in extension.
+ Don't just rename it... you want to keep that file for next time
+ this happens !
+
You need DirectX 9 SDK installed (lifes easier if it's at C:\DXSDK)
Otherwise all projcets prefixed with dsf you'll need to change the
absolute references to that path. I'll try to do something to make

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp	2004-07-04 07:58:46 UTC (rev 6973)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp	2004-07-04 10:14:36 UTC (rev 6974)
@@ -82,6 +82,10 @@
*ppv = (ISpecifyPropertyPages*)this;
((IUnknown*)*ppv)->AddRef();
return NOERROR;
+	}  else if (riid == IID_IAMFilterMiscFlags) {
+		*ppv = (IAMFilterMiscFlags*)this;
+		((IUnknown*)*ppv)->AddRef();
+		return NOERROR;
}

return CBaseFilter::NonDelegatingQueryInterface(riid, ppv);
@@ -141,7 +145,10 @@
}

}
-
+//IAMFilterMiscFlags Interface
+ULONG OggDemuxSourceFilter::GetMiscFlags(void) {
+	return AM_FILTER_MISC_FLAGS_IS_SOURCE;
+}
//ISpecifyPropertyPgaes Interface
STDMETHODIMP OggDemuxSourceFilter::GetPages(CAUUID* outPropPages) {
if (outPropPages == NULL) return E_POINTER;

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h	2004-07-04 07:58:46 UTC (rev 6973)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h	2004-07-04 10:14:36 UTC (rev 6974)
@@ -51,7 +51,7 @@
public IOggCallback
,	public BasicSeekable
,	public ISpecifyPropertyPages
-
+	,	public IAMFilterMiscFlags

{
public:
@@ -72,6 +72,10 @@
OggDemuxSourceFilter(REFCLSID inFilterGUID);
virtual ~OggDemuxSourceFilter(void);

+	//IAMFilterMiscFlags Interface
+	ULONG STDMETHODCALLTYPE OggDemuxSourceFilter::GetMiscFlags(void);
+	//
+
//IFileSource Interface
virtual STDMETHODIMP GetCurFile(LPOLESTR* outFileName, AM_MEDIA_TYPE* outMediaType);
virtual STDMETHODIMP Load(LPCOLESTR inFileName, const AM_MEDIA_TYPE* inMediaType);