#310

git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32801

diff --git a/client/DxPlay/PlayerGraph.cs b/client/DxPlay/PlayerGraph.cs
index beee83bcfeaf1e731b84896795b73d336a67b1a5..396bcab7d8831dbd5ce5e05a5404c666420af60f 100644 (file)
--- a/client/DxPlay/PlayerGraph.cs
+++ b/client/DxPlay/PlayerGraph.cs
@@ -6,7 +6,7 @@ using System;
 using System.Runtime.InteropServices;\r
 \r
 namespace DxPlay\r
-{/*lejatsztasi sebesseg megkeresese */\r
+{\r
     public class PlayerGraph : FilterGraph, IDisposable\r
     {\r
 #if DEBUG\r
@@ -97,6 +97,7 @@ namespace DxPlay
             catch (Exception e)\r
             {\r
                 logger.Error(e.Message);\r
+                logger.Error(e.StackTrace);\r
                 throw e;\r
             }\r
         }\r
@@ -140,7 +141,7 @@ namespace DxPlay
             }\r
             catch (Exception e)\r
             {\r
-                logger.Error(e);\r
+                logger.Error(e.StackTrace);\r
                 graphBuilder.RemoveFilter(videoRenderer);\r
                 logger.Info("Trying default VideoRenderer instead Video Mixing Renderer 9");\r
                 AddDefaultRenderer(graphBuilder, sampleGrabber);\r
@@ -167,7 +168,7 @@ namespace DxPlay
             }\r
             catch (Exception e)\r
             {\r
-                logger.Error(e);\r
+                logger.Error(e.StackTrace);\r
                 graphBuilder.RemoveFilter(videoRenderer);\r
                 logger.Info("Trying default VideoRenderer instead Video Mixing Renderer 7");\r
                 AddDefaultRenderer(graphBuilder, sampleGrabber);\r
@@ -240,8 +241,9 @@ namespace DxPlay
         {\r
             logger.Debug("Add LAVSplitter to graph");\r
             IBaseFilter splitter = LoadSplitter(graphBuilder);\r
-            if (splitter == null)\r
+            if (splitter == null) {\r
                 throw new Exception("Can not load splitter!");\r
+            }\r
             logger.Debug("Connect SourceFilter -> LAVSplitter");\r
             FilterGraphTools.ConnectFilters(graphBuilder, sourceFilter, "Output", splitter, "Input", true);\r
             return splitter;\r
@@ -303,7 +305,9 @@ namespace DxPlay
             ILAVSplitterSettings lavSplitterSettings;\r
             splitter = FilterProvider.GetSplitter(out lavSplitterSettings);\r
             if (splitter == null)\r
+            {\r
                 splitter = FilterGraphTools.AddFilterByName(graphBuilder, FilterCategory.LegacyAmFilterCategory, "LAV Splitter");\r
+            }\r
 \r
             if (splitter != null)\r
                 graphBuilder.AddFilter(splitter, "LAV Splitter");\r
@@ -331,7 +335,10 @@ namespace DxPlay
                     FilterGraphTools.RemoveAllFilters(graphBuilder);\r
                 }\r
 \r
-                Marshal.ReleaseComObject(this);\r
+                if (this != null)\r
+                { \r
+                    Marshal.ReleaseComObject(this); \r
+                }\r
                 isDisposed = true;\r
             }\r
         }\r