[Mediaportal-svn] SF.net SVN: mediaportal: [8903] trunk/mediaportal/TVCapture/Graphs/Analog

[<rt...@us...>]

Revision: 8903
Author:   rtv_sf
Date:     2006-05-29 16:39:46 -0700 (Mon, 29 May 2006)
ViewCVS:  http://svn.sourceforge.net/mediaportal/?rev=8903&view=rev

Log Message:
-----------
reverted the changes - doesn't build graph anymore after reboot / hard to undo
System.IO.FileNotFoundException: Die COM-Klassenfactory f?\195?\131?\194?\188r die Komponente mit CLSID {BAAC8911-1BA2-4EC2-96BA-6FFE42B62F72} konnte aufgrund des folgenden Fehlers nicht abgerufen werden: 8007007e.

Modified Paths:
--------------
    trunk/mediaportal/Core/DirectShowHelper/DirectShowHelper/Release/dshowhelper.dll
    trunk/mediaportal/Core/DirectShowHelper/DirectShowHelper/dshowhelper.cpp
    trunk/mediaportal/Core/DirectShowHelper/DirectShowHelper/dshowhelper.def
    trunk/mediaportal/TVCapture/Graphs/Analog/SinkGraphEx.cs
Modified: trunk/mediaportal/Core/DirectShowHelper/DirectShowHelper/Release/dshowhelper.dll
===================================================================
(Binary files differ)

Modified: trunk/mediaportal/Core/DirectShowHelper/DirectShowHelper/dshowhelper.cpp
===================================================================
--- trunk/mediaportal/Core/DirectShowHelper/DirectShowHelper/dshowhelper.cpp	2006-05-29 21:23:23 UTC (rev 8902)
+++ trunk/mediaportal/Core/DirectShowHelper/DirectShowHelper/dshowhelper.cpp	2006-05-29 23:39:46 UTC (rev 8903)
@@ -668,10 +668,10 @@
     pEnum->Release();
     return (bFound ? hr : E_FAIL);
 }
-void AddTeeSinkNameToGraph(IGraphBuilder* pGraph, LPCOLESTR szName)
+void AddTeeSinkToGraph(IGraphBuilder* pGraph)
 {
 	IBaseFilter* pKernelTee = NULL;
-	int hr = CreateKernelFilter(AM_KSCATEGORY_SPLITTER, szName, clsidTeeSink, &pKernelTee);
+	int hr = CreateKernelFilter(AM_KSCATEGORY_SPLITTER, OLESTR("Tee"),clsidTeeSink, &pKernelTee);
 	if (SUCCEEDED(hr))
 	{
 		pGraph->AddFilter(pKernelTee, L"Kernel Tee");
@@ -680,11 +680,6 @@
 
 }
 
-void AddTeeSinkToGraph(IGraphBuilder* pGraph)
-{
-	AddTeeSinkNameToGraph(pGraph, OLESTR("Tee"));
-}
-
 void AddWstCodecToGraph(IGraphBuilder* pGraph)
 {
 										
@@ -695,4 +690,4 @@
 		pGraph->AddFilter(pWstCodec, L"WST Codec");
 		pWstCodec->Release();
 	}
-}
\ No newline at end of file
+}

Modified: trunk/mediaportal/Core/DirectShowHelper/DirectShowHelper/dshowhelper.def
===================================================================
--- trunk/mediaportal/Core/DirectShowHelper/DirectShowHelper/dshowhelper.def	2006-05-29 21:23:23 UTC (rev 8902)
+++ trunk/mediaportal/Core/DirectShowHelper/DirectShowHelper/dshowhelper.def	2006-05-29 23:39:46 UTC (rev 8903)
@@ -13,5 +13,4 @@
 DvrMsStop					@7
 AddTeeSinkToGraph			@8
 AddWstCodecToGraph			@9
-GrabBitmaps					@10
-AddTeeSinkNameToGraph		@11
+GrabBitmaps @10
\ No newline at end of file

Modified: trunk/mediaportal/TVCapture/Graphs/Analog/SinkGraphEx.cs
===================================================================
--- trunk/mediaportal/TVCapture/Graphs/Analog/SinkGraphEx.cs	2006-05-29 21:23:23 UTC (rev 8902)
+++ trunk/mediaportal/TVCapture/Graphs/Analog/SinkGraphEx.cs	2006-05-29 23:39:46 UTC (rev 8903)
@@ -61,8 +61,6 @@
     [DllImport("dshowhelper.dll", ExactSpelling = true, CharSet = CharSet.Auto, SetLastError = true)]
     unsafe private static extern bool AddTeeSinkToGraph(IGraphBuilder graph);
     [DllImport("dshowhelper.dll", ExactSpelling = true, CharSet = CharSet.Auto, SetLastError = true)]
-    unsafe private static extern bool AddTeeSinkNameToGraph(IGraphBuilder graph, string name);
-    [DllImport("dshowhelper.dll", ExactSpelling = true, CharSet = CharSet.Auto, SetLastError = true)]
     unsafe private static extern void AddWstCodecToGraph(IGraphBuilder graph);
     #endregion
 
@@ -408,30 +406,8 @@
       IBaseFilter teesink = DirectShowUtil.GetFilterByName(_graphBuilderInterface, "Kernel Tee");
       if (teesink == null)
       {
-        Log.Write("SinkGraphEx.SetupTeletext(): Trying to find Kernel Tee...");
-        DsDevice[] devices = DsDevice.GetDevicesOfCat(DirectShowLib.FilterCategory.AMKSSplitter);
-        bool found = false;
-        foreach (DsDevice dev in devices)
-        {
-          Guid clsID;
-          string dName;
-          dev.Mon.GetClassID(out clsID);
-          dev.Mon.GetDisplayName(null, null, out dName);
-          Log.Write("SinkGraphEx.SetupTeletext(): trying filter with ClassID: {0} ; Display Name: {1} ; Name: {2}", clsID, dName, dev.Name);
-          AddTeeSinkNameToGraph(_graphBuilderInterface, dev.Name);
-          teesink = DirectShowUtil.GetFilterByName(_graphBuilderInterface, "Kernel Tee");
-          if (teesink != null)
-          {
-            Log.Write("SinkGraphEx.SetupTeletext(): Found Kernel Tee: {0}", dev.Name);
-            found = true;
-            break;
-          }
-        }
-        if (!found)
-        {
-          Log.WriteFile(Log.LogType.Log, true, "SinkGraphEx.SetupTeletext(): Failed to find Kernel Tee");
-          return;
-        }
+        Log.WriteFile(Log.LogType.Log, true, "SinkGraphEx.SetupTeletext(): Failed to find Kernel Tee");
+        return;
       }
 
       AddWstCodecToGraph(_graphBuilderInterface);//WST Codec


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