Skip to content

allow for "linuxbrowser_source" to be controlled#360

Merged
Palakis merged 2 commits into
obsproject:4.x-currentfrom
ZyanKLee:patch-1
Aug 26, 2019
Merged

allow for "linuxbrowser_source" to be controlled#360
Palakis merged 2 commits into
obsproject:4.x-currentfrom
ZyanKLee:patch-1

Conversation

@ZyanKLee
Copy link
Copy Markdown

based on the request at bazukas/obs-linuxbrowser#46 I did a quick search for the string "browser_source" and these seem to be the only two occurrences. Enhancing the conditional with the identifier of the obs-linuxbrowser plugin, this should solve the problem.

As I'm currently not at home, I can't verify this does what it should, but I will test it later tonight.

@mjc666 if you are still interested please give it a test run to verify if these two plugins work together now.

based on the request at bazukas/obs-linuxbrowser#46 I did a quick search for the string "browser_source" and these seem to be the only two occurrences. Enhancing the conditional with the identifier of the obs-linuxbrowser plugin, this should solve the problem.

As I'm currently not at home, I can't verify this does what it should, but I will test it later tonight.

@mjc666 if you are still interested please give it a test run to verify if these two plugins work together now.
@ZyanKLee
Copy link
Copy Markdown
Author

I compiled the plugin and installed it locally. I did not have enough time tonight to really try and control the linuxbrowser plugin from the websocket, but at least nothing broke by my change.

Comment thread src/WSRequestHandler_Sources.cpp Outdated
@Palakis Palakis merged commit 3142e09 into obsproject:4.x-current Aug 26, 2019
@ZyanKLee
Copy link
Copy Markdown
Author

Thank you, @Palakis

@Palakis Palakis added this to the 4.7 milestone Nov 12, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants