-
Notifications
You must be signed in to change notification settings - Fork 0
Fix aja in not working correctly in linux #13
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.
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
base: nodos-1.3
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -1017,18 +1017,20 @@ bool AJADevice::AcquireDevice() | |||||
| if (GetStreamingApplication(curAppFourCC, curPid)) | ||||||
| { | ||||||
| if (curPid == nosPid) | ||||||
| return true; | ||||||
| auto curApp = FourCCToString(curAppFourCC); | ||||||
| if (curPid != 0) | ||||||
| nosEngine.LogW("Device %s is already acquired by application %s (PID %d). Trying to reclaim it.", GetDisplayName().c_str(), curApp.c_str(), curPid); | ||||||
| { | ||||||
| auto curApp = FourCCToString(curAppFourCC); | ||||||
| if (curPid != 0) | ||||||
| nosEngine.LogW("Device %s is already acquired by application %s (PID %d). Trying to reclaim it.", GetDisplayName().c_str(), curApp.c_str(), curPid); | ||||||
| } | ||||||
|
Comment on lines
1019
to
+1024
|
||||||
| } | ||||||
|
|
||||||
| if (!AcquireStreamForApplication(NOS_FOURCC, nosPid)) | ||||||
| if (!AcquireStreamForApplicationWithReference(NOS_FOURCC, nosPid)) | ||||||
| { | ||||||
| nosEngine.LogE("Failed to acquire device %s for Nodos.", GetDisplayName().c_str()); | ||||||
| return false; | ||||||
| } | ||||||
| nosEngine.LogD("Device %s acquired by Nodos.", GetDisplayName().c_str()); | ||||||
| if(nosPid != curPid) | ||||||
|
||||||
| if(nosPid != curPid) | |
| if (nosPid != curPid) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Inconsistent indentation: this line uses tabs while the surrounding code uses spaces for indentation. This should match the indentation style of the rest of the file.