diff --git a/Building Syphon.md b/Building Syphon.md index 78835f6..845164b 100644 --- a/Building Syphon.md +++ b/Building Syphon.md @@ -1,5 +1 @@ - We support custom framework builds with unique class names to allow the framework to be embedded in a plugin without conflict with any other loaded instances. - - To create a custom build, set ````SYPHON_UNIQUE_CLASS_NAME_PREFIX=MyPrefix```` in the Preprocessor Macros (````GCC_PREPROCESSOR_DEFINITIONS````) build setting. - - To build the documentation you must have [Doxygen](http://www.doxygen.org/) installed. Use the ````DOXYGEN_PATH```` build setting to set the path (the default is the Applications folder). +To build the documentation you must have [Doxygen](http://www.doxygen.org/) installed. Use the ````DOXYGEN_PATH```` build setting to set the path (the default is the Applications folder). diff --git a/Exported_Symbols.exp b/Exported_Symbols.exp index b8e8af3..865ff85 100755 --- a/Exported_Symbols.exp +++ b/Exported_Symbols.exp @@ -1,47 +1,14 @@ -// -// Exported Symbols.exp -// Syphon -// -// Copyright 2010-2011 bangnoise (Tom Butterworth) & vade (Anton Marini). -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// * Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// -// This file gets passed through the C preprocessor before it is used - - -SYPHON_UNIQUE_CLASS_SYMBOL(SyphonOpenGLClient) -SYPHON_UNIQUE_CLASS_SYMBOL(SyphonClientBase) -SYPHON_UNIQUE_CLASS_SYMBOL(SyphonClient) -SYPHON_UNIQUE_CLASS_SYMBOL(SyphonOpenGLServer) -SYPHON_UNIQUE_CLASS_SYMBOL(SyphonServerBase) -SYPHON_UNIQUE_CLASS_SYMBOL(SyphonServer) -SYPHON_UNIQUE_CLASS_SYMBOL(SyphonServerDirectory) -SYPHON_UNIQUE_CLASS_SYMBOL(SyphonOpenGLImage) -SYPHON_UNIQUE_CLASS_SYMBOL(SyphonImage) -SYPHON_UNIQUE_CLASS_SYMBOL(SyphonMetalServer) -SYPHON_UNIQUE_CLASS_SYMBOL(SyphonMetalClient) - +.objc_class_name_SyphonOpenGLClient +.objc_class_name_SyphonClientBase +.objc_class_name_SyphonClient +.objc_class_name_SyphonOpenGLServer +.objc_class_name_SyphonServerBase +.objc_class_name_SyphonServer +.objc_class_name_SyphonServerDirectory +.objc_class_name_SyphonOpenGLImage +.objc_class_name_SyphonImage +.objc_class_name_SyphonMetalServer +.objc_class_name_SyphonMetalClient _SyphonServerAnnounceNotification _SyphonServerDescriptionAppNameKey _SyphonServerDescriptionIconKey diff --git a/Syphon.h b/Syphon.h index de886a5..86d95e2 100644 --- a/Syphon.h +++ b/Syphon.h @@ -154,25 +154,6 @@ [myClient stop]; @endcode - @section plugins Syphon.framework in a Plugin - - If you are using Syphon in any sort of plugin, please download the framework source and compile a version of the framework with unique class names. This avoids class-name conflicts if another plugin or the host application also embeds the Syphon framework. The framework source is set up to make this easy for you: you just need to change one build setting. - -
    -

  1. Open the framework's Xcode project.

    -

    -
    2. -

  2. Define SYPHON_UNIQUE_CLASS_NAME_PREFIX using the Preprocessor Macros build setting.

    -

    Select the Syphon target in the project window.
    - Click the Build Settings tab to display the build settings.
    - Scroll down (or use the search field) to find the Preprocessor Macros (GCC_PREPROCESSOR_DEFINITIONS) setting.
    - Double click the setting to add SYPHON_UNIQUE_CLASS_NAME_PREFIX=MyPluginName as a macro. -

    3. -

  3. Build the framework.

    -

    The built framework will have custom class names. The headers alias the custom names, so you can use SyphonOpenGLServer, SyphonOpenGLClient, SyphonOpenGLImage and SyphonServerDirectory as normal in your code.
    -

    4. -
- @section help More examples and help Example projects implementing a server and client are included with the Syphon SDK. You can also examine the source to some Syphon implementations on GitHub. diff --git a/Syphon.xcodeproj/project.pbxproj b/Syphon.xcodeproj/project.pbxproj index 062bd94..6098018 100644 --- a/Syphon.xcodeproj/project.pbxproj +++ b/Syphon.xcodeproj/project.pbxproj @@ -30,14 +30,14 @@ 1B09098711CD9A1C00BCBE41 /* SyphonClientConnectionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1B09098511CD9A1C00BCBE41 /* SyphonClientConnectionManager.h */; settings = {ATTRIBUTES = (); }; }; 1B09098811CD9A1C00BCBE41 /* SyphonClientConnectionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B09098611CD9A1C00BCBE41 /* SyphonClientConnectionManager.m */; }; 565D06A925CAA2FA0048C4DD /* SyphonMetalServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 565D06A525CAA2F90048C4DD /* SyphonMetalServer.m */; }; - 565D06AA25CAA2FA0048C4DD /* SyphonMetalServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 565D06A625CAA2F90048C4DD /* SyphonMetalServer.h */; }; + 565D06AA25CAA2FA0048C4DD /* SyphonMetalServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 565D06A625CAA2F90048C4DD /* SyphonMetalServer.h */; settings = {ATTRIBUTES = (Public, ); }; }; 565D06AC25CAA2FA0048C4DD /* SyphonMetalClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 565D06A825CAA2FA0048C4DD /* SyphonMetalClient.m */; }; 8488126624361D4D008E17CC /* SyphonServerRendererMetal.h in Headers */ = {isa = PBXBuildFile; fileRef = 8488126424361D4C008E17CC /* SyphonServerRendererMetal.h */; }; 8488126724361D4D008E17CC /* SyphonServerRendererMetal.m in Sources */ = {isa = PBXBuildFile; fileRef = 8488126524361D4D008E17CC /* SyphonServerRendererMetal.m */; }; 84E4D22A2385927B00E24F2D /* Metal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84E4D2292385927B00E24F2D /* Metal.framework */; }; 8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; }; 8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */; }; - BD038877122EAB1A007725FF /* SyphonImageBase.h in Headers */ = {isa = PBXBuildFile; fileRef = BD038875122EAB1A007725FF /* SyphonImageBase.h */; }; + BD038877122EAB1A007725FF /* SyphonImageBase.h in Headers */ = {isa = PBXBuildFile; fileRef = BD038875122EAB1A007725FF /* SyphonImageBase.h */; settings = {ATTRIBUTES = (Public, ); }; }; BD038878122EAB1A007725FF /* SyphonImageBase.m in Sources */ = {isa = PBXBuildFile; fileRef = BD038876122EAB1A007725FF /* SyphonImageBase.m */; }; BD038887122EABE2007725FF /* SyphonOpenGLImage.m in Sources */ = {isa = PBXBuildFile; fileRef = BD038886122EABE2007725FF /* SyphonOpenGLImage.m */; }; BD27307611D2B85E0084BB5E /* SyphonPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = BD27307511D2B85E0084BB5E /* SyphonPrivate.h */; }; @@ -63,19 +63,20 @@ E21003C71D85F9320066E934 /* SyphonIOSurfaceImageLegacy.m in Sources */ = {isa = PBXBuildFile; fileRef = E21003C51D85F9320066E934 /* SyphonIOSurfaceImageLegacy.m */; }; E21003CA1D85FAD00066E934 /* SyphonIOSurfaceImageCore.h in Headers */ = {isa = PBXBuildFile; fileRef = E21003C81D85FAD00066E934 /* SyphonIOSurfaceImageCore.h */; }; E21003CB1D85FAD00066E934 /* SyphonIOSurfaceImageCore.m in Sources */ = {isa = PBXBuildFile; fileRef = E21003C91D85FAD00066E934 /* SyphonIOSurfaceImageCore.m */; }; - E218B67618436D38004FD9E3 /* SyphonOpenGLServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1B0906BE11CBB0F500BCBE41 /* SyphonOpenGLServer.h */; }; - E218B67718436D3B004FD9E3 /* SyphonOpenGLClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1B0906C411CBB1C100BCBE41 /* SyphonOpenGLClient.h */; }; - E218B67818436D3F004FD9E3 /* SyphonOpenGLImage.h in Headers */ = {isa = PBXBuildFile; fileRef = BD038870122EA9FF007725FF /* SyphonOpenGLImage.h */; }; - E218B67918436D41004FD9E3 /* SyphonServerDirectory.h in Headers */ = {isa = PBXBuildFile; fileRef = BD606D6611D2842D00E02702 /* SyphonServerDirectory.h */; }; - E219FB59233CDC3B00FB7F63 /* SyphonClientBase.h in Headers */ = {isa = PBXBuildFile; fileRef = E219FB57233CDC3B00FB7F63 /* SyphonClientBase.h */; }; + E218B67618436D38004FD9E3 /* SyphonOpenGLServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1B0906BE11CBB0F500BCBE41 /* SyphonOpenGLServer.h */; settings = {ATTRIBUTES = (Public, ); }; }; + E218B67718436D3B004FD9E3 /* SyphonOpenGLClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1B0906C411CBB1C100BCBE41 /* SyphonOpenGLClient.h */; settings = {ATTRIBUTES = (Public, ); }; }; + E218B67818436D3F004FD9E3 /* SyphonOpenGLImage.h in Headers */ = {isa = PBXBuildFile; fileRef = BD038870122EA9FF007725FF /* SyphonOpenGLImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; + E218B67918436D41004FD9E3 /* SyphonServerDirectory.h in Headers */ = {isa = PBXBuildFile; fileRef = BD606D6611D2842D00E02702 /* SyphonServerDirectory.h */; settings = {ATTRIBUTES = (Public, ); }; }; + E219FB59233CDC3B00FB7F63 /* SyphonClientBase.h in Headers */ = {isa = PBXBuildFile; fileRef = E219FB57233CDC3B00FB7F63 /* SyphonClientBase.h */; settings = {ATTRIBUTES = (Public, ); }; }; E219FB5A233CDC3B00FB7F63 /* SyphonClientBase.m in Sources */ = {isa = PBXBuildFile; fileRef = E219FB58233CDC3B00FB7F63 /* SyphonClientBase.m */; }; - E240462423EF6B7A004C14E9 /* SyphonServer.h in Headers */ = {isa = PBXBuildFile; fileRef = E240462223EF6B7A004C14E9 /* SyphonServer.h */; }; + E240462423EF6B7A004C14E9 /* SyphonServer.h in Headers */ = {isa = PBXBuildFile; fileRef = E240462223EF6B7A004C14E9 /* SyphonServer.h */; settings = {ATTRIBUTES = (Public, ); }; }; E240462523EF6B7A004C14E9 /* SyphonServer.m in Sources */ = {isa = PBXBuildFile; fileRef = E240462323EF6B7A004C14E9 /* SyphonServer.m */; }; - E240462823EF6F7E004C14E9 /* SyphonClient.h in Headers */ = {isa = PBXBuildFile; fileRef = E240462623EF6F7E004C14E9 /* SyphonClient.h */; }; + E240462823EF6F7E004C14E9 /* SyphonClient.h in Headers */ = {isa = PBXBuildFile; fileRef = E240462623EF6F7E004C14E9 /* SyphonClient.h */; settings = {ATTRIBUTES = (Public, ); }; }; E240462923EF6F7E004C14E9 /* SyphonClient.m in Sources */ = {isa = PBXBuildFile; fileRef = E240462723EF6F7E004C14E9 /* SyphonClient.m */; }; - E240463023EF71D4004C14E9 /* SyphonImage.h in Headers */ = {isa = PBXBuildFile; fileRef = E240462E23EF71D4004C14E9 /* SyphonImage.h */; }; + E240463023EF71D4004C14E9 /* SyphonImage.h in Headers */ = {isa = PBXBuildFile; fileRef = E240462E23EF71D4004C14E9 /* SyphonImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; E240463123EF71D4004C14E9 /* SyphonImage.m in Sources */ = {isa = PBXBuildFile; fileRef = E240462F23EF71D4004C14E9 /* SyphonImage.m */; }; - E240463523F0B9EF004C14E9 /* SyphonSubclassing.h in Headers */ = {isa = PBXBuildFile; fileRef = E240463423F0B9EF004C14E9 /* SyphonSubclassing.h */; }; + E240463523F0B9EF004C14E9 /* SyphonSubclassing.h in Headers */ = {isa = PBXBuildFile; fileRef = E240463423F0B9EF004C14E9 /* SyphonSubclassing.h */; settings = {ATTRIBUTES = (Public, ); }; }; + E28AAA8E29E5EB2F0016DB31 /* SyphonMetalClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 565D06A725CAA2FA0048C4DD /* SyphonMetalClient.h */; settings = {ATTRIBUTES = (Public, ); }; }; E28D0C9A1D8F43380036DF26 /* SyphonServerRendererCoreGL.h in Headers */ = {isa = PBXBuildFile; fileRef = E28D0C981D8F43380036DF26 /* SyphonServerRendererCoreGL.h */; }; E28D0C9B1D8F43380036DF26 /* SyphonServerRendererCoreGL.m in Sources */ = {isa = PBXBuildFile; fileRef = E28D0C991D8F43380036DF26 /* SyphonServerRendererCoreGL.m */; }; E28D0CA81D9296520036DF26 /* SyphonGLShader.h in Headers */ = {isa = PBXBuildFile; fileRef = E28D0CA61D9296520036DF26 /* SyphonGLShader.h */; }; @@ -87,7 +88,7 @@ E28D0CB41D95770C0036DF26 /* SyphonServerGLVertices.h in Headers */ = {isa = PBXBuildFile; fileRef = E28D0CB21D95770C0036DF26 /* SyphonServerGLVertices.h */; }; E28D0CB51D95770C0036DF26 /* SyphonServerGLVertices.m in Sources */ = {isa = PBXBuildFile; fileRef = E28D0CB31D95770C0036DF26 /* SyphonServerGLVertices.m */; }; E2C755A72964C19D00C8B5D5 /* SyphonMetalShaders.metal in Sources */ = {isa = PBXBuildFile; fileRef = E2C755A62964C19D00C8B5D5 /* SyphonMetalShaders.metal */; }; - E2CF04FE227398E600B8CD19 /* SyphonServerBase.h in Headers */ = {isa = PBXBuildFile; fileRef = E2CF04FC227398E600B8CD19 /* SyphonServerBase.h */; }; + E2CF04FE227398E600B8CD19 /* SyphonServerBase.h in Headers */ = {isa = PBXBuildFile; fileRef = E2CF04FC227398E600B8CD19 /* SyphonServerBase.h */; settings = {ATTRIBUTES = (Public, ); }; }; E2CF04FF227398E600B8CD19 /* SyphonServerBase.m in Sources */ = {isa = PBXBuildFile; fileRef = E2CF04FD227398E600B8CD19 /* SyphonServerBase.m */; }; E2D6C8881D8B470E00108260 /* SyphonCGL.c in Sources */ = {isa = PBXBuildFile; fileRef = E2D6C8861D8B470E00108260 /* SyphonCGL.c */; }; E2D6C8891D8B470E00108260 /* SyphonCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = E2D6C8871D8B470E00108260 /* SyphonCGL.h */; }; @@ -161,7 +162,6 @@ BDFAE526148CDA84008C9E6F /* SyphonOpenGLFunctions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SyphonOpenGLFunctions.h; sourceTree = ""; }; BDFBD77B126F4D8800075A23 /* SyphonDispatch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SyphonDispatch.h; sourceTree = ""; }; BDFBD77C126F4D8800075A23 /* SyphonDispatch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SyphonDispatch.c; sourceTree = ""; }; - BDFE68091228684F009C2E21 /* SyphonBuildMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SyphonBuildMacros.h; sourceTree = ""; }; D2F7E79907B2D74100F64583 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = ""; }; E21003C41D85F9320066E934 /* SyphonIOSurfaceImageLegacy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SyphonIOSurfaceImageLegacy.h; sourceTree = ""; }; E21003C51D85F9320066E934 /* SyphonIOSurfaceImageLegacy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SyphonIOSurfaceImageLegacy.m; sourceTree = ""; }; @@ -357,7 +357,6 @@ 32C88DFF0371C24200C91783 /* Other Sources */ = { isa = PBXGroup; children = ( - BDFE68091228684F009C2E21 /* SyphonBuildMacros.h */, 32DBCF5E0370ADEE00C91783 /* Syphon_Prefix.pch */, ); name = "Other Sources"; @@ -475,19 +474,23 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - E2D6C8891D8B470E00108260 /* SyphonCGL.h in Headers */, - E21003C61D85F9320066E934 /* SyphonIOSurfaceImageLegacy.h in Headers */, + BD038877122EAB1A007725FF /* SyphonImageBase.h in Headers */, + E240463023EF71D4004C14E9 /* SyphonImage.h in Headers */, + E218B67818436D3F004FD9E3 /* SyphonOpenGLImage.h in Headers */, + E2CF04FE227398E600B8CD19 /* SyphonServerBase.h in Headers */, E240462423EF6B7A004C14E9 /* SyphonServer.h in Headers */, - 1B0906C911CBB1CE00BCBE41 /* Syphon.h in Headers */, + 565D06AA25CAA2FA0048C4DD /* SyphonMetalServer.h in Headers */, E218B67618436D38004FD9E3 /* SyphonOpenGLServer.h in Headers */, - E218B67718436D3B004FD9E3 /* SyphonOpenGLClient.h in Headers */, - E28D0C9A1D8F43380036DF26 /* SyphonServerRendererCoreGL.h in Headers */, - E240463023EF71D4004C14E9 /* SyphonImage.h in Headers */, - E240463523F0B9EF004C14E9 /* SyphonSubclassing.h in Headers */, E219FB59233CDC3B00FB7F63 /* SyphonClientBase.h in Headers */, - E218B67818436D3F004FD9E3 /* SyphonOpenGLImage.h in Headers */, E240462823EF6F7E004C14E9 /* SyphonClient.h in Headers */, + E2D6C8891D8B470E00108260 /* SyphonCGL.h in Headers */, + E28AAA8E29E5EB2F0016DB31 /* SyphonMetalClient.h in Headers */, E218B67918436D41004FD9E3 /* SyphonServerDirectory.h in Headers */, + E218B67718436D3B004FD9E3 /* SyphonOpenGLClient.h in Headers */, + E240463523F0B9EF004C14E9 /* SyphonSubclassing.h in Headers */, + E21003C61D85F9320066E934 /* SyphonIOSurfaceImageLegacy.h in Headers */, + 1B0906C911CBB1CE00BCBE41 /* Syphon.h in Headers */, + E28D0C9A1D8F43380036DF26 /* SyphonServerRendererCoreGL.h in Headers */, E28D0CB01D9542B30036DF26 /* SyphonGLVertices.h in Headers */, E28D0CB41D95770C0036DF26 /* SyphonServerGLVertices.h in Headers */, 1B09098711CD9A1C00BCBE41 /* SyphonClientConnectionManager.h in Headers */, @@ -499,16 +502,13 @@ E2D6C8901D8B4DED00108260 /* SyphonServerRendererLegacyGL.h in Headers */, 8488126624361D4D008E17CC /* SyphonServerRendererMetal.h in Headers */, BDB8DA311211F59A0028D250 /* SyphonCFMessageReceiver.h in Headers */, - E2CF04FE227398E600B8CD19 /* SyphonServerBase.h in Headers */, BDB8DA351211F59A0028D250 /* SyphonMessageSender.h in Headers */, BDB8DA371211F59A0028D250 /* SyphonCFMessageSender.h in Headers */, BDB8DAF51211FA7F0028D250 /* SyphonMessaging.h in Headers */, - BD038877122EAB1A007725FF /* SyphonImageBase.h in Headers */, E28D0CAC1D930B9F0036DF26 /* SyphonServerGLShader.h in Headers */, E2DE7FD312495BF50081453B /* SyphonMessageQueue.h in Headers */, E21003CA1D85FAD00066E934 /* SyphonIOSurfaceImageCore.h in Headers */, BDFBD77D126F4D8800075A23 /* SyphonDispatch.h in Headers */, - 565D06AA25CAA2FA0048C4DD /* SyphonMetalServer.h in Headers */, BDFAE528148CDA84008C9E6F /* SyphonOpenGLFunctions.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -520,9 +520,7 @@ isa = PBXNativeTarget; buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "Syphon" */; buildPhases = ( - BDFE6806122866C7009C2E21 /* Generate Exported Symbols File */, 8DC2EF500486A6940098B216 /* Headers */, - BDE0C5FC1229457900DDF631 /* Generate Public Headers */, 8DC2EF520486A6940098B216 /* Resources */, 8DC2EF540486A6940098B216 /* Sources */, 8DC2EF560486A6940098B216 /* Frameworks */, @@ -585,7 +583,6 @@ files = ( ); inputPaths = ( - "$(SRCROOT)/SyphonBuildMacros.h", "$(SRCROOT)/SyphonClient.h", "$(SRCROOT)/SyphonImage.h", "$(SRCROOT)/SyphonServerDirectory.h", @@ -603,62 +600,6 @@ shellPath = /bin/sh; shellScript = "# Syphon doxygen script based on http://developer.apple.com/tools/creatingdocsetswithdoxygen.html\n# Build the doxygen documentation for the project and load the docset into Xcode.\n\n# Use the following to adjust the value of the $DOXYGEN_PATH User-Defined Setting:\n# Binary install location: /Applications/Doxygen.app/Contents/Resources/doxygen\n# Source build install location: /usr/local/bin/doxygen\n\n# If the config file doesn't exist, run 'doxygen -g $SOURCE_ROOT/doxygen.config' to \n# a get default file.\n\nif ! [ -f \"$SOURCE_ROOT/doxygen.config\" ] \nthen \n echo doxygen config file does not exist\n $DOXYGEN_PATH -g \"$SOURCE_ROOT/doxygen.config\"\nfi\n\n# Make the Derived File directory if it doesn't exist, and delete previous output\nmkdir -p \"$DERIVED_FILE_DIR\"\nrm -rf \"$DERIVED_FILE_DIR/DoxygenDocs\"\n\n# Append the proper input/output directories and docset info to the config file.\n# This works even though values are assigned higher up in the file. Easier than sed.\n\ncp \"$SOURCE_ROOT/doxygen.config\" \"$TEMP_DIR/doxygen.config\"\n\necho \"INPUT = \\\"$BUILT_PRODUCTS_DIR/Syphon.framework/Headers/\\\" \\\"$SRCROOT/footer.html\\\" \\\"$SRCROOT/customdoxygen.css\\\"\" >> \"$TEMP_DIR/doxygen.config\"\necho \"OUTPUT_DIRECTORY = \\\"$DERIVED_FILE_DIR/DoxygenDocs\\\"\" >> \"$TEMP_DIR/doxygen.config\"\n\n# Run doxygen on the updated config file.\n# Note: doxygen creates a Makefile that does most of the heavy lifting.\n\n$DOXYGEN_PATH \"$TEMP_DIR/doxygen.config\"\n\n# make will invoke docsetutil. Take a look at the Makefile to see how this is done.\n\nmake -C \"$DERIVED_FILE_DIR/DoxygenDocs/html\" install\n\n# Copy the results back to our Built Products directory\n\nrm -rf \"$BUILT_PRODUCTS_DIR/FrameworkDocumentation\"\ncp -R \"$DERIVED_FILE_DIR/DoxygenDocs/html\" \"$BUILT_PRODUCTS_DIR/FrameworkDocumentation\"\nrm -f \"$BUILT_PRODUCTS_DIR/FrameworkDocumentation/Info.plist\"\nrm -f \"$BUILT_PRODUCTS_DIR/FrameworkDocumentation/installdox\"\nrm -f \"$BUILT_PRODUCTS_DIR/FrameworkDocumentation/Makefile\"\nrm -f \"$BUILT_PRODUCTS_DIR/FrameworkDocumentation/Nodes.xml\"\nrm -f \"$BUILT_PRODUCTS_DIR/FrameworkDocumentation/Tokens.xml\"\n\n\nexit 0\n"; }; - BDE0C5FC1229457900DDF631 /* Generate Public Headers */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(SRCROOT)/SyphonClient.h", - "$(SRCROOT)/SyphonServer.h", - "$(SRCROOT)/SyphonServerDirectory.h", - "$(SRCROOT)/SyphonBuildMacros.h", - "$(SRCROOT)/SyphonImage.h", - "$(SRCROOT)/SyphonServerBase.h", - "$(SRCROOT)/SyphonClientBase.h", - "$(SRCROOT)/SyphonImageBase.h", - "$(SRCROOT)/SyphonOpenGLImage.h", - "$(SRCROOT)/SyphonOpenGLServer.h", - "$(SRCROOT)/SyphonOpenGLClient.h", - "$(SRCROOT)/SyphonSubclassing.h", - "$(SRCROOT)/SyphonMetalClient.h", - "$(SRCROOT)/SyphonMetalServer.h", - ); - name = "Generate Public Headers"; - outputPaths = ( - $BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Headers/SyphonClient.h, - $BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Headers/SyphonServer.h, - $BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Headers/SyphonServerDirectory.h, - $BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Headers/SyphonImage.h, - $BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Headers/SyphonServerBase.h, - $BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Headers/SyphonClientBase.h, - $BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Headers/SyphonImageBase.h, - $BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Headers/SyphonOpenGLImage.h, - $BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Headers/SyphonOpenGLServer.h, - $BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Headers/SyphonOpenGLClient.h, - $BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Headers/SyphonSubclassing.h, - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "mkdir -p \"$DERIVED_FILE_DIR\"\ncombined=\"\"\nfor def in $GCC_PREPROCESSOR_DEFINITIONS\ndo\ncombined=\"${combined} -D${def}\"\ndone\nfor header in \"SyphonOpenGLClient\" \"SyphonClientBase\" \"SyphonClient\" \"SyphonOpenGLServer\" \"SyphonServerBase\" \"SyphonServer\" \"SyphonServerDirectory\" \"SyphonImageBase\" \"SyphonOpenGLImage\" \"SyphonImage\" \"SyphonSubclassing\" \"SyphonMetalClient\" \"SyphonMetalServer\"\ndo\nsed 's:#import://SYPHON_IMPORT_PLACEHOLDER:' \"$SRCROOT/${header}.h\" > \"$DERIVED_FILE_DIR/${header}_stage_1.h\"\nclang -E -C -P -nostdinc ${combined} -DSYPHON_HEADER_BUILD_PHASE -include \"$SRCROOT/SyphonBuildMacros.h\" \"$DERIVED_FILE_DIR/${header}_stage_1.h\" -o \"$DERIVED_FILE_DIR/${header}_stage_2.h\"\nsed 's://SYPHON_IMPORT_PLACEHOLDER:#import:' \"$DERIVED_FILE_DIR/${header}_stage_2.h\" > \"$DERIVED_FILE_DIR/${header}_stage_3.h\"\nsed '/./,$!d' \"$DERIVED_FILE_DIR/${header}_stage_3.h\" > \"$DERIVED_FILE_DIR/${header}_stage_4.h\"\ncat -s \"$DERIVED_FILE_DIR/${header}_stage_4.h\" > \"$DERIVED_FILE_DIR/${header}.h\"\nrm \"$DERIVED_FILE_DIR/${header}_stage_1.h\"\nrm \"$DERIVED_FILE_DIR/${header}_stage_2.h\"\nrm \"$DERIVED_FILE_DIR/${header}_stage_3.h\"\nrm \"$DERIVED_FILE_DIR/${header}_stage_4.h\"\ncp \"$DERIVED_FILE_DIR/${header}.h\" \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Headers/${header}.h\"\ndone\n"; - }; - BDFE6806122866C7009C2E21 /* Generate Exported Symbols File */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(SRCROOT)/SyphonBuildMacros.h", - "$(SRCROOT)/Exported_Symbols.exp", - ); - name = "Generate Exported Symbols File"; - outputPaths = ( - "$(DERIVED_FILE_DIR)/Exported_Symbols.exp", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "mkdir -p \"$DERIVED_FILE_DIR\"\ncombined=\"\"\nfor def in $GCC_PREPROCESSOR_DEFINITIONS\ndo\ncombined=\"${combined} -D${def}\"\ndone\nclang -E -P -nostdinc ${combined} -include \"$SRCROOT/SyphonBuildMacros.h\" -x c \"$SRCROOT/Exported_Symbols.exp\" -o \"$DERIVED_FILE_DIR/Exported_Symbols.exp\"\n"; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -740,7 +681,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - EXPORTED_SYMBOLS_FILE = $DERIVED_FILE_DIR/Exported_Symbols.exp; + EXPORTED_SYMBOLS_FILE = $SRCROOT/Exported_Symbols.exp; FRAMEWORK_VERSION = A; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -769,7 +710,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - EXPORTED_SYMBOLS_FILE = $DERIVED_FILE_DIR/Exported_Symbols.exp; + EXPORTED_SYMBOLS_FILE = $SRCROOT/Exported_Symbols.exp; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = Syphon_Prefix.pch; @@ -934,7 +875,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - EXPORTED_SYMBOLS_FILE = $DERIVED_FILE_DIR/Exported_Symbols.exp; + EXPORTED_SYMBOLS_FILE = $SRCROOT/Exported_Symbols.exp; FRAMEWORK_VERSION = A; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; diff --git a/SyphonBuildMacros.h b/SyphonBuildMacros.h deleted file mode 100644 index 7affb09..0000000 --- a/SyphonBuildMacros.h +++ /dev/null @@ -1,12 +0,0 @@ -#define SYPHON_CONCAT(x, y) SYPHON_CONCAT_EXPANDED(x, y) -#define SYPHON_CONCAT_EXPANDED(x, y) x ## y -#define SYPHON_SYMBOL_FROM_CLASS_NAME(NAME) SYPHON_CONCAT(.objc_class_name_, NAME) - -#ifdef SYPHON_UNIQUE_CLASS_NAME_PREFIX - #define SYPHON_UNIQUE_CLASS_NAME(CLASS_NAME) SYPHON_CONCAT(SYPHON_UNIQUE_CLASS_NAME_PREFIX, CLASS_NAME) - #define SYPHON_UNIQUE_CLASS_SYMBOL(CLASS_NAME) SYPHON_SYMBOL_FROM_CLASS_NAME(SYPHON_UNIQUE_CLASS_NAME(CLASS_NAME)) - #define SYPHON_USE_CLASS_ALIAS -#else - #define SYPHON_UNIQUE_CLASS_NAME(CLASS_NAME) CLASS_NAME - #define SYPHON_UNIQUE_CLASS_SYMBOL(CLASS_NAME) SYPHON_SYMBOL_FROM_CLASS_NAME(CLASS_NAME) -#endif diff --git a/SyphonCFMessageReceiver.h b/SyphonCFMessageReceiver.h index 715934d..bc09023 100644 --- a/SyphonCFMessageReceiver.h +++ b/SyphonCFMessageReceiver.h @@ -30,12 +30,6 @@ #import #import "SyphonMessageReceiver.h" -#define SYPHON_CFMESSAGE_RECEIVER_UNIQUE_CLASS_NAME SYPHON_UNIQUE_CLASS_NAME(SyphonCFMessageReceiver) - -@interface SYPHON_CFMESSAGE_RECEIVER_UNIQUE_CLASS_NAME : SyphonMessageReceiver +@interface SyphonCFMessageReceiver : SyphonMessageReceiver @end - -#if defined(SYPHON_USE_CLASS_ALIAS) -@compatibility_alias SyphonCFMessageReceiver SYPHON_CFMESSAGE_RECEIVER_UNIQUE_CLASS_NAME; -#endif diff --git a/SyphonCFMessageSender.h b/SyphonCFMessageSender.h index 2f530a3..54cf9e4 100644 --- a/SyphonCFMessageSender.h +++ b/SyphonCFMessageSender.h @@ -32,11 +32,5 @@ #import "SyphonMessageQueue.h" #import "SyphonDispatch.h" -#define SYPHON_CFMESSAGE_SENDER_UNIQUE_CLASS_NAME SYPHON_UNIQUE_CLASS_NAME(SyphonCFMessageSender) - -@interface SYPHON_CFMESSAGE_SENDER_UNIQUE_CLASS_NAME : SyphonMessageSender +@interface SyphonCFMessageSender : SyphonMessageSender @end - -#if defined(SYPHON_USE_CLASS_ALIAS) -@compatibility_alias SyphonCFMessageSender SYPHON_CFMESSAGE_SENDER_UNIQUE_CLASS_NAME; -#endif diff --git a/SyphonClient.h b/SyphonClient.h index a53dd0b..4916137 100644 --- a/SyphonClient.h +++ b/SyphonClient.h @@ -31,15 +31,9 @@ NS_ASSUME_NONNULL_BEGIN -#define SYPHON_CLIENT_UNIQUE_CLASS_NAME SYPHON_UNIQUE_CLASS_NAME(SyphonClient) - DEPRECATED_MSG_ATTRIBUTE("Use SyphonOpenGLClient") -@interface SYPHON_CLIENT_UNIQUE_CLASS_NAME : SyphonOpenGLClient -- (id)initWithServerDescription:(NSDictionary *)description context:(CGLContextObj)context options:(nullable NSDictionary *)options newFrameHandler:(nullable void (^)(SYPHON_CLIENT_UNIQUE_CLASS_NAME *client))handler; +@interface SyphonClient : SyphonOpenGLClient +- (id)initWithServerDescription:(NSDictionary *)description context:(CGLContextObj)context options:(nullable NSDictionary *)options newFrameHandler:(nullable void (^)(SyphonClient *client))handler; @end -#if defined(SYPHON_USE_CLASS_ALIAS) -@compatibility_alias SyphonClient SYPHON_CLIENT_UNIQUE_CLASS_NAME; -#endif - NS_ASSUME_NONNULL_END diff --git a/SyphonClientBase.h b/SyphonClientBase.h index aa78736..3794eec 100644 --- a/SyphonClientBase.h +++ b/SyphonClientBase.h @@ -31,9 +31,7 @@ NS_ASSUME_NONNULL_BEGIN -#define SYPHON_CLIENT_BASE_UNIQUE_CLASS_NAME SYPHON_UNIQUE_CLASS_NAME(SyphonClientBase) - -@interface SYPHON_CLIENT_BASE_UNIQUE_CLASS_NAME : NSObject +@interface SyphonClientBase : NSObject /*! Returns a new client instance for the described server. You should check the isValid property after initialization to ensure a connection was made to the server. @param description Typically acquired from the shared SyphonServerDirectory, or one of Syphon's notifications. @@ -66,8 +64,4 @@ NS_ASSUME_NONNULL_BEGIN @property (readonly) BOOL hasNewFrame; @end -#if defined(SYPHON_USE_CLASS_ALIAS) -@compatibility_alias SyphonClientBase SYPHON_CLIENT_BASE_UNIQUE_CLASS_NAME; -#endif - NS_ASSUME_NONNULL_END diff --git a/SyphonClientConnectionManager.h b/SyphonClientConnectionManager.h index aeb508f..15294ca 100644 --- a/SyphonClientConnectionManager.h +++ b/SyphonClientConnectionManager.h @@ -53,9 +53,7 @@ - (void)invalidateFrame; @end -#define SYPHON_CLIENT_CONNECTION_MANAGER_UNIQUE_CLASS_NAME SYPHON_UNIQUE_CLASS_NAME(SyphonClientConnectionManager) - -@interface SYPHON_CLIENT_CONNECTION_MANAGER_UNIQUE_CLASS_NAME : NSObject +@interface SyphonClientConnectionManager : NSObject - (id)initWithServerDescription:(NSDictionary *)description; @property (readonly) BOOL isValid; - (void)addInfoClient:(id )client isFrameClient:(BOOL)frameClient; // Must be @@ -63,7 +61,3 @@ - (IOSurfaceRef)newSurface; @property (readonly) NSUInteger frameID; @end - -#if defined(SYPHON_USE_CLASS_ALIAS) -@compatibility_alias SyphonClientConnectionManager SYPHON_CLIENT_CONNECTION_MANAGER_UNIQUE_CLASS_NAME; -#endif diff --git a/SyphonImage.h b/SyphonImage.h index 2b59453..0a5dc9b 100644 --- a/SyphonImage.h +++ b/SyphonImage.h @@ -31,15 +31,9 @@ NS_ASSUME_NONNULL_BEGIN -#define SYPHON_IMAGE_UNIQUE_CLASS_NAME SYPHON_UNIQUE_CLASS_NAME(SyphonImage) - DEPRECATED_MSG_ATTRIBUTE("Use SyphonOpenGLImage") -@interface SYPHON_IMAGE_UNIQUE_CLASS_NAME : SyphonOpenGLImage +@interface SyphonImage : SyphonOpenGLImage @end -#if defined(SYPHON_USE_CLASS_ALIAS) -@compatibility_alias SyphonImage SYPHON_IMAGE_UNIQUE_CLASS_NAME; -#endif - NS_ASSUME_NONNULL_END diff --git a/SyphonImageBase.h b/SyphonImageBase.h index 368d7bc..a80c7d7 100644 --- a/SyphonImageBase.h +++ b/SyphonImageBase.h @@ -30,9 +30,7 @@ #import #import -#define SYPHON_IMAGE_BASE_UNIQUE_CLASS_NAME SYPHON_UNIQUE_CLASS_NAME(SyphonImageBase) - -@interface SYPHON_IMAGE_BASE_UNIQUE_CLASS_NAME : NSObject +@interface SyphonImageBase : NSObject /*! If you implement your own subclass of SyphonImageBase, you must call this designated initializer from your own initializer. @@ -43,7 +41,3 @@ */ - (id)initWithSurface:(IOSurfaceRef)surfaceRef NS_DESIGNATED_INITIALIZER; @end - -#if defined(SYPHON_USE_CLASS_ALIAS) -@compatibility_alias SyphonImageBase SYPHON_IMAGE_BASE_UNIQUE_CLASS_NAME; -#endif diff --git a/SyphonMessageQueue.h b/SyphonMessageQueue.h index da76cc3..73339ca 100644 --- a/SyphonMessageQueue.h +++ b/SyphonMessageQueue.h @@ -38,9 +38,7 @@ */ -#define SYPHON_MESSAGE_QUEUE_UNIQUE_CLASS_NAME SYPHON_UNIQUE_CLASS_NAME(SyphonMessageQueue) - -@interface SYPHON_MESSAGE_QUEUE_UNIQUE_CLASS_NAME : NSObject +@interface SyphonMessageQueue : NSObject - (void)queue:(NSData *)content ofType:(uint32_t)type; /* @@ -58,7 +56,3 @@ @property (readwrite, assign) void *userInfo; @end - -#if defined(SYPHON_USE_CLASS_ALIAS) -@compatibility_alias SyphonMessageQueue SYPHON_MESSAGE_QUEUE_UNIQUE_CLASS_NAME; -#endif diff --git a/SyphonMessageReceiver.h b/SyphonMessageReceiver.h index 6fdc12f..483a6b9 100644 --- a/SyphonMessageReceiver.h +++ b/SyphonMessageReceiver.h @@ -29,9 +29,7 @@ #import -#define SYPHON_MESSAGE_RECEIVER_UNIQUE_CLASS_NAME SYPHON_UNIQUE_CLASS_NAME(SyphonMessageReceiver) - -@interface SYPHON_MESSAGE_RECEIVER_UNIQUE_CLASS_NAME : NSObject +@interface SyphonMessageReceiver : NSObject - (id)initForName:(NSString *)name protocol:(NSString *)protocolName allowedClasses:(NSSet *)classes @@ -41,10 +39,6 @@ // Always invalidate before release - (void)invalidate; @end -@interface SYPHON_MESSAGE_RECEIVER_UNIQUE_CLASS_NAME (Subclassing) +@interface SyphonMessageReceiver (Subclassing) - (void)receiveMessageWithPayload:(id)payload ofType:(uint32_t)type; @end - -#if defined(SYPHON_USE_CLASS_ALIAS) -@compatibility_alias SyphonMessageReceiver SYPHON_MESSAGE_RECEIVER_UNIQUE_CLASS_NAME; -#endif diff --git a/SyphonMessageSender.h b/SyphonMessageSender.h index a06db1c..89312f2 100644 --- a/SyphonMessageSender.h +++ b/SyphonMessageSender.h @@ -29,18 +29,12 @@ #import -#define SYPHON_MESSAGE_SENDER_UNIQUE_CLASS_NAME SYPHON_UNIQUE_CLASS_NAME(SyphonMessageSender) - -@interface SYPHON_MESSAGE_SENDER_UNIQUE_CLASS_NAME : NSObject +@interface SyphonMessageSender : NSObject - (id)initForName:(NSString *)name protocol:(NSString *)protocolName invalidationHandler:(void (^)(void))handler; @property (readonly) NSString *name; @property (readonly) BOOL isValid; - (void)send:(id )payload ofType:(uint32_t)type; @end -@interface SYPHON_MESSAGE_SENDER_UNIQUE_CLASS_NAME (Subclassing) +@interface SyphonMessageSender (Subclassing) - (void)invalidate; @end - -#if defined(SYPHON_USE_CLASS_ALIAS) -@compatibility_alias SyphonMessageSender SYPHON_MESSAGE_SENDER_UNIQUE_CLASS_NAME; -#endif diff --git a/SyphonMetalClient.h b/SyphonMetalClient.h index 37b0b30..0058cfb 100644 --- a/SyphonMetalClient.h +++ b/SyphonMetalClient.h @@ -31,11 +31,9 @@ #import #import -#define SYPHON_METAL_CLIENT_UNIQUE_CLASS_NAME SYPHON_UNIQUE_CLASS_NAME(SyphonMetalClient) - NS_ASSUME_NONNULL_BEGIN -@interface SYPHON_METAL_CLIENT_UNIQUE_CLASS_NAME : SyphonClientBase +@interface SyphonMetalClient : SyphonClientBase /*! Returns a new client instance for the described server. You should check the isValid property after initialization to ensure a connection was made to the server. @@ -48,7 +46,7 @@ NS_ASSUME_NONNULL_BEGIN - (id)initWithServerDescription:(NSDictionary *)description device:(id)device options:(nullable NSDictionary *)options - newFrameHandler:(nullable void (^)(SYPHON_METAL_CLIENT_UNIQUE_CLASS_NAME *client))handler; + newFrameHandler:(nullable void (^)(SyphonMetalClient *client))handler; /*! Returns a MTLTexture representing the current output from the server. The texture associated with the image may continue to update when you draw with it, but you should not depend on that behaviour: call this method every time you wish to access the current server frame. @@ -64,9 +62,4 @@ Stops the client from receiving any further frames from the server. Use of this @end - -#if defined(SYPHON_USE_CLASS_ALIAS) -@compatibility_alias SyphonMetalClient SYPHON_METAL_CLIENT_UNIQUE_CLASS_NAME; -#endif - NS_ASSUME_NONNULL_END diff --git a/SyphonMetalClient.m b/SyphonMetalClient.m index cfbdd4d..fa81bd5 100644 --- a/SyphonMetalClient.m +++ b/SyphonMetalClient.m @@ -31,7 +31,7 @@ #import "SyphonSubclassing.h" #import -@implementation SYPHON_METAL_CLIENT_UNIQUE_CLASS_NAME +@implementation SyphonMetalClient { os_unfair_lock _threadLock; id _frame; @@ -43,7 +43,7 @@ @implementation SYPHON_METAL_CLIENT_UNIQUE_CLASS_NAME - (id)initWithServerDescription:(NSDictionary *)description device:(id)theDevice options:(NSDictionary *)options - newFrameHandler:(void (^)(SYPHON_METAL_CLIENT_UNIQUE_CLASS_NAME *client))handler + newFrameHandler:(void (^)(SyphonMetalClient *client))handler { self = [super initWithServerDescription:description options:options newFrameHandler:handler]; if( self ) diff --git a/SyphonMetalServer.h b/SyphonMetalServer.h index 9910d5d..b47b447 100644 --- a/SyphonMetalServer.h +++ b/SyphonMetalServer.h @@ -51,8 +51,7 @@ extern NSString * const SyphonServerOptionIsPrivate; It is safe to access instances of this class across threads. */ -#define SYPHON_METAL_SERVER_UNIQUE_CLASS_NAME SYPHON_UNIQUE_CLASS_NAME(SyphonMetalServer) -@interface SYPHON_METAL_SERVER_UNIQUE_CLASS_NAME : SyphonServerBase +@interface SyphonMetalServer : SyphonServerBase /** @name Instantiation */ /** @{ */ diff --git a/SyphonMetalServer.m b/SyphonMetalServer.m index 754f1e6..47b6e52 100644 --- a/SyphonMetalServer.m +++ b/SyphonMetalServer.m @@ -32,7 +32,7 @@ #import "SyphonPrivate.h" #import "SyphonSubclassing.h" -@implementation SYPHON_METAL_SERVER_UNIQUE_CLASS_NAME +@implementation SyphonMetalServer { id _surfaceTexture; id _device; diff --git a/SyphonOpenGLClient.h b/SyphonOpenGLClient.h index c4e5f08..f218ef8 100644 --- a/SyphonOpenGLClient.h +++ b/SyphonOpenGLClient.h @@ -31,8 +31,6 @@ #import #import -#define SYPHON_OPENGL_CLIENT_UNIQUE_CLASS_NAME SYPHON_UNIQUE_CLASS_NAME(SyphonOpenGLClient) - @class SyphonOpenGLImage; NS_ASSUME_NONNULL_BEGIN @@ -45,7 +43,7 @@ NS_ASSUME_NONNULL_BEGIN It is safe to access instances of this class across threads, with the usual limitatiions related to OpenGL. The calls to SyphonOpenGLClient which may cause work to be done in a GL context are: -newFrameImage, -stop and -release. */ -@interface SYPHON_OPENGL_CLIENT_UNIQUE_CLASS_NAME : SyphonClientBase +@interface SyphonOpenGLClient : SyphonClientBase /*! Returns a new client instance for the described server. You should check the isValid property after initialization to ensure a connection was made to the server. @@ -55,7 +53,7 @@ NS_ASSUME_NONNULL_BEGIN @param handler A block which is invoked when a new frame becomes available. handler may be nil. This block may be invoked on a thread other than that on which the client was created. @returns A newly initialized SyphonOpenGLClient object, or nil if a client could not be created. */ -- (id)initWithServerDescription:(NSDictionary *)description context:(CGLContextObj)context options:(nullable NSDictionary *)options newFrameHandler:(nullable void (^)(SYPHON_OPENGL_CLIENT_UNIQUE_CLASS_NAME *client))handler; +- (id)initWithServerDescription:(NSDictionary *)description context:(CGLContextObj)context options:(nullable NSDictionary *)options newFrameHandler:(nullable void (^)(SyphonOpenGLClient *client))handler; /*! Returns the CGLContextObj associated with the client. @@ -97,8 +95,4 @@ NS_ASSUME_NONNULL_BEGIN @end -#if defined(SYPHON_USE_CLASS_ALIAS) -@compatibility_alias SyphonOpenGLClient SYPHON_OPENGL_CLIENT_UNIQUE_CLASS_NAME; -#endif - NS_ASSUME_NONNULL_END diff --git a/SyphonOpenGLImage.h b/SyphonOpenGLImage.h index a696665..c555f32 100644 --- a/SyphonOpenGLImage.h +++ b/SyphonOpenGLImage.h @@ -31,15 +31,13 @@ #import #import -#define SYPHON_OPENGL_IMAGE_UNIQUE_CLASS_NAME SYPHON_UNIQUE_CLASS_NAME(SyphonOpenGLImage) - NS_ASSUME_NONNULL_BEGIN /** SyphonImage represents an image stored as an OpenGL texture of type GL_TEXTURE_RECTANGLE. */ -@interface SYPHON_OPENGL_IMAGE_UNIQUE_CLASS_NAME : SyphonImageBase +@interface SyphonOpenGLImage : SyphonImageBase /** A GLuint representing the texture name. The associated texture is of type GL_TEXTURE_RECTANGLE. @@ -52,8 +50,4 @@ NS_ASSUME_NONNULL_BEGIN @property (readonly) NSSize textureSize; @end -#if defined(SYPHON_USE_CLASS_ALIAS) -@compatibility_alias SyphonOpenGLImage SYPHON_OPENGL_IMAGE_UNIQUE_CLASS_NAME; -#endif - NS_ASSUME_NONNULL_END diff --git a/SyphonOpenGLServer.h b/SyphonOpenGLServer.h index 2836427..c231277 100644 --- a/SyphonOpenGLServer.h +++ b/SyphonOpenGLServer.h @@ -71,11 +71,9 @@ extern NSString * const SyphonServerOptionStencilBufferResolution; It is safe to access instances of this class across threads, except for those calls related to OpenGL: a call to bindToDrawFrameOfSize: must have returned before a call is made to unbindAndPublish, and these methods must be paired and called in order. You should not call the stop method while the FBO is bound. */ -#define SYPHON_OPENGL_SERVER_UNIQUE_CLASS_NAME SYPHON_UNIQUE_CLASS_NAME(SyphonOpenGLServer) - @class SyphonOpenGLImage; -@interface SYPHON_OPENGL_SERVER_UNIQUE_CLASS_NAME : SyphonServerBase +@interface SyphonOpenGLServer : SyphonServerBase /** @name Instantiation */ /** @{ */ @@ -170,8 +168,4 @@ YES if clients are currently attached, NO otherwise. If you generate frames freq /** @} */ @end -#if defined(SYPHON_USE_CLASS_ALIAS) -@compatibility_alias SyphonOpenGLServer SYPHON_OPENGL_SERVER_UNIQUE_CLASS_NAME; -#endif - NS_ASSUME_NONNULL_END diff --git a/SyphonOpenGLServer.m b/SyphonOpenGLServer.m index 5ab944f..36c641e 100644 --- a/SyphonOpenGLServer.m +++ b/SyphonOpenGLServer.m @@ -50,7 +50,7 @@ @implementation SyphonOpenGLServer CGLContextObj _shareContext; BOOL _pushPending; - SYPHON_OPENGL_IMAGE_UNIQUE_CLASS_NAME *_surfaceTexture; + SyphonOpenGLImage *_surfaceTexture; BOOL _wantsContextChanges; @@ -229,7 +229,7 @@ - (void)publishFrameTexture:(GLuint)texID textureTarget:(GLenum)target imageRegi [_renderer endInContext]; } -- (SYPHON_OPENGL_IMAGE_UNIQUE_CLASS_NAME *)newFrameImage +- (SyphonOpenGLImage *)newFrameImage { return _surfaceTexture; } diff --git a/SyphonServer.h b/SyphonServer.h index 651730d..7fb759d 100644 --- a/SyphonServer.h +++ b/SyphonServer.h @@ -31,15 +31,9 @@ NS_ASSUME_NONNULL_BEGIN -#define SYPHON_SERVER_UNIQUE_CLASS_NAME SYPHON_UNIQUE_CLASS_NAME(SyphonServer) - DEPRECATED_MSG_ATTRIBUTE("Use SyphonOpenGLServer") -@interface SYPHON_SERVER_UNIQUE_CLASS_NAME : SyphonOpenGLServer +@interface SyphonServer : SyphonOpenGLServer @end -#if defined(SYPHON_USE_CLASS_ALIAS) -@compatibility_alias SyphonServer SYPHON_SERVER_UNIQUE_CLASS_NAME; -#endif - NS_ASSUME_NONNULL_END diff --git a/SyphonServerBase.h b/SyphonServerBase.h index c52363f..ed83980 100644 --- a/SyphonServerBase.h +++ b/SyphonServerBase.h @@ -37,9 +37,7 @@ NS_ASSUME_NONNULL_BEGIN */ extern NSString * const SyphonServerOptionIsPrivate; -#define SYPHON_SERVER_BASE_UNIQUE_CLASS_NAME SYPHON_UNIQUE_CLASS_NAME(SyphonServerBase) - -@interface SYPHON_SERVER_BASE_UNIQUE_CLASS_NAME : NSObject +@interface SyphonServerBase : NSObject /*! If you implement your own subclass of SyphonServerBase, you must call this designated initializer from your own initializer. @@ -73,8 +71,4 @@ extern NSString * const SyphonServerOptionIsPrivate; @end -#if defined(SYPHON_USE_CLASS_ALIAS) -@compatibility_alias SyphonServerBase SYPHON_SERVER_BASE_UNIQUE_CLASS_NAME; -#endif - NS_ASSUME_NONNULL_END diff --git a/SyphonServerConnectionManager.h b/SyphonServerConnectionManager.h index b02eb67..19b0db8 100644 --- a/SyphonServerConnectionManager.h +++ b/SyphonServerConnectionManager.h @@ -36,9 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. This isn't a problem currently, as SyphonServer is KVO compliant for name/serverDescription */ -#define SYPHON_SERVER_CONNECTION_MANAGER_UNIQUE_CLASS_NAME SYPHON_UNIQUE_CLASS_NAME(SyphonServerConnectionManager) - -@interface SYPHON_SERVER_CONNECTION_MANAGER_UNIQUE_CLASS_NAME : NSObject +@interface SyphonServerConnectionManager : NSObject - (id)initWithUUID:(NSString *)uuid options:(NSDictionary *)options; @property (readonly) NSDictionary *surfaceDescription; /* @@ -53,7 +51,3 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - (void)setSurfaceID:(IOSurfaceID)newID; - (void)setName:(NSString *)name; @end - -#if defined(SYPHON_USE_CLASS_ALIAS) -@compatibility_alias SyphonServerConnectionManager SYPHON_SERVER_CONNECTION_MANAGER_UNIQUE_CLASS_NAME; -#endif diff --git a/SyphonServerDirectory.h b/SyphonServerDirectory.h index c1d457b..1fd2a09 100644 --- a/SyphonServerDirectory.h +++ b/SyphonServerDirectory.h @@ -88,15 +88,13 @@ extern NSString * const SyphonServerRetireNotification; SyphonServerDirectory provides information on available Syphon Servers. Servers are represented by dictionaries. Generally you can expect to find some or all of the keys listed in Constants. */ -#define SYPHON_SERVER_DIRECTORY_UNIQUE_CLASS_NAME SYPHON_UNIQUE_CLASS_NAME(SyphonServerDirectory) - -@interface SYPHON_SERVER_DIRECTORY_UNIQUE_CLASS_NAME : NSObject +@interface SyphonServerDirectory : NSObject /*! Returns the shared server directory instance. This object is KVO complaint, and can be used to observe changes in server availability, server names and statuses. @returns the shared server instance */ -+ (SYPHON_SERVER_DIRECTORY_UNIQUE_CLASS_NAME *)sharedDirectory; ++ (SyphonServerDirectory *)sharedDirectory; /*! NSArray of NSDictionaries that describe (using the keys above) currently available SyphonServer instances on the system. @@ -113,8 +111,4 @@ extern NSString * const SyphonServerRetireNotification; @end -#if defined(SYPHON_USE_CLASS_ALIAS) -@compatibility_alias SyphonServerDirectory SYPHON_SERVER_DIRECTORY_UNIQUE_CLASS_NAME; -#endif - NS_ASSUME_NONNULL_END diff --git a/Syphon_Prefix.pch b/Syphon_Prefix.pch index c52c38e..7842df4 100644 --- a/Syphon_Prefix.pch +++ b/Syphon_Prefix.pch @@ -27,8 +27,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#import "SyphonBuildMacros.h" - #if SYPHON_DEBUG_NO_DRAWING #define DEBUG 1 #endif