player teszt, module build javitva

diff --git a/client/DxPlay/PlayerGraph.cs b/client/DxPlay/PlayerGraph.cs
index f664b18a5e84610e10c0aff249b3d1e0fc6920bb..debbc036e74177b467ad822a8eba574dfbfa8c0d 100644 (file)
--- a/client/DxPlay/PlayerGraph.cs
+++ b/client/DxPlay/PlayerGraph.cs
@@ -60,7 +60,7 @@ namespace DxPlay {
                             AddDefaultRenderer(graphBuilder, sampleGrabber);\r
                             break;\r
                         case VideoRendererType.AUTO:\r
-                            //AddDefaultRenderer(graphBuilder, sampleGrabber);\r
+                            AddEVRRenderer(graphBuilder, sampleGrabber);\r
                             break;\r
                     }\r
                     FilterGraphTools.RenderPin(graphBuilder, sampleGrabber, "Output");\r
@@ -279,8 +279,8 @@ namespace DxPlay {
             videoDecoder = FilterProvider.GetVideoFilter(out lavVideoSettings);\r
             if (videoDecoder == null)\r
                 videoDecoder = FilterGraphTools.AddFilterByName(graphBuilder, FilterCategory.LegacyAmFilterCategory, "LAV Video Decoder");\r
-            if (videoDecoder != null)\r
-                graphBuilder.AddFilter(videoDecoder, "LAV Video Decoder");\r
+            //if (videoDecoder != null)\r
+            //    graphBuilder.AddFilter(videoDecoder, "LAV Video Decoder");\r
             return videoDecoder;\r
         }\r
 \r
@@ -292,8 +292,12 @@ namespace DxPlay {
             audioDecoder = FilterProvider.GetAudioFilter(out lavAudioSettings, out lavAudioStatus);\r
             if (audioDecoder == null)\r
                 audioDecoder = FilterGraphTools.AddFilterByName(graphBuilder, FilterCategory.LegacyAmFilterCategory, "LAV Audio Decoder");\r
-            if (audioDecoder != null)\r
-                graphBuilder.AddFilter(audioDecoder, "LAV Audio Decoder");\r
+            //if (audioDecoder != null)\r
+            //    graphBuilder.AddFilter(audioDecoder, "LAV Audio Decoder");\r
+\r
+            IBaseFilter audioSwitcher = FilterGraphTools.AddFilterFromClsid(graphBuilder, new Guid("{18C16B08-6497-420E-AD14-22D21C2CEAB7}"), "Audio Switcher");\r
+            //graphBuilder.AddFilter(audioSwitcher, "Audio Switcher");\r
+\r
             return audioDecoder;\r
         }\r
 \r
@@ -302,13 +306,12 @@ namespace DxPlay {
             IBaseFilter splitter = null;\r
             ILAVSplitterSettings lavSplitterSettings;\r
             splitter = FilterProvider.GetSplitter(out lavSplitterSettings);\r
-            if (splitter == null)\r
-            {\r
+            if (splitter == null) \r
                 splitter = FilterGraphTools.AddFilterByName(graphBuilder, FilterCategory.LegacyAmFilterCategory, "LAV Splitter");\r
-            }\r
+            \r
 \r
-            if (splitter != null)\r
-                graphBuilder.AddFilter(splitter, "LAV Splitter");\r
+            //if (splitter != null)\r
+            //    graphBuilder.AddFilter(splitter, "LAV Splitter");\r
             return splitter;\r
         }\r
 \r

diff --git a/server/user.jobengine.osgi.commons/build-user-jobengine-osgi-commons.launch b/server/user.jobengine.osgi.commons/build-user-jobengine-osgi-commons.launch
deleted file mode 100644 (file)
index d09c777..0000000
--- a/server/user.jobengine.osgi.commons/build-user-jobengine-osgi-commons.launch
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">\r
-<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>\r
-<stringAttribute key="M2_GOALS" value="clean install"/>\r
-<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>\r
-<booleanAttribute key="M2_OFFLINE" value="false"/>\r
-<stringAttribute key="M2_PROFILES" value=""/>\r
-<listAttribute key="M2_PROPERTIES"/>\r
-<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>\r
-<booleanAttribute key="M2_SKIP_TESTS" value="true"/>\r
-<intAttribute key="M2_THREADS" value="1"/>\r
-<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>\r
-<stringAttribute key="M2_USER_SETTINGS" value=""/>\r
-<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>\r
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk"/>\r
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/user.jobengine.osgi.commons}"/>\r
-</launchConfiguration>\r