Merge pull request #1045 from b-editor/rename-terrible-name

Rename classes with unclear names

src/Beutl.Engine/Animation/InstanceClock.cs

@@ -0,0 +1,19 @@
+namespace Beutl.Animation;
+
+public sealed class InstanceClock : IClock
+{
+    public InstanceClock()
+    {
+        GlobalClock = this;
+    }
+
+    public TimeSpan CurrentTime { get; set; }
+
+    public TimeSpan AudioStartTime { get; set; }
+
+    public TimeSpan BeginTime { get; set; }
+
+    public TimeSpan DurationTime { get; set; }
+
+    public IClock GlobalClock { get; set; }
+}

src/Beutl.Engine/Animation/ZeroClock.cs

@@ -0,0 +1,16 @@
+namespace Beutl.Animation;
+
+internal sealed class ZeroClock : IClock
+{
+    public static readonly ZeroClock Instance = new();
+
+    public TimeSpan CurrentTime => TimeSpan.Zero;
+
+    public TimeSpan AudioStartTime => TimeSpan.Zero;
+
+    public TimeSpan BeginTime => TimeSpan.Zero;
+
+    public TimeSpan DurationTime => TimeSpan.Zero;
+
+    public IClock GlobalClock => this;
+}

src/Beutl.Engine/Rendering/Composer.cs → src/Beutl.Engine/Audio/Composing/Composer.cs

@@ -2,17 +2,17 @@
 using Beutl.Media.Music;
 using Beutl.Media.Music.Samples;
 
-namespace Beutl.Rendering;
+namespace Beutl.Audio.Composing;
 
 public class Composer : IComposer
 {
-    private readonly Audio.Audio _audio;
+    private readonly Beutl.Audio.Audio _audio;
     private readonly InstanceClock _instanceClock = new();
 
     public Composer()
     {
         SampleRate = 44100;
-        _audio = new Audio.Audio(SampleRate);
+        _audio = new Beutl.Audio.Audio(SampleRate);
     }
 
     ~Composer()
@@ -46,7 +46,7 @@ public void Dispose()
         }
     }
 
-    protected virtual void ComposeCore(Audio.Audio audio)
+    protected virtual void ComposeCore(Beutl.Audio.Audio audio)
     {
         //RenderScene.Render(_audio);
     }

src/Beutl.Engine/Rendering/IComposer.cs → src/Beutl.Engine/Audio/Composing/IComposer.cs

@@ -2,7 +2,7 @@
 using Beutl.Media.Music;
 using Beutl.Media.Music.Samples;
 
-namespace Beutl.Rendering;
+namespace Beutl.Audio.Composing;
 
 public interface IComposer : IDisposable
 {

src/Beutl.Engine/Audio/Sound.cs

@@ -1,9 +1,9 @@
 using Beutl.Animation;
 using Beutl.Audio.Effects;
+using Beutl.Graphics.Rendering;
 using Beutl.Media;
 using Beutl.Media.Music;
 using Beutl.Media.Music.Samples;
-using Beutl.Rendering;
 
 namespace Beutl.Audio;
 

src/Beutl.Engine/Graphics/BrushConstructor.cs

@@ -1,8 +1,6 @@
 using Beutl.Graphics.Rendering;
 using Beutl.Media;
 using Beutl.Media.Source;
-using Beutl.Rendering;
-
 using SkiaSharp;
 
 namespace Beutl.Graphics;

src/Beutl.Engine/Graphics/Drawable.cs

@@ -1,10 +1,10 @@
 using System.ComponentModel.DataAnnotations;
 using Beutl.Animation;
 using Beutl.Graphics.Effects;
+using Beutl.Graphics.Rendering;
 using Beutl.Graphics.Transformation;
 using Beutl.Language;
 using Beutl.Media;
-using Beutl.Rendering;
 using Beutl.Serialization;
 
 namespace Beutl.Graphics;

src/Beutl.Engine/Graphics/FilterEffects/ChromaKey.cs

@@ -1,12 +1,10 @@
 using System.ComponentModel.DataAnnotations;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-
+using Beutl.Graphics.Rendering;
 using Beutl.Language;
 using Beutl.Media;
 using Beutl.Media.Pixel;
-using Beutl.Rendering;
-
 using ILGPU;
 using ILGPU.Runtime;
 

src/Beutl.Engine/Graphics/FilterEffects/ColorKey.cs

@@ -1,12 +1,10 @@
 using System.ComponentModel.DataAnnotations;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-
+using Beutl.Graphics.Rendering;
 using Beutl.Language;
 using Beutl.Media;
 using Beutl.Media.Pixel;
-using Beutl.Rendering;
-
 using ILGPU;
 using ILGPU.Algorithms;
 using ILGPU.Runtime;

src/Beutl.Engine/Graphics/FilterEffects/FilterEffectNodeComparer.cs

@@ -3,7 +3,7 @@
 
 using Beutl.Collections;
 using Beutl.Graphics.Rendering;
-using Beutl.Rendering.Cache;
+using Beutl.Graphics.Rendering.Cache;
 
 namespace Beutl.Graphics.Effects;
 

src/Beutl.Engine/Graphics/FilterEffects/LutEffect.cs

@@ -2,11 +2,9 @@
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-
+using Beutl.Graphics.Rendering;
 using Beutl.Language;
 using Beutl.Media;
-using Beutl.Rendering;
-
 using ILGPU;
 using ILGPU.Runtime;
 

src/Beutl.Engine/Graphics/IImmediateCanvasFactory.cs

@@ -1,5 +1,4 @@
-using Beutl.Rendering.Cache;
-
+using Beutl.Graphics.Rendering.Cache;
 using SkiaSharp;
 
 namespace Beutl.Graphics;

src/Beutl.Engine/Graphics/ImmediateCanvas.cs

@@ -1,10 +1,10 @@
 using Beutl.Graphics.Effects;
 using Beutl.Graphics.Rendering;
+using Beutl.Graphics.Rendering.Cache;
 using Beutl.Media;
 using Beutl.Media.Pixel;
 using Beutl.Media.Source;
 using Beutl.Media.TextFormatting;
-using Beutl.Rendering.Cache;
 using Beutl.Threading;
 using SkiaSharp;
 using SkiaSharp.HarfBuzz;

src/Beutl.Engine/Graphics/Rendering/BlendModeNode.cs

@@ -1,6 +1,5 @@
-using Beutl.Media.Source;
-using Beutl.Rendering.Cache;
-
+using Beutl.Graphics.Rendering.Cache;
+using Beutl.Media.Source;
 using SkiaSharp;
 
 namespace Beutl.Graphics.Rendering;

src/Beutl.Engine/Rendering/Cache/ISupportRenderCache.cs → src/Beutl.Engine/Graphics/Rendering/Cache/ISupportRenderCache.cs

@@ -1,6 +1,4 @@
-using Beutl.Graphics;
-
-namespace Beutl.Rendering.Cache;
+namespace Beutl.Graphics.Rendering.Cache;
 
 public interface ISupportRenderCache
 {

src/Beutl.Engine/Rendering/Cache/RenderCache.cs → src/Beutl.Engine/Graphics/Rendering/Cache/RenderCache.cs

@@ -1,15 +1,11 @@
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-
-using Beutl.Graphics;
-using Beutl.Graphics.Rendering;
 using Beutl.Media.Source;
 using Beutl.Threading;
-
 using SkiaSharp;
 
-namespace Beutl.Rendering.Cache;
+namespace Beutl.Graphics.Rendering.Cache;
 
 public sealed class RenderCache(IGraphicNode node) : IDisposable
 {

src/Beutl.Engine/Rendering/Cache/RenderCacheContext.cs → src/Beutl.Engine/Graphics/Rendering/Cache/RenderCacheContext.cs

@@ -1,18 +1,13 @@
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Text.Json.Serialization;
-
 using Beutl.Configuration;
-using Beutl.Graphics;
-using Beutl.Graphics.Rendering;
 using Beutl.Media;
 using Beutl.Media.Source;
-
 using Microsoft.Extensions.Logging;
-
 using SkiaSharp;
 
-namespace Beutl.Rendering.Cache;
+namespace Beutl.Graphics.Rendering.Cache;
 
 public sealed class RenderCacheContext : IDisposable
 {

src/Beutl.Engine/Graphics/Rendering/DeferradCanvas.cs

@@ -3,7 +3,6 @@
 using Beutl.Media.Pixel;
 using Beutl.Media.Source;
 using Beutl.Media.TextFormatting;
-using Beutl.Rendering;
 
 namespace Beutl.Graphics.Rendering;
 

src/Beutl.Engine/Graphics/Rendering/DrawBackdropNode.cs

@@ -1,4 +1,4 @@
-using Beutl.Rendering.Cache;
+using Beutl.Graphics.Rendering.Cache;
 
 namespace Beutl.Graphics.Rendering;
 

src/Beutl.Engine/Graphics/Rendering/FilterEffectNode.cs

@@ -2,10 +2,9 @@
 using System.Diagnostics;
 
 using Beutl.Graphics.Effects;
+using Beutl.Graphics.Rendering.Cache;
 using Beutl.Media;
 using Beutl.Media.Source;
-using Beutl.Rendering.Cache;
-
 using SkiaSharp;
 
 namespace Beutl.Graphics.Rendering;

src/Beutl.Engine/Rendering/FpsText.cs → src/Beutl.Engine/Graphics/Rendering/FpsText.cs

@@ -1,9 +1,8 @@
-using Beutl.Graphics;
-using Beutl.Graphics.Shapes;
+using Beutl.Graphics.Shapes;
 using Beutl.Media;
 using Beutl.Media.Immutable;
 
-namespace Beutl.Rendering;
+namespace Beutl.Graphics.Rendering;
 
 internal sealed class FpsText
 {

src/Beutl.Engine/Rendering/GlContexts/Cgl/CGLError.cs → src/Beutl.Engine/Graphics/Rendering/GlContexts/Cgl/CGLError.cs

@@ -1,4 +1,4 @@
-namespace Beutl.Rendering.GlContexts;
+namespace Beutl.Graphics.Rendering.GlContexts;
 
 internal enum CGLError
 {

src/Beutl.Engine/Rendering/GlContexts/Cgl/CGLOpenGLProfile.cs → src/Beutl.Engine/Graphics/Rendering/GlContexts/Cgl/CGLOpenGLProfile.cs

@@ -1,4 +1,4 @@
-namespace Beutl.Rendering.GlContexts;
+namespace Beutl.Graphics.Rendering.GlContexts;
 
 internal enum CGLOpenGLProfile
 {

src/Beutl.Engine/Rendering/GlContexts/Cgl/CGLPixelFormatAttribute.cs → src/Beutl.Engine/Graphics/Rendering/GlContexts/Cgl/CGLPixelFormatAttribute.cs

@@ -1,4 +1,4 @@
-namespace Beutl.Rendering.GlContexts;
+namespace Beutl.Graphics.Rendering.GlContexts;
 
 internal enum CGLPixelFormatAttribute
 {

src/Beutl.Engine/Rendering/GlContexts/Cgl/Cgl.cs → src/Beutl.Engine/Graphics/Rendering/GlContexts/Cgl/Cgl.cs

@@ -3,7 +3,7 @@
 #pragma warning disable SYSLIB1054
 #pragma warning disable IDE1006
 
-namespace Beutl.Rendering.GlContexts;
+namespace Beutl.Graphics.Rendering.GlContexts;
 
 internal class Cgl
 {

src/Beutl.Engine/Rendering/GlContexts/Cgl/CglContext.cs → src/Beutl.Engine/Graphics/Rendering/GlContexts/Cgl/CglContext.cs

@@ -2,7 +2,7 @@
 
 using SkiaSharp;
 
-namespace Beutl.Rendering.GlContexts;
+namespace Beutl.Graphics.Rendering.GlContexts;
 
 internal class CglContext : GlContext
 {

src/Beutl.Engine/Rendering/GlContexts/GlContext.cs → src/Beutl.Engine/Graphics/Rendering/GlContexts/GlContext.cs

@@ -1,6 +1,6 @@
 using SkiaSharp;
 
-namespace Beutl.Rendering.GlContexts;
+namespace Beutl.Graphics.Rendering.GlContexts;
 
 internal abstract class GlContext : IDisposable
 {

src/Beutl.Engine/Rendering/GlContexts/Glx/Glx.cs → src/Beutl.Engine/Graphics/Rendering/GlContexts/Glx/Glx.cs

@@ -3,7 +3,7 @@
 #pragma warning disable SYSLIB1054
 #pragma warning disable IDE1006
 
-namespace Beutl.Rendering.GlContexts;
+namespace Beutl.Graphics.Rendering.GlContexts;
 
 internal class Glx
 {

src/Beutl.Engine/Rendering/GlContexts/Glx/GlxContext.cs → src/Beutl.Engine/Graphics/Rendering/GlContexts/Glx/GlxContext.cs

@@ -4,7 +4,7 @@
 
 using SkiaSharp;
 
-namespace Beutl.Rendering.GlContexts;
+namespace Beutl.Graphics.Rendering.GlContexts;
 
 internal sealed class GlxContext : GlContext
 {

src/Beutl.Engine/Rendering/GlContexts/Glx/XVisualClass.cs → src/Beutl.Engine/Graphics/Rendering/GlContexts/Glx/XVisualClass.cs

@@ -1,4 +1,4 @@
-namespace Beutl.Rendering.GlContexts;
+namespace Beutl.Graphics.Rendering.GlContexts;
 
 internal enum XVisualClass : int
 {

src/Beutl.Engine/Rendering/GlContexts/Glx/XVisualInfo.cs → src/Beutl.Engine/Graphics/Rendering/GlContexts/Glx/XVisualInfo.cs

@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Beutl.Rendering.GlContexts;
+namespace Beutl.Graphics.Rendering.GlContexts;
 
 [StructLayout(LayoutKind.Sequential)]
 internal struct XVisualInfo

src/Beutl.Engine/Rendering/GlContexts/Glx/Xlib.cs → src/Beutl.Engine/Graphics/Rendering/GlContexts/Glx/Xlib.cs

@@ -3,7 +3,7 @@
 #pragma warning disable SYSLIB1054
 #pragma warning disable IDE1006
 
-namespace Beutl.Rendering.GlContexts;
+namespace Beutl.Graphics.Rendering.GlContexts;
 
 internal class Xlib
 {

src/Beutl.Engine/Rendering/GlContexts/Wgl/Gdi32.cs → src/Beutl.Engine/Graphics/Rendering/GlContexts/Wgl/Gdi32.cs

@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Beutl.Rendering.GlContexts;
+namespace Beutl.Graphics.Rendering.GlContexts;
 
 #pragma warning disable SYSLIB1054
 #pragma warning disable IDE1006

src/Beutl.Engine/Rendering/GlContexts/Wgl/Kernel32.cs → src/Beutl.Engine/Graphics/Rendering/GlContexts/Wgl/Kernel32.cs

@@ -3,7 +3,7 @@
 #pragma warning disable SYSLIB1054
 #pragma warning disable IDE1006
 
-namespace Beutl.Rendering.GlContexts;
+namespace Beutl.Graphics.Rendering.GlContexts;
 
 internal static class Kernel32
 {

src/Beutl.Engine/Rendering/GlContexts/Wgl/PIXELFORMATDESCRIPTOR.cs → src/Beutl.Engine/Graphics/Rendering/GlContexts/Wgl/PIXELFORMATDESCRIPTOR.cs

@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Beutl.Rendering.GlContexts;
+namespace Beutl.Graphics.Rendering.GlContexts;
 
 [StructLayout(LayoutKind.Sequential)]
 internal struct PIXELFORMATDESCRIPTOR

src/Beutl.Engine/Rendering/GlContexts/Wgl/RECT.cs → src/Beutl.Engine/Graphics/Rendering/GlContexts/Wgl/RECT.cs

@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Beutl.Rendering.GlContexts;
+namespace Beutl.Graphics.Rendering.GlContexts;
 
 [StructLayout(LayoutKind.Sequential)]
 internal struct RECT

src/Beutl.Engine/Rendering/GlContexts/Wgl/User32.cs → src/Beutl.Engine/Graphics/Rendering/GlContexts/Wgl/User32.cs

@@ -1,7 +1,7 @@
 using System.Runtime.InteropServices;
 using System.Text;
 
-namespace Beutl.Rendering.GlContexts;
+namespace Beutl.Graphics.Rendering.GlContexts;
 
 #pragma warning disable SYSLIB1054
 #pragma warning disable IDE1006