[Deinterlace-checkins] SF.net SVN: deinterlace:[4783] trunk/DScaler5/Filters/Decoders

[<ad...@us...>]

Revision: 4783
          http://deinterlace.svn.sourceforge.net/deinterlace/?rev=4783&view=rev
Author:   adcockj
Date:     2012-03-15 17:00:31 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
Ignore failure to register filter when in per user mode

Modified Paths:
--------------
    trunk/DScaler5/Filters/Decoders/DivxVideo/DivxVideo.cpp
    trunk/DScaler5/Filters/Decoders/MpegAudio/MpegAudio.cpp
    trunk/DScaler5/Filters/Decoders/MpegVideo/MpegVideo.cpp

Modified: trunk/DScaler5/Filters/Decoders/DivxVideo/DivxVideo.cpp
===================================================================
--- trunk/DScaler5/Filters/Decoders/DivxVideo/DivxVideo.cpp	2012-03-15 16:17:49 UTC (rev 4782)
+++ trunk/DScaler5/Filters/Decoders/DivxVideo/DivxVideo.cpp	2012-03-15 17:00:31 UTC (rev 4783)
@@ -123,7 +123,10 @@
 
 
     HRESULT hr = RegisterFilter(CLSID_CDivxDecoder, L"DScaler MPEG4 Video Decoder", &RegInfo);
-    CHECK(hr);
+    if(hr != E_ACCESSDENIED && UsePerUserRegistration)
+    {
+        CHECK(hr);
+    }
 
     for(size_t i(0); i < InputTypes.size(); ++i)
     {

Modified: trunk/DScaler5/Filters/Decoders/MpegAudio/MpegAudio.cpp
===================================================================
--- trunk/DScaler5/Filters/Decoders/MpegAudio/MpegAudio.cpp	2012-03-15 16:17:49 UTC (rev 4782)
+++ trunk/DScaler5/Filters/Decoders/MpegAudio/MpegAudio.cpp	2012-03-15 17:00:31 UTC (rev 4783)
@@ -127,7 +127,10 @@
 
 
     HRESULT hr = RegisterFilter(CLSID_CAudioDecoder, L"DScaler Audio Decoder", &RegInfo);
-    CHECK(hr);
+    if(hr != E_ACCESSDENIED && UsePerUserRegistration)
+    {
+        CHECK(hr);
+    }
     return ClassTableUpdateRegistry(GetThisInstance(), Classes, 0, FALSE, TRUE);
 }
 

Modified: trunk/DScaler5/Filters/Decoders/MpegVideo/MpegVideo.cpp
===================================================================
--- trunk/DScaler5/Filters/Decoders/MpegVideo/MpegVideo.cpp	2012-03-15 16:17:49 UTC (rev 4782)
+++ trunk/DScaler5/Filters/Decoders/MpegVideo/MpegVideo.cpp	2012-03-15 17:00:31 UTC (rev 4783)
@@ -103,7 +103,7 @@
 
 
     HRESULT hr = RegisterFilter(CLSID_CMpegDecoder, L"DScaler Mpeg2 Video Decoder", &RegInfo);
-    if(hr != E_ACCESSDENIED)
+    if(hr != E_ACCESSDENIED && UsePerUserRegistration)
     {
         CHECK(hr);
     }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.