Skip to content

Add fallback for getting device path. #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dcnieho wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add fallback for getting device path. #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions source/dshow-base.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include <ksproxy.h>
#include <Amaudio.h>
#include <Dvdmedia.h>
#include <Propvarutil.h>

#include "ComPtr.hpp"
#include "CoTaskMemPtr.hpp"
Expand Down
24 changes: 24 additions & 0 deletions source/dshow-enum.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,30 @@ static bool EnumDevice(const GUID &type, IMoniker *deviceInfo,
}

propertyData->Read(L"DevicePath", &devicePath, NULL);
if (!devicePath.bstrVal) {
/* fall back to another method to get device path */
LPMALLOC co_malloc = nullptr;
hr = CoGetMalloc(1, &co_malloc);
if (FAILED(hr))
return true;

ComPtr<IBindCtx> bind_ctx = nullptr;
hr = CreateBindCtx(0, &bind_ctx);
if (FAILED(hr))
return true;

LPOLESTR olestr = nullptr;
bool success = true;
hr = deviceInfo->GetDisplayName(bind_ctx, nullptr, &olestr);
if (SUCCEEDED(hr)) {
hr = InitVariantFromString(olestr, &devicePath);
if (FAILED(hr))
success = false;
}
co_malloc->Free(olestr);
if (!success)
return true;
}

hr = deviceInfo->BindToObject(NULL, 0, IID_IBaseFilter,
(void **)&filter);
Expand Down