syphon support

benkuper · Jul 1, 2024 · e7e454e · e7e454e
1 parent 2e0f247
commit e7e454e
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 23 deletions.
diff --git a/Builds/VisualStudio2022/Chataigne_App.vcxproj b/Builds/VisualStudio2022/Chataigne_App.vcxproj
@@ -3918,7 +3918,6 @@
     <ClInclude Include="..\..\Modules\juce_serial\juce_serial.h"/>
     <ClInclude Include="..\..\Modules\juce_sharedtexture\SharedTexture.h"/>
     <ClInclude Include="..\..\Modules\juce_sharedtexture\SpoutLibrary.h"/>
-    <ClInclude Include="..\..\Modules\juce_sharedtexture\SyphonNSObject.hpp"/>
     <ClInclude Include="..\..\Modules\juce_sharedtexture\juce_sharedtexture.h"/>
     <ClInclude Include="..\..\Modules\juce_simpleweb\asio\asio\include\asio\detail\impl\dev_poll_reactor.hpp"/>
     <ClInclude Include="..\..\Modules\juce_simpleweb\asio\asio\include\asio\detail\impl\epoll_reactor.hpp"/>

diff --git a/Builds/VisualStudio2022/Chataigne_App.vcxproj.filters b/Builds/VisualStudio2022/Chataigne_App.vcxproj.filters
@@ -4018,9 +4018,6 @@
     <ClCompile Include="..\..\Modules\juce_sharedtexture\SharedTexture.cpp">
       <Filter>JUCE Modules\juce_sharedtexture</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Modules\juce_sharedtexture\SyphonNSObject.mm">
-      <Filter>JUCE Modules\juce_sharedtexture</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\Modules\juce_simpleweb\asio\asio\include\asio\impl\src.cpp">
       <Filter>JUCE Modules\juce_simpleweb\asio\asio\include\asio\impl</Filter>
     </ClCompile>
@@ -7194,9 +7191,6 @@
     <ClInclude Include="..\..\Modules\juce_sharedtexture\SpoutLibrary.h">
       <Filter>JUCE Modules\juce_sharedtexture</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Modules\juce_sharedtexture\SyphonNSObject.hpp">
-      <Filter>JUCE Modules\juce_sharedtexture</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\Modules\juce_sharedtexture\juce_sharedtexture.h">
       <Filter>JUCE Modules\juce_sharedtexture</Filter>
     </ClInclude>

diff --git a/Builds/VisualStudio2022_CI/Chataigne_App.vcxproj b/Builds/VisualStudio2022_CI/Chataigne_App.vcxproj
@@ -3918,7 +3918,6 @@
     <ClInclude Include="..\..\Modules\juce_serial\juce_serial.h"/>
     <ClInclude Include="..\..\Modules\juce_sharedtexture\SharedTexture.h"/>
     <ClInclude Include="..\..\Modules\juce_sharedtexture\SpoutLibrary.h"/>
-    <ClInclude Include="..\..\Modules\juce_sharedtexture\SyphonNSObject.hpp"/>
     <ClInclude Include="..\..\Modules\juce_sharedtexture\juce_sharedtexture.h"/>
     <ClInclude Include="..\..\Modules\juce_simpleweb\asio\asio\include\asio\detail\impl\dev_poll_reactor.hpp"/>
     <ClInclude Include="..\..\Modules\juce_simpleweb\asio\asio\include\asio\detail\impl\epoll_reactor.hpp"/>

diff --git a/Builds/VisualStudio2022_CI/Chataigne_App.vcxproj.filters b/Builds/VisualStudio2022_CI/Chataigne_App.vcxproj.filters
@@ -4018,9 +4018,6 @@
     <ClCompile Include="..\..\Modules\juce_sharedtexture\SharedTexture.cpp">
       <Filter>JUCE Modules\juce_sharedtexture</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Modules\juce_sharedtexture\SyphonNSObject.mm">
-      <Filter>JUCE Modules\juce_sharedtexture</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\Modules\juce_simpleweb\asio\asio\include\asio\impl\src.cpp">
       <Filter>JUCE Modules\juce_simpleweb\asio\asio\include\asio\impl</Filter>
     </ClCompile>
@@ -7194,9 +7191,6 @@
     <ClInclude Include="..\..\Modules\juce_sharedtexture\SpoutLibrary.h">
       <Filter>JUCE Modules\juce_sharedtexture</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Modules\juce_sharedtexture\SyphonNSObject.hpp">
-      <Filter>JUCE Modules\juce_sharedtexture</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\Modules\juce_sharedtexture\juce_sharedtexture.h">
       <Filter>JUCE Modules\juce_sharedtexture</Filter>
     </ClInclude>

diff --git a/Builds/VisualStudio2022_Win7CI/Chataigne_App.vcxproj b/Builds/VisualStudio2022_Win7CI/Chataigne_App.vcxproj
@@ -3917,7 +3917,6 @@
     <ClInclude Include="..\..\Modules\juce_serial\juce_serial.h"/>
     <ClInclude Include="..\..\Modules\juce_sharedtexture\SharedTexture.h"/>
     <ClInclude Include="..\..\Modules\juce_sharedtexture\SpoutLibrary.h"/>
-    <ClInclude Include="..\..\Modules\juce_sharedtexture\SyphonNSObject.hpp"/>
     <ClInclude Include="..\..\Modules\juce_sharedtexture\juce_sharedtexture.h"/>
     <ClInclude Include="..\..\Modules\juce_simpleweb\asio\asio\include\asio\detail\impl\dev_poll_reactor.hpp"/>
     <ClInclude Include="..\..\Modules\juce_simpleweb\asio\asio\include\asio\detail\impl\epoll_reactor.hpp"/>

diff --git a/Builds/VisualStudio2022_Win7CI/Chataigne_App.vcxproj.filters b/Builds/VisualStudio2022_Win7CI/Chataigne_App.vcxproj.filters
@@ -4018,9 +4018,6 @@
     <ClCompile Include="..\..\Modules\juce_sharedtexture\SharedTexture.cpp">
       <Filter>JUCE Modules\juce_sharedtexture</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Modules\juce_sharedtexture\SyphonNSObject.mm">
-      <Filter>JUCE Modules\juce_sharedtexture</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\Modules\juce_simpleweb\asio\asio\include\asio\impl\src.cpp">
       <Filter>JUCE Modules\juce_simpleweb\asio\asio\include\asio\impl</Filter>
     </ClCompile>
@@ -7194,9 +7191,6 @@
     <ClInclude Include="..\..\Modules\juce_sharedtexture\SpoutLibrary.h">
       <Filter>JUCE Modules\juce_sharedtexture</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Modules\juce_sharedtexture\SyphonNSObject.hpp">
-      <Filter>JUCE Modules\juce_sharedtexture</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\Modules\juce_sharedtexture\juce_sharedtexture.h">
       <Filter>JUCE Modules\juce_sharedtexture</Filter>
     </ClInclude>

diff --git a/Modules/juce_organicui b/Modules/juce_organicui
diff --git a/Modules/juce_sharedtexture b/Modules/juce_sharedtexture
+1 −1		app/OrganicMainComponent.cpp
+7 −4		dashboard/SharedTextureDashboardItem.cpp
+7 −6		dashboard/SharedTextureDashboardItem.h
+2 −2		dashboard/ui/SharedTextureDashboardItemUI.h
+ −		.DS_Store
+194 −43		SharedTexture.cpp
+36 −27		SharedTexture.h
+0 −42		SyphonNSObject.hpp
+0 −63		SyphonNSObject.mm
+6 −0		juce_sharedtexture.cpp
+1 −5		juce_sharedtexture.h
+3 −2		juce_sharedtexture.mm