1.1 --- a/Server/MainForm.cs	Mon Sep 01 19:23:36 2014 +0200
     1.2 +++ b/Server/MainForm.cs	Sun Sep 21 13:15:52 2014 +0200
     1.3 @@ -14,9 +14,8 @@
     1.4  using System.Threading;
     1.5  using System.Diagnostics;
     1.6  //
     1.7 -using SharpDisplayInterface;
     1.8  using SharpDisplayClient;
     1.9 -
    1.10 +using SharpDisplay;
    1.11  
    1.12  namespace SharpDisplayManager
    1.13  {
    1.14 @@ -490,11 +489,11 @@
    1.15          {
    1.16              iServiceHost = new ServiceHost
    1.17                  (
    1.18 -                    typeof(DisplayServer),
    1.19 +                    typeof(Session),
    1.20                      new Uri[] { new Uri("net.tcp://localhost:8001/") }
    1.21                  );
    1.22  
    1.23 -            iServiceHost.AddServiceEndpoint(typeof(IDisplayService), new NetTcpBinding(SecurityMode.None,true), "DisplayService");
    1.24 +            iServiceHost.AddServiceEndpoint(typeof(IService), new NetTcpBinding(SecurityMode.None, true), "DisplayService");
    1.25              iServiceHost.Open();
    1.26          }
    1.27  
    1.28 @@ -583,7 +582,7 @@
    1.29          }
    1.30  
    1.31          //Delegates are used for our thread safe method
    1.32 -        public delegate void AddClientDelegate(string aSessionId, IDisplayServiceCallback aCallback);
    1.33 +        public delegate void AddClientDelegate(string aSessionId, ICallback aCallback);
    1.34          public delegate void RemoveClientDelegate(string aSessionId);
    1.35          public delegate void SetTextDelegate(string SessionId, TextField aTextField);
    1.36          public delegate void SetTextsDelegate(string SessionId, System.Collections.Generic.IList<TextField> aTextFields);
    1.37 @@ -595,7 +594,7 @@
    1.38          /// </summary>
    1.39          /// <param name="aSessionId"></param>
    1.40          /// <param name="aCallback"></param>
    1.41 -        public void AddClientThreadSafe(string aSessionId, IDisplayServiceCallback aCallback)
    1.42 +        public void AddClientThreadSafe(string aSessionId, ICallback aCallback)
    1.43          {
    1.44              if (this.InvokeRequired)
    1.45              {
    1.46 @@ -948,7 +947,7 @@
    1.47      /// </summary>
    1.48      public class ClientData
    1.49      {
    1.50 -        public ClientData(string aSessionId, IDisplayServiceCallback aCallback)
    1.51 +        public ClientData(string aSessionId, ICallback aCallback)
    1.52          {
    1.53              SessionId = aSessionId;
    1.54              Name = "";
    1.55 @@ -959,6 +958,6 @@
    1.56          public string SessionId { get; set; }
    1.57          public string Name { get; set; }
    1.58          public List<TextField> Texts { get; set; }
    1.59 -        public IDisplayServiceCallback Callback { get; set; }
    1.60 +        public ICallback Callback { get; set; }
    1.61      }
    1.62  }