[xiph-commits] r7191 -

[illiminable at dactyl.lonelymoon.com]

trunk/oggdsf/src/lib/core/directshow/dsfOggDemux
Message-ID: <20040720091725.BEE6F9AAAB at dactyl.lonelymoon.com>

Author: illiminable
Date: Tue Jul 20 02:17:25 2004
New Revision: 7191

Modified:
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp
Log:
* Switched the order of a few of the locks.

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp	2004-07-20 07:50:45 UTC (rev 7190)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp	2004-07-20 09:17:23 UTC (rev 7191)
@@ -463,9 +463,9 @@

void OggDemuxSourceFilter::resetStream() {
{
-
+		CAutoLock locDemuxLock(mDemuxLock);
CAutoLock locSourceLock(mSourceFileLock);
-		CAutoLock locDemuxLock(mDemuxLock);
+

//SOURCE ABSTRACTION::: clear, close, open, seek
//mSourceFile.clear();
@@ -613,9 +613,9 @@

//ANX:::Perhaps override here. Provide a different set-up function.
HRESULT OggDemuxSourceFilter::SetUpPins() {
+	CAutoLock locDemuxLock(mDemuxLock);
+	CAutoLock locSourceLock(mSourceFileLock);

-	CAutoLock locSourceLock(mSourceFileLock);
-	CAutoLock locDemuxLock(mDemuxLock);

//SOURCE ABSTRACTION::: open
//mSourceFile.open(StringHelper::toNarrowStr(mFileName).c_str(), ios_base::in|ios_base::binary);