From: elgekko <vasary@elgekko.net>
Date: Tue, 17 May 2022 08:04:03 +0000 (+0200)
Subject: player teszt, module build javitva
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=c8cc132a33634dcf4a47a9c37a577403b67b83b1;p=mediacube.git

player teszt, module build javitva
---

diff --git a/client/DxPlay/PlayerGraph.cs b/client/DxPlay/PlayerGraph.cs
index f664b18a..debbc036 100644
--- a/client/DxPlay/PlayerGraph.cs
+++ b/client/DxPlay/PlayerGraph.cs
@@ -60,7 +60,7 @@ namespace DxPlay {
                             AddDefaultRenderer(graphBuilder, sampleGrabber);
                             break;
                         case VideoRendererType.AUTO:
-                            //AddDefaultRenderer(graphBuilder, sampleGrabber);
+                            AddEVRRenderer(graphBuilder, sampleGrabber);
                             break;
                     }
                     FilterGraphTools.RenderPin(graphBuilder, sampleGrabber, "Output");
@@ -279,8 +279,8 @@ namespace DxPlay {
             videoDecoder = FilterProvider.GetVideoFilter(out lavVideoSettings);
             if (videoDecoder == null)
                 videoDecoder = FilterGraphTools.AddFilterByName(graphBuilder, FilterCategory.LegacyAmFilterCategory, "LAV Video Decoder");
-            if (videoDecoder != null)
-                graphBuilder.AddFilter(videoDecoder, "LAV Video Decoder");
+            //if (videoDecoder != null)
+            //    graphBuilder.AddFilter(videoDecoder, "LAV Video Decoder");
             return videoDecoder;
         }
 
@@ -292,8 +292,12 @@ namespace DxPlay {
             audioDecoder = FilterProvider.GetAudioFilter(out lavAudioSettings, out lavAudioStatus);
             if (audioDecoder == null)
                 audioDecoder = FilterGraphTools.AddFilterByName(graphBuilder, FilterCategory.LegacyAmFilterCategory, "LAV Audio Decoder");
-            if (audioDecoder != null)
-                graphBuilder.AddFilter(audioDecoder, "LAV Audio Decoder");
+            //if (audioDecoder != null)
+            //    graphBuilder.AddFilter(audioDecoder, "LAV Audio Decoder");
+
+            IBaseFilter audioSwitcher = FilterGraphTools.AddFilterFromClsid(graphBuilder, new Guid("{18C16B08-6497-420E-AD14-22D21C2CEAB7}"), "Audio Switcher");
+            //graphBuilder.AddFilter(audioSwitcher, "Audio Switcher");
+
             return audioDecoder;
         }
 
@@ -302,13 +306,12 @@ namespace DxPlay {
             IBaseFilter splitter = null;
             ILAVSplitterSettings lavSplitterSettings;
             splitter = FilterProvider.GetSplitter(out lavSplitterSettings);
-            if (splitter == null)
-            {
+            if (splitter == null) 
                 splitter = FilterGraphTools.AddFilterByName(graphBuilder, FilterCategory.LegacyAmFilterCategory, "LAV Splitter");
-            }
+            
 
-            if (splitter != null)
-                graphBuilder.AddFilter(splitter, "LAV Splitter");
+            //if (splitter != null)
+            //    graphBuilder.AddFilter(splitter, "LAV Splitter");
             return splitter;
         }
 
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
index d09c777c..00000000
--- 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"?>
-<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
-<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
-<stringAttribute key="M2_GOALS" value="clean install"/>
-<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
-<booleanAttribute key="M2_OFFLINE" value="false"/>
-<stringAttribute key="M2_PROFILES" value=""/>
-<listAttribute key="M2_PROPERTIES"/>
-<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
-<booleanAttribute key="M2_SKIP_TESTS" value="true"/>
-<intAttribute key="M2_THREADS" value="1"/>
-<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
-<stringAttribute key="M2_USER_SETTINGS" value=""/>
-<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/user.jobengine.osgi.commons}"/>
-</launchConfiguration>