From 8bcb209ec97f98549c1c6176656d613d7cf09972 Mon Sep 17 00:00:00 2001 From: Ruslan Balanukhin Date: Thu, 25 Aug 2022 22:53:27 +0200 Subject: [PATCH] Fix namings --- ...{FunctionLocatorBase.cs => FunctionResolverBase.cs} | 2 +- ...tionLoaderFactory.cs => FunctionResolverFactory.cs} | 10 +++++----- .../{IFunctionLocator.cs => IFunctionResolver.cs} | 2 +- ...inuxFunctionLocator.cs => LinuxFunctionResolver.cs} | 2 +- .../{MacFunctionLocator.cs => MacFunctionResolver.cs} | 2 +- ...wsFunctionLocator.cs => WindowsFunctionResolver.cs} | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) rename FFmpeg.AutoGen.Bindings.DynamicallyLoaded/{FunctionLocatorBase.cs => FunctionResolverBase.cs} (98%) rename FFmpeg.AutoGen.Bindings.DynamicallyLoaded/{FunctionLoaderFactory.cs => FunctionResolverFactory.cs} (78%) rename FFmpeg.AutoGen.Bindings.DynamicallyLoaded/{IFunctionLocator.cs => IFunctionResolver.cs} (96%) rename FFmpeg.AutoGen.Bindings.DynamicallyLoaded/Native/{LinuxFunctionLocator.cs => LinuxFunctionResolver.cs} (92%) rename FFmpeg.AutoGen.Bindings.DynamicallyLoaded/Native/{MacFunctionLocator.cs => MacFunctionResolver.cs} (93%) rename FFmpeg.AutoGen.Bindings.DynamicallyLoaded/Native/{WindowsFunctionLocator.cs => WindowsFunctionResolver.cs} (98%) diff --git a/FFmpeg.AutoGen.Bindings.DynamicallyLoaded/FunctionLocatorBase.cs b/FFmpeg.AutoGen.Bindings.DynamicallyLoaded/FunctionResolverBase.cs similarity index 98% rename from FFmpeg.AutoGen.Bindings.DynamicallyLoaded/FunctionLocatorBase.cs rename to FFmpeg.AutoGen.Bindings.DynamicallyLoaded/FunctionResolverBase.cs index c83aa1fe..4900a69e 100644 --- a/FFmpeg.AutoGen.Bindings.DynamicallyLoaded/FunctionLocatorBase.cs +++ b/FFmpeg.AutoGen.Bindings.DynamicallyLoaded/FunctionResolverBase.cs @@ -6,7 +6,7 @@ namespace FFmpeg.AutoGen.Bindings.DynamicallyLoaded; -public abstract class FunctionLocatorBase : IFunctionLocator +public abstract class FunctionResolverBase : IFunctionResolver { public static readonly Dictionary LibraryDependenciesMap = new() diff --git a/FFmpeg.AutoGen.Bindings.DynamicallyLoaded/FunctionLoaderFactory.cs b/FFmpeg.AutoGen.Bindings.DynamicallyLoaded/FunctionResolverFactory.cs similarity index 78% rename from FFmpeg.AutoGen.Bindings.DynamicallyLoaded/FunctionLoaderFactory.cs rename to FFmpeg.AutoGen.Bindings.DynamicallyLoaded/FunctionResolverFactory.cs index 5b4c8407..42d16aef 100644 --- a/FFmpeg.AutoGen.Bindings.DynamicallyLoaded/FunctionLoaderFactory.cs +++ b/FFmpeg.AutoGen.Bindings.DynamicallyLoaded/FunctionResolverFactory.cs @@ -4,7 +4,7 @@ namespace FFmpeg.AutoGen.Bindings.DynamicallyLoaded; -public static class FunctionLoaderFactory +public static class FunctionResolverFactory { public static PlatformID GetPlatformId() { @@ -19,16 +19,16 @@ public static PlatformID GetPlatformId() #endif } - public static IFunctionLocator Create() + public static IFunctionResolver Create() { switch (GetPlatformId()) { case PlatformID.MacOSX: - return new MacFunctionLocator(); + return new MacFunctionResolver(); case PlatformID.Unix: - return new LinuxFunctionLocator(); + return new LinuxFunctionResolver(); case PlatformID.Win32NT: - return new WindowsFunctionLocator(); + return new WindowsFunctionResolver(); default: throw new PlatformNotSupportedException(); } diff --git a/FFmpeg.AutoGen.Bindings.DynamicallyLoaded/IFunctionLocator.cs b/FFmpeg.AutoGen.Bindings.DynamicallyLoaded/IFunctionResolver.cs similarity index 96% rename from FFmpeg.AutoGen.Bindings.DynamicallyLoaded/IFunctionLocator.cs rename to FFmpeg.AutoGen.Bindings.DynamicallyLoaded/IFunctionResolver.cs index b8c6c6f4..a64bbf8a 100644 --- a/FFmpeg.AutoGen.Bindings.DynamicallyLoaded/IFunctionLocator.cs +++ b/FFmpeg.AutoGen.Bindings.DynamicallyLoaded/IFunctionResolver.cs @@ -8,7 +8,7 @@ namespace FFmpeg.AutoGen /// /// Supports loading functions from native libraries. Provides a more flexible alternative to P/Invoke. /// - public interface IFunctionLocator + public interface IFunctionResolver { /// diff --git a/FFmpeg.AutoGen.Bindings.DynamicallyLoaded/Native/LinuxFunctionLocator.cs b/FFmpeg.AutoGen.Bindings.DynamicallyLoaded/Native/LinuxFunctionResolver.cs similarity index 92% rename from FFmpeg.AutoGen.Bindings.DynamicallyLoaded/Native/LinuxFunctionLocator.cs rename to FFmpeg.AutoGen.Bindings.DynamicallyLoaded/Native/LinuxFunctionResolver.cs index 080ce78d..22efcf12 100644 --- a/FFmpeg.AutoGen.Bindings.DynamicallyLoaded/Native/LinuxFunctionLocator.cs +++ b/FFmpeg.AutoGen.Bindings.DynamicallyLoaded/Native/LinuxFunctionResolver.cs @@ -3,7 +3,7 @@ namespace FFmpeg.AutoGen.Bindings.DynamicallyLoaded.Native; -public class LinuxFunctionLocator : FunctionLocatorBase +public class LinuxFunctionResolver : FunctionResolverBase { private const string Libdl = "libdl.so.2"; diff --git a/FFmpeg.AutoGen.Bindings.DynamicallyLoaded/Native/MacFunctionLocator.cs b/FFmpeg.AutoGen.Bindings.DynamicallyLoaded/Native/MacFunctionResolver.cs similarity index 93% rename from FFmpeg.AutoGen.Bindings.DynamicallyLoaded/Native/MacFunctionLocator.cs rename to FFmpeg.AutoGen.Bindings.DynamicallyLoaded/Native/MacFunctionResolver.cs index a50022ef..7acf1906 100644 --- a/FFmpeg.AutoGen.Bindings.DynamicallyLoaded/Native/MacFunctionLocator.cs +++ b/FFmpeg.AutoGen.Bindings.DynamicallyLoaded/Native/MacFunctionResolver.cs @@ -3,7 +3,7 @@ namespace FFmpeg.AutoGen.Bindings.DynamicallyLoaded.Native; -public class MacFunctionLocator : FunctionLocatorBase +public class MacFunctionResolver : FunctionResolverBase { private const string Libdl = "libdl"; diff --git a/FFmpeg.AutoGen.Bindings.DynamicallyLoaded/Native/WindowsFunctionLocator.cs b/FFmpeg.AutoGen.Bindings.DynamicallyLoaded/Native/WindowsFunctionResolver.cs similarity index 98% rename from FFmpeg.AutoGen.Bindings.DynamicallyLoaded/Native/WindowsFunctionLocator.cs rename to FFmpeg.AutoGen.Bindings.DynamicallyLoaded/Native/WindowsFunctionResolver.cs index 81fc58db..e00d28c7 100644 --- a/FFmpeg.AutoGen.Bindings.DynamicallyLoaded/Native/WindowsFunctionLocator.cs +++ b/FFmpeg.AutoGen.Bindings.DynamicallyLoaded/Native/WindowsFunctionResolver.cs @@ -3,7 +3,7 @@ namespace FFmpeg.AutoGen.Bindings.DynamicallyLoaded.Native; -public class WindowsFunctionLocator : FunctionLocatorBase +public class WindowsFunctionResolver : FunctionResolverBase { private const string Kernel32 = "kernel32";