Fixed crash when connecting audio pin from Elgato device with audio r…

…enderer
jp9000 · Sep 17, 2014 · 1c248ca · 1c248ca
1 parent 1a9d90c
commit 1c248ca
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/DShowPlugin/DeviceSource.cpp b/DShowPlugin/DeviceSource.cpp
@@ -751,7 +751,24 @@ bool DeviceSource::LoadFilters()
             IPin *audioPin = GetOutputPin(deviceFilter, &MEDIATYPE_Audio);
             if (audioPin)
             {
-                bConnected = SUCCEEDED(err = graph->ConnectDirect(audioPin, audioFilter->GetCapturePin(), nullptr));
+                IPin* audioRendererPin = NULL;
+
+#if 1           // FMB NOTE: Connect with first (= the only) pin of audio renderer
+                IEnumPins* pIEnum = NULL;
+                if (SUCCEEDED(err = audioFilter->EnumPins(&pIEnum)))
+                {
+                    IPin* pIPin = NULL;
+                    pIEnum->Next(1, &audioRendererPin, NULL);
+                    SafeRelease(pIEnum);
+                }
+#else
+                audioFilter->FindPin(L"Audio Input pin (rendered)", &audioRendererPin);
+#endif
+                if (audioRendererPin)
+                {
+                    bConnected = SUCCEEDED(err = graph->ConnectDirect(audioPin, audioRendererPin, nullptr));
+                    audioRendererPin->Release();
+                }
                 audioPin->Release();
             }
         }

diff --git a/DShowPlugin/DeviceSource.h b/DShowPlugin/DeviceSource.h
@@ -115,7 +115,7 @@ class DeviceSource : public ImageSource
     IBaseFilter             *deviceFilter;
     IBaseFilter             *audioDeviceFilter;
     CaptureFilter           *captureFilter;
-    CaptureFilter           *audioFilter;
+    IBaseFilter             *audioFilter; // Audio renderer filter
 
     //---------------------------------