Merge branch 'master' of https://github.com/VladimirKhil/SI

Author: VladimirKhil

src/Common/SI.GameServer.Contract/HostInfo.cs

@@ -10,16 +10,6 @@ public sealed class HostInfo
     /// </summary>
     public string Name { get; set; } = "";
 
-    /// <summary>
-    /// Server hostname.
-    /// </summary>
-    public string Host { get; set; } = "";
-
-    /// <summary>
-    /// Port number for TCP-based connections.
-    /// </summary>
-    public int Port { get; set; }
-
     [Obsolete]
     public string PackagesPublicBaseUrl { get; set; } = "";
 

src/Common/SIPackages/Atom.cs

@@ -8,6 +8,7 @@ namespace SIPackages;
 /// <summary>
 /// Defines a question scenario minimal item.
 /// </summary>
+[Obsolete]
 internal sealed class Atom : PropertyChangedNotifier, ITyped, IEquatable<Atom>
 {
     [DebuggerBrowsable(DebuggerBrowsableState.Never)]

src/Common/SIPackages/CollectionNames.cs

@@ -39,10 +39,10 @@ public static class CollectionNames
     /// <returns>Found collection name or null.</returns>
     public static string? TryGetCollectionName(string mediaType) => mediaType switch
     {
-        AtomTypes.Image => ImagesStorageName,
-        AtomTypes.Audio or AtomTypes.AudioNew => AudioStorageName,
-        AtomTypes.Video => VideoStorageName,
-        AtomTypes.Html => HtmlStorageName,
+        ContentTypes.Image => ImagesStorageName,
+        ContentTypes.Audio => AudioStorageName,
+        ContentTypes.Video => VideoStorageName,
+        ContentTypes.Html => HtmlStorageName,
         _ => null,
     };
 

src/Common/SIPackages/ContentItem.cs

@@ -109,7 +109,7 @@ public string Placement
         }
     }
 
-    private string GetDefaultPlacement() => (_type == ContentTypes.Audio || _type == AtomTypes.Audio) ? ContentPlacements.Background : ContentPlacements.Screen;
+    private string GetDefaultPlacement() => _type == ContentTypes.Audio ? ContentPlacements.Background : ContentPlacements.Screen;
 
     /// <summary>
     /// Content play duration.
@@ -156,7 +156,7 @@ public bool WaitForFinish
     /// <inheritdoc />
     public override string ToString()
     {
-        if (_type == AtomTypes.Text && _placement == ContentPlacements.Screen)
+        if (_type == ContentTypes.Text && _placement == ContentPlacements.Screen)
         {
             return _value;
         }
@@ -235,7 +235,7 @@ public void WriteXml(XmlWriter writer)
         {
             writer.WriteAttributeString("placement", _placement);
         }
-        else if (_type == ContentTypes.Audio || _type == AtomTypes.Audio) // For backward compatibility; remove later
+        else if (_type == ContentTypes.Audio)
         {
             writer.WriteAttributeString("placement", GetDefaultPlacement());
         }
@@ -258,7 +258,7 @@ public void WriteXml(XmlWriter writer)
     {
         Duration = _duration,
         IsRef = _isRef,
-        Placement = _placement,
+        _placement = _placement,
         WaitForFinish = _waitForFinish,
         Type = _type,
         Value = _value