Skip to content
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

Restructure for OF #11

Closed

Conversation

prisonerjohn
Copy link

Hey Lynn,

I restructured your addon a little bit for better compatibility with the OF Project Generator. This folder structure makes it so that you don't need to manually add any files in Visual Studio, it all gets picked up properly when the project is generated.

I also added the two .lib files from the SDK as they were just ~30kb each and now the addon includes all necessary files to run.

Let me know what you think!

@leadedge
Copy link
Owner

Hey Elie, that's excellent.
The thing to consider is NDI requirements for re-distribution and licensing, which is one reason that I avoided the issue by documenting file copy. The NDI SDK documentation goes into detail about it under "SOFTWARE DISTRIBUTION". So I will need to go through that carefully to make sure that NDI visual identification and ELUA terms are met. Leave it with me for a few days.
My initial question is - where does the project generator pick up the files from? I assume that the user has to to install the NDI SDK first. Is that right?

@prisonerjohn
Copy link
Author

Hey! Ah I didn't think about licensing :) All I added were the .lib files, the project already included the .dll and headers, so I'm wondering now if maybe it needs to be an all or nothing situation.

The Project Generator looks in common places for files, so for example:

  • If a path ofxAddon/libs/{libname}/include is found it gets added to the search paths.
  • If a path ofxAddon/libs/{libname}/lib/vs/x64 is found it gets added to the linker paths, and any containing files added to the linker list.
  • If a path ofxAddon/libs/{libname}/export is found its contents just get copied to the bin folder.

These are just defaults, these settings can be fine tuned in the addon_config.mk file too.

All the SDK files are included in the addon now, so I don't think users need to install the NDI SDK first.

@leadedge
Copy link
Owner

Actually including the NDI header files in the repository was a mistake with the update!

Anyway, I think it will be OK to have the NDI lib and include files in the addon repository but I need to look into the requirements carefully. They talk about dynamic loading which I do not want to do because of the complication and the libraries are handled by the project file provided, but I will examine that in particular. Otherwise attention to documentation should solve it.

@leadedge
Copy link
Owner

The only way to resolve licencing requirements is to use dynamic loading of the NDI dlls. I have made changes throughout and it all works, including with installation of the NDI runtime. I think this has messed up the pull request but, if you can sort that out, it should now be possible to set up for the project generator.

@leadedge
Copy link
Owner

Leave it with me for a few more days and I will see if I can sort out the changes so you don't waste any time.

leadedge added a commit that referenced this pull request Nov 16, 2019
Reconfigure folders and include make files for the project generator as per pull request by prisonerjohn (#11).
@leadedge
Copy link
Owner

I had a bit of time to look at this, and I think I have it sorted. At least the generator creates a project, everything is there and it builds OK. If you could have a look and check that everything is right it would be good. When it's all done I will just cancel the pull request.

@linzss
Copy link

linzss commented Nov 28, 2019

hi@leadedge, its a great job you do,forgive me my poor English,but i have a question that when I lancher the sender, i could only recieve images from the same pc,the other pc on the lan couldnot find the sender, the API has a interface to set remote ip,so sadly,but i dont know how,so what do u think about it:)

@leadedge
Copy link
Owner

This is really off-topic here but I suppose people will find it. The code itself has not changed much. The only real change has been update to the latest version 4 NDI and the restructure here. My own use of this is to convert between Spout and NDI on the same machine, so I have not done any practical work between machines for a while. When I get a moment I will make some tests. There are many variables with a network connection so I can't help much. The first test would be between the Newtek Test Patterns application on one machine and Studio Monitor on the other.

@leadedge
Copy link
Owner

I tested with the example sender on one machine and Studio Monitor on the other with a wireless network and it works OK. I will try with the example receiver when I get a moment. Meanwhile I think the sender discovery is working OK. Maybe a firewall issue? Tests with the Newtek programs might help isolate the problem.

@linzss
Copy link

linzss commented Dec 1, 2019

I tested with the example sender on one machine and Studio Monitor on the other with a wireless network and it works OK. I will try with the example receiver when I get a moment. Meanwhile I think the sender discovery is working OK. Maybe a firewall issue? Tests with the Newtek programs might help isolate the problem.

Thank you leadedge,I have closed firewall both machine windows10,and still couldnot find sender,but I'll try it again go on,maybe some else issue. I am truly thankful for your help.

@leadedge
Copy link
Owner

leadedge commented Dec 2, 2019

OK. I can't test the receiver on the other machine due to Windows problems. I am fairly sure it is OK if the sender works. So I hope you can resolve it.

@leadedge
Copy link
Owner

leadedge commented Dec 3, 2019

Elie, I am just going to cancel this pull request because things have become out of sync and it seems to be working. If anything needs to be changed, just let me know. Thanks a lot for your help with this.

@leadedge leadedge closed this Dec 3, 2019
@prisonerjohn
Copy link
Author

Sure thing, sorry for the delay @leadedge I just got busy and didn't get a chance to review this again. I'll let you know if I encounter any issues!

@leadedge
Copy link
Owner

leadedge commented Dec 3, 2019

No problems. I should be able to maintain this myself now that I have the hang of it.

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.

None yet

3 participants