Skip to content

[SpriteKit] Simplify SKVideoNode creation code. #22719

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
May 6, 2025
Merged

[SpriteKit] Simplify SKVideoNode creation code. #22719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f3b837
[SpriteKit] Simplify SKVideoNode creation code.
rolfbjarne Apr 28, 2025
37ad2ad
Merge remote-tracking branch 'origin/main' into dev/rolf/spritekit-sk…
rolfbjarne May 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 0 additions & 94 deletions src/SpriteKit/SKVideoNode.cs
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/frameworks.sources
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1637,7 +1637,6 @@ SPRITEKIT_SOURCES = \
SpriteKit/SKKeyframeSequence.cs \
SpriteKit/SKNode.cs \
SpriteKit/SKShapeNode.cs \
SpriteKit/SKVideoNode.cs \
SpriteKit/SKWarpGeometryGrid.cs \

# StoreKit
Expand Down
38 changes: 18 additions & 20 deletions src/spritekit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1499,33 +1499,31 @@ partial interface SKVideoNode {
[Static, Export ("videoNodeWithAVPlayer:")]
SKVideoNode FromPlayer (AVPlayer player);

[Static, Export ("videoNodeWithVideoFileNamed:"), Internal]
SKVideoNode VideoNodeWithVideoFileNamed (string videoFile);
/// <summary>Create a video node from the named video file.</summary>
/// <param name="videoFile">The video file to create the <see cref="SKVideoNode" /> from.</param>
[Static, Export ("videoNodeWithFileNamed:")]
SKVideoNode FromFile (string videoFile);

[Static, Export ("videoNodeWithFileNamed:"), Internal]
SKVideoNode VideoNodeWithFileNamed (string videoFile);

[Static, Export ("videoNodeWithVideoURL:"), Internal]
SKVideoNode VideoNodeWithVideoURL (NSUrl videoURL);

[Static, Export ("videoNodeWithURL:"), Internal]
SKVideoNode VideoNodeWithURL (NSUrl videoURL);
/// <summary>Creates a video node from the file at the specified URL.</summary>
/// <param name="videoUrl">The video url to create the <see cref="SKVideoNode" /> from.</param>
[Static, Export ("videoNodeWithURL:")]
SKVideoNode FromUrl (NSUrl videoUrl);

[DesignatedInitializer]
[Export ("initWithAVPlayer:")]
NativeHandle Constructor (AVPlayer player);

[Export ("initWithVideoFileNamed:"), Internal]
IntPtr InitWithVideoFileNamed (string videoFile);

[Export ("initWithFileNamed:"), Internal]
IntPtr InitWithFileNamed (string videoFile);

[Export ("initWithVideoURL:"), Internal]
IntPtr InitWithVideoURL (NSUrl url);
/// <summary>Create a video node from the named video file.</summary>
/// <param name="videoFile">The video file to create the <see cref="SKVideoNode" /> from.</param>
[Export ("initWithFileNamed:")]
[DesignatedInitializer]
NativeHandle Constructor (string videoFile);

[Export ("initWithURL:"), Internal]
IntPtr InitWithURL (NSUrl url);
/// <summary>Creates a video node from the file at the specified URL.</summary>
/// <param name="url">The video url to create the <see cref="SKVideoNode" /> from.</param>
[Export ("initWithURL:")]
[DesignatedInitializer]
NativeHandle Constructor (NSUrl url);

[Export ("play")]
void Play ();
Expand Down
2 changes: 0 additions & 2 deletions tests/cecil-tests/ConstructorTest.KnownFailures.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ public partial class ConstructorTest {
"ModelIO.MDLMesh::.ctor(System.Numerics.Vector3,CoreGraphics.NVector3i,System.Boolean,ModelIO.MDLGeometryType,ModelIO.IMDLMeshBufferAllocator)",
"ModelIO.MDLMesh::.ctor(System.Numerics.Vector3,System.Boolean,ModelIO.MDLGeometryType,ModelIO.IMDLMeshBufferAllocator)",
"ModelIO.MDLNoiseTexture::.ctor(System.Single,System.String,CoreGraphics.NVector2i,ModelIO.MDLTextureChannelEncoding,ModelIO.MDLNoiseTextureType)",
"SpriteKit.SKVideoNode::.ctor(Foundation.NSUrl)",
"SpriteKit.SKVideoNode::.ctor(System.String)",
"SpriteKit.SKWarpGeometryGrid::.ctor(System.IntPtr,System.IntPtr,System.Numerics.Vector2[],System.Numerics.Vector2[])",
"UIKit.UIControlEventProxy::.ctor(UIKit.UIControl,System.EventHandler)",
"UIKit.UIImageStatusDispatcher::.ctor(UIKit.UIImage/SaveStatus)",
Expand Down
2 changes: 0 additions & 2 deletions tests/cecil-tests/SetHandleTest.KnownFailures.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ public partial class SetHandleTest {
"ScreenCaptureKit.SCContentFilter::.ctor(ScreenCaptureKit.SCDisplay,ScreenCaptureKit.SCRunningApplication[],ScreenCaptureKit.SCWindow[],ScreenCaptureKit.SCContentFilterOption)",
"ScreenCaptureKit.SCContentFilter::.ctor(ScreenCaptureKit.SCDisplay,ScreenCaptureKit.SCWindow[],ScreenCaptureKit.SCContentFilterOption)",
"Security.SecTrust2::.ctor(Security.SecTrust)",
"SpriteKit.SKVideoNode::.ctor(Foundation.NSUrl)",
"SpriteKit.SKVideoNode::.ctor(System.String)",
};
}
}
Loading