# HG changeset patch
# User StephaneLenclud
# Date 1430942181 -7200
# Node ID 2edc5da1796e8a2661faad0a0d40d1474b3d265c
# Parent  3f6d708e6499a4fa2fba9ac276dce22c68ba02fb
Porting to new MiniDisplay interop naming from NuGet LibMiniDisplay package.

diff -r 3f6d708e6499 -r 2edc5da1796e Server/Display.cs
--- a/Server/Display.cs	Wed May 06 21:05:51 2015 +0200
+++ b/Server/Display.cs	Wed May 06 21:56:21 2015 +0200
@@ -26,6 +26,8 @@
 using System.Runtime.InteropServices;
 //using System.Runtime.Serialization;
 
+using MiniDisplayInterop;
+
 namespace SharpDisplayManager
 {
 
@@ -47,12 +49,12 @@
 		//static functions
 		public static int TypeCount()
 		{
-			return MiniDisplayTypeCount();
+			return MiniDisplay.TypeCount();
 		}
 
-		public static string TypeName(TMiniDisplayType aType)
+		public static string TypeName(MiniDisplay.Type aType)
 		{
-			IntPtr ptr = MiniDisplayTypeName(aType);
+			IntPtr ptr = MiniDisplay.TypeName(aType);
 			string str = Marshal.PtrToStringUni(ptr);
 			return str;
 		}
@@ -64,7 +66,7 @@
         }
 
         //
-        public bool Open(TMiniDisplayType aType)
+        public bool Open(MiniDisplay.Type aType)
         {
 			if (IsOpen())
 			{
@@ -72,7 +74,7 @@
 				return false;
 			}
 
-            iDevice = MiniDisplayOpen(aType);
+            iDevice = MiniDisplay.Open(aType);
 
             bool success = iDevice != IntPtr.Zero;
 			if (success)
@@ -93,7 +95,7 @@
 			}
 
 			//
-            MiniDisplayClose(iDevice);
+            MiniDisplay.Close(iDevice);
             iDevice = IntPtr.Zero;
 			//Broadcast closed event
 			OnClosed(this);
@@ -106,147 +108,147 @@
 
         public void Clear()
         {
-            MiniDisplayClear(iDevice);
+            MiniDisplay.Clear(iDevice);
         }
 
         public void Fill()
         {
-            MiniDisplayFill(iDevice);
+            MiniDisplay.Fill(iDevice);
         }
 
         public void SwapBuffers()
         {
-            MiniDisplaySwapBuffers(iDevice);
+            MiniDisplay.SwapBuffers(iDevice);
         }
 
         public int MaxBrightness()
         {
-            return MiniDisplayMaxBrightness(iDevice);
+            return MiniDisplay.MaxBrightness(iDevice);
         }
 
         public int MinBrightness()
         {
-            return MiniDisplayMinBrightness(iDevice);
+            return MiniDisplay.MinBrightness(iDevice);
         }
 
         public void SetBrightness(int aBrightness)
         {
             if (!IsOpen()) return;
 
-            MiniDisplaySetBrightness(iDevice, aBrightness);
+            MiniDisplay.SetBrightness(iDevice, aBrightness);
         }
 
         public int WidthInPixels()
         {
-            return MiniDisplayWidthInPixels(iDevice);
+            return MiniDisplay.WidthInPixels(iDevice);
         }
 
         public int HeightInPixels()
         {
-            return MiniDisplayHeightInPixels(iDevice);
+            return MiniDisplay.HeightInPixels(iDevice);
         }
 
         public void SetPixel(int aX, int aY, uint aValue)
         {
-            MiniDisplaySetPixel(iDevice,aX,aY,aValue);
+            MiniDisplay.SetPixel(iDevice,aX,aY,aValue);
         }
 
         public void RequestPowerSupplyStatus()
         {
-            MiniDisplayRequest(iDevice, TMiniDisplayRequest.EMiniDisplayRequestPowerSupplyStatus);
+            MiniDisplay.SendRequest(iDevice, MiniDisplay.Request.PowerSupplyStatus);
         }
 
         public void RequestDeviceId()
         {
-            MiniDisplayRequest(iDevice, TMiniDisplayRequest.EMiniDisplayRequestDeviceId);
+            MiniDisplay.SendRequest(iDevice, MiniDisplay.Request.DeviceId);
         }
 
         public void RequestFirmwareRevision()
         {
-            MiniDisplayRequest(iDevice, TMiniDisplayRequest.EMiniDisplayRequestFirmwareRevision);
+            MiniDisplay.SendRequest(iDevice, MiniDisplay.Request.FirmwareRevision);
         }
 
         public void PowerOn()
         {
-            MiniDisplayPowerOn(iDevice);
+            MiniDisplay.PowerOn(iDevice);
         }
 
         public void PowerOff()
         {
-            MiniDisplayPowerOff(iDevice);
+            MiniDisplay.PowerOff(iDevice);
         }
 
         public bool SupportPowerOnOff()
         {
-            return MiniDisplaySupportPowerOnOff(iDevice);
+            return MiniDisplay.SupportPowerOnOff(iDevice);
         }
 
         public void ShowClock()
         {
-            MiniDisplayShowClock(iDevice);
+            MiniDisplay.ShowClock(iDevice);
         }
 
         public void HideClock()
         {
-            MiniDisplayHideClock(iDevice);
+            MiniDisplay.HideClock(iDevice);
         }
 
         public bool SupportClock()
         {
-            return MiniDisplaySupportClock(iDevice);
+            return MiniDisplay.SupportClock(iDevice);
         }
 
         public bool PowerSupplyStatus()
         {
-            bool res = MiniDisplayPowerSupplyStatus(iDevice);
+            bool res = MiniDisplay.PowerSupplyStatus(iDevice);
             return res;
         }
 
-        public TMiniDisplayRequest AttemptRequestCompletion()
+        public MiniDisplay.Request AttemptRequestCompletion()
         {
-            return MiniDisplayAttemptRequestCompletion(iDevice);
+            return MiniDisplay.AttemptRequestCompletion(iDevice);
         }
 
-        public TMiniDisplayRequest CurrentRequest()
+        public MiniDisplay.Request CurrentRequest()
         {
-            return MiniDisplayCurrentRequest(iDevice);
+            return MiniDisplay.CurrentRequest(iDevice);
         }
 
         public bool IsRequestPending()
         {
-            return CurrentRequest() != TMiniDisplayRequest.EMiniDisplayRequestNone;
+            return CurrentRequest() != MiniDisplay.Request.None;
         }
 
 		//
-		public int IconCount(TMiniDisplayIconType aIcon)
+		public int IconCount(MiniDisplay.IconType aIcon)
 		{
-			return MiniDisplayIconCount(iDevice,aIcon);
+			return MiniDisplay.IconCount(iDevice,aIcon);
 		}
 
-		public int IconStatusCount(TMiniDisplayIconType aIcon)
+		public int IconStatusCount(MiniDisplay.IconType aIcon)
 		{
-			return MiniDisplayIconStatusCount(iDevice, aIcon);
+			return MiniDisplay.IconStatusCount(iDevice, aIcon);
 		}
 
-		public void SetIconStatus(TMiniDisplayIconType aIcon, int aIndex, int aStatus)
+		public void SetIconStatus(MiniDisplay.IconType aIcon, int aIndex, int aStatus)
 		{
-			MiniDisplaySetIconStatus(iDevice, aIcon, aIndex, aStatus);
+			MiniDisplay.SetIconStatus(iDevice, aIcon, aIndex, aStatus);
 		}
 
-		public void SetIconOn(TMiniDisplayIconType aIcon, int aIndex)
+		public void SetIconOn(MiniDisplay.IconType aIcon, int aIndex)
 		{
-			MiniDisplaySetIconStatus(iDevice, aIcon, aIndex, IconStatusCount(aIcon) - 1);
+			MiniDisplay.SetIconStatus(iDevice, aIcon, aIndex, IconStatusCount(aIcon) - 1);
 		}
 
-		public void SetIconOff(TMiniDisplayIconType aIcon, int aIndex)
+		public void SetIconOff(MiniDisplay.IconType aIcon, int aIndex)
 		{
-			MiniDisplaySetIconStatus(iDevice, aIcon, aIndex, 0);
+			MiniDisplay.SetIconStatus(iDevice, aIcon, aIndex, 0);
 		}
 
 
 		public void SetAllIconsStatus(int aStatus)
 		{
-			foreach (TMiniDisplayIconType icon in Enum.GetValues(typeof(TMiniDisplayIconType)))
+			foreach (MiniDisplay.IconType icon in Enum.GetValues(typeof(MiniDisplay.IconType)))
 			{
 				int count=IconCount(icon);
 				for (int i = 0; i < count; i++)
@@ -261,7 +263,7 @@
 		/// </summary>
 		/// <param name="aIcon"></param>
 		/// <param name="aStatus"></param>
-		public void SetIconStatus(TMiniDisplayIconType aIcon, int aStatus)
+		public void SetIconStatus(MiniDisplay.IconType aIcon, int aStatus)
 		{
 			int iconCount = IconCount(aIcon);
 			for (int i = 0; i < iconCount; i++)
@@ -275,7 +277,7 @@
 		/// </summary>
 		/// <param name="aIcon"></param>
 		/// <param name="aOn"></param>		
-		public void SetIconOnOff(TMiniDisplayIconType aIcon, bool aOn)
+		public void SetIconOnOff(MiniDisplay.IconType aIcon, bool aOn)
 		{
 			if (aOn)
 			{
@@ -291,7 +293,7 @@
 		/// Set all elements of an icon to there maximum status.
 		/// </summary>
 		/// <param name="aIcon"></param>
-		public void SetIconOn(TMiniDisplayIconType aIcon)
+		public void SetIconOn(MiniDisplay.IconType aIcon)
 		{
 			int iconCount = IconCount(aIcon);
 			for (int i = 0; i < iconCount; i++)
@@ -304,7 +306,7 @@
 		/// Turn off all elements of an icon.
 		/// </summary>
 		/// <param name="aIcon"></param>
-		public void SetIconOff(TMiniDisplayIconType aIcon)
+		public void SetIconOff(MiniDisplay.IconType aIcon)
 		{
 			int iconCount = IconCount(aIcon);
 			for (int i = 0; i < iconCount; i++)
@@ -317,176 +319,39 @@
 
         public string Vendor()
         {
-            IntPtr ptr = MiniDisplayVendor(iDevice);
+            IntPtr ptr = MiniDisplay.Vendor(iDevice);
             string str = Marshal.PtrToStringUni(ptr);
             return str;
         }
 
         public string Product()
         {
-            IntPtr ptr = MiniDisplayProduct(iDevice);
+            IntPtr ptr = MiniDisplay.Product(iDevice);
             string str = Marshal.PtrToStringUni(ptr);
             return str;
         }
 
         public string SerialNumber()
         {
-            IntPtr ptr = MiniDisplaySerialNumber(iDevice);
+            IntPtr ptr = MiniDisplay.SerialNumber(iDevice);
             string str = Marshal.PtrToStringUni(ptr);
             return str;
         }
 
         public string DeviceId()
         {
-            IntPtr ptr = MiniDisplayDeviceId(iDevice);
+            IntPtr ptr = MiniDisplay.DeviceId(iDevice);
             string str = Marshal.PtrToStringAnsi(ptr);
             return str;
         }
 
         public string FirmwareRevision()
         {
-            IntPtr ptr = MiniDisplayFirmwareRevision(iDevice);
+            IntPtr ptr = MiniDisplay.FirmwareRevision(iDevice);
             string str = Marshal.PtrToStringAnsi(ptr);
             return str;
         }
 
-        //[Serializable]
-        public enum TMiniDisplayType
-        {
-            EMiniDisplayAutoDetect, /*Not yet implemented*/
-            //[EnumMember(Value = "EMiniDisplayFutabaGP1212A01")]
-            EMiniDisplayFutabaGP1212A01,
-            //[EnumMember(Value = "EMiniDisplayFutabaGP1212A01")]
-            EMiniDisplayFutabaGP1212A02
-        };
-
-		/// <summary>
-		/// 
-		/// </summary>
-        public enum TMiniDisplayRequest
-        {
-            EMiniDisplayRequestNone,
-            EMiniDisplayRequestDeviceId,
-            EMiniDisplayRequestFirmwareRevision,
-            EMiniDisplayRequestPowerSupplyStatus
-        };
-
-			
-		/// <summary>
-		/// Define the various type of icons we support.
-		/// For binary compatibility new entries must be added at the end.
-		/// </summary>
-		public enum TMiniDisplayIconType
-		{
-			EMiniDisplayIconNetworkSignal=0,
-			EMiniDisplayIconInternet,
-			EMiniDisplayIconEmail,
-			EMiniDisplayIconMute,
-			EMiniDisplayIconVolume,
-			EMiniDisplayIconVolumeLabel,
-			EMiniDisplayIconPlay,
-			EMiniDisplayIconPause,
-			EMiniDisplayIconRecording
-		};
-
-        [DllImport("MiniDisplay.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr MiniDisplayOpen(TMiniDisplayType aType);
-
-        [DllImport("MiniDisplay.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void MiniDisplayClose(IntPtr aDevice);
-
-		[DllImport("MiniDisplay.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int MiniDisplayTypeCount();
-
-		[DllImport("MiniDisplay.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr MiniDisplayTypeName(TMiniDisplayType aType);
-
-        [DllImport("MiniDisplay.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void MiniDisplayClear(IntPtr aDevice);
-
-        [DllImport("MiniDisplay.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void MiniDisplayFill(IntPtr aDevice);
-
-        [DllImport("MiniDisplay.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void MiniDisplaySwapBuffers(IntPtr aDevice);
-
-        [DllImport("MiniDisplay.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void MiniDisplaySetBrightness(IntPtr aDevice, int aBrightness);
-
-        [DllImport("MiniDisplay.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
-        public static extern int MiniDisplayMinBrightness(IntPtr aDevice);
-
-        [DllImport("MiniDisplay.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
-        public static extern int MiniDisplayMaxBrightness(IntPtr aDevice);
-
-        [DllImport("MiniDisplay.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
-        public static extern int MiniDisplayWidthInPixels(IntPtr aDevice);
-
-        [DllImport("MiniDisplay.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
-        public static extern int MiniDisplayHeightInPixels(IntPtr aDevice);
-
-        [DllImport("MiniDisplay.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
-        public static extern int MiniDisplaySetPixel(IntPtr aDevice, int aX, int aY, uint aValue);
-
-        [DllImport("MiniDisplay.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr MiniDisplayVendor(IntPtr aDevice);
-
-        [DllImport("MiniDisplay.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr MiniDisplayProduct(IntPtr aDevice);
-
-        [DllImport("MiniDisplay.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr MiniDisplaySerialNumber(IntPtr aDevice);
-
-        [DllImport("MiniDisplay.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr MiniDisplayDeviceId(IntPtr aDevice);
-
-        [DllImport("MiniDisplay.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr MiniDisplayFirmwareRevision(IntPtr aDevice);
-
-        [DllImport("MiniDisplay.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
-        [return: MarshalAs(UnmanagedType.I1)]
-        public static extern bool MiniDisplayPowerSupplyStatus(IntPtr aDevice);
-
-        [DllImport("MiniDisplay.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void MiniDisplayRequest(IntPtr aDevice, TMiniDisplayRequest aRequest);
-
-        [DllImport("MiniDisplay.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
-        public static extern TMiniDisplayRequest MiniDisplayAttemptRequestCompletion(IntPtr aDevice);
-
-        [DllImport("MiniDisplay.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
-        public static extern TMiniDisplayRequest MiniDisplayCurrentRequest(IntPtr aDevice);
-
-        [DllImport("MiniDisplay.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void MiniDisplayCancelRequest(IntPtr aDevice);
-
-        [DllImport("MiniDisplay.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void MiniDisplayPowerOn(IntPtr aDevice);
-
-        [DllImport("MiniDisplay.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void MiniDisplayPowerOff(IntPtr aDevice);
-
-        [DllImport("MiniDisplay.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
-        [return: MarshalAs(UnmanagedType.I1)]
-        public static extern bool MiniDisplaySupportPowerOnOff(IntPtr aDevice);
-
-        [DllImport("MiniDisplay.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void MiniDisplayShowClock(IntPtr aDevice);
-
-        [DllImport("MiniDisplay.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void MiniDisplayHideClock(IntPtr aDevice);
-
-        [DllImport("MiniDisplay.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
-        [return: MarshalAs(UnmanagedType.I1)]
-        public static extern bool MiniDisplaySupportClock(IntPtr aDevice);
-
-		[DllImport("MiniDisplay.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int MiniDisplayIconCount(IntPtr aDevice, TMiniDisplayIconType aIcon);
-
-		[DllImport("MiniDisplay.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int MiniDisplayIconStatusCount(IntPtr aDevice, TMiniDisplayIconType aIcon);
-		
-		[DllImport("MiniDisplay.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
-		public static extern void MiniDisplaySetIconStatus(IntPtr aDevice, TMiniDisplayIconType aIcon, int aIndex, int aStatus);
 
     }
 }
diff -r 3f6d708e6499 -r 2edc5da1796e Server/MainForm.cs
--- a/Server/MainForm.cs	Wed May 06 21:05:51 2015 +0200
+++ b/Server/MainForm.cs	Wed May 06 21:56:21 2015 +0200
@@ -43,6 +43,7 @@
 //
 using SharpDisplayClient;
 using SharpDisplay;
+using MiniDisplayInterop;
 
 
 namespace SharpDisplayManager
@@ -257,8 +258,8 @@
 		{
 			if (iDisplay.IsOpen())
 			{
-				iDisplay.SetIconOnOff(Display.TMiniDisplayIconType.EMiniDisplayIconInternet, iNetworkManager.NetworkListManager.IsConnectedToInternet);
-				iDisplay.SetIconOnOff(Display.TMiniDisplayIconType.EMiniDisplayIconNetworkSignal, iNetworkManager.NetworkListManager.IsConnected);
+                iDisplay.SetIconOnOff(MiniDisplay.IconType.Internet, iNetworkManager.NetworkListManager.IsConnectedToInternet);
+                iDisplay.SetIconOnOff(MiniDisplay.IconType.NetworkSignal, iNetworkManager.NetworkListManager.IsConnected);
 			}
 		}
 
@@ -275,8 +276,8 @@
 			iUpdateCountSinceLastNetworkAnimation = iUpdateCountSinceLastNetworkAnimation % 4;
 
 			if (iDisplay.IsOpen() && iNetworkManager.NetworkListManager.IsConnected && iUpdateCountSinceLastNetworkAnimation==0)
-			{				
-				int iconCount=iDisplay.IconCount(Display.TMiniDisplayIconType.EMiniDisplayIconNetworkSignal);
+			{
+                int iconCount = iDisplay.IconCount(MiniDisplay.IconType.NetworkSignal);
 				if (iconCount <= 0)
 				{
 					//Prevents div by zero and other undefined behavior
@@ -288,11 +289,11 @@
 				{
 					if (i < iLastNetworkIconIndex && !(i == 0 && iLastNetworkIconIndex > 3) && !(i == 1 && iLastNetworkIconIndex > 4))
 					{
-						iDisplay.SetIconOn(Display.TMiniDisplayIconType.EMiniDisplayIconNetworkSignal,i);
+                        iDisplay.SetIconOn(MiniDisplay.IconType.NetworkSignal, i);
 					}
 					else
 					{
-						iDisplay.SetIconOff(Display.TMiniDisplayIconType.EMiniDisplayIconNetworkSignal,i);
+                        iDisplay.SetIconOff(MiniDisplay.IconType.NetworkSignal, i);
 					}
 				}				
 			}
@@ -393,7 +394,7 @@
 			if (iDisplay.IsOpen())
 			{
 				//First take care our our volume level icons
-				int volumeIconCount = iDisplay.IconCount(Display.TMiniDisplayIconType.EMiniDisplayIconVolume);
+                int volumeIconCount = iDisplay.IconCount(MiniDisplay.IconType.Volume);
 				if (volumeIconCount > 0)
 				{					
 					//Compute current volume level from system level and the number of segments in our display volume bar.
@@ -411,23 +412,23 @@
 							if (i == segmentOnCount - 1 && roundedUp)
 							{
 								//Half brightness
-								iDisplay.SetIconStatus(Display.TMiniDisplayIconType.EMiniDisplayIconVolume, i, (iDisplay.IconStatusCount(Display.TMiniDisplayIconType.EMiniDisplayIconVolume) - 1)/2);
+                                iDisplay.SetIconStatus(MiniDisplay.IconType.Volume, i, (iDisplay.IconStatusCount(MiniDisplay.IconType.Volume) - 1) / 2);
 							}
 							else
 							{
 								//Full brightness
-								iDisplay.SetIconStatus(Display.TMiniDisplayIconType.EMiniDisplayIconVolume, i, iDisplay.IconStatusCount(Display.TMiniDisplayIconType.EMiniDisplayIconVolume) - 1);
+                                iDisplay.SetIconStatus(MiniDisplay.IconType.Volume, i, iDisplay.IconStatusCount(MiniDisplay.IconType.Volume) - 1);
 							}
 						}
 						else
 						{
-							iDisplay.SetIconStatus(Display.TMiniDisplayIconType.EMiniDisplayIconVolume, i, 0);
+                            iDisplay.SetIconStatus(MiniDisplay.IconType.Volume, i, 0);
 						}
 					}
 				}
 
 				//Take care our our mute icon
-				iDisplay.SetIconOnOff(Display.TMiniDisplayIconType.EMiniDisplayIconMute, iMultiMediaDevice.AudioEndpointVolume.Mute);
+                iDisplay.SetIconOnOff(MiniDisplay.IconType.Mute, iMultiMediaDevice.AudioEndpointVolume.Mute);
 			}
 
 		}
@@ -479,7 +480,7 @@
 
 			for (int i = 0; i < count; i++)
 			{
-				comboBoxDisplayType.Items.Add(Display.TypeName((Display.TMiniDisplayType)i));
+				comboBoxDisplayType.Items.Add(Display.TypeName((MiniDisplay.Type)i));
 			}
 		}
 
@@ -682,13 +683,13 @@
             {
                 switch (iDisplay.AttemptRequestCompletion())
                 {
-                    case Display.TMiniDisplayRequest.EMiniDisplayRequestFirmwareRevision:
+                    case MiniDisplay.Request.FirmwareRevision:
                         toolStripStatusLabelConnect.Text += " v" + iDisplay.FirmwareRevision();
                         //Issue next request then
                         iDisplay.RequestPowerSupplyStatus();
                         break;
 
-                    case Display.TMiniDisplayRequest.EMiniDisplayRequestPowerSupplyStatus:
+                    case MiniDisplay.Request.PowerSupplyStatus:
                         if (iDisplay.PowerSupplyStatus())
                         {
                             toolStripStatusLabelPower.Text = "ON";
@@ -701,7 +702,7 @@
                         iDisplay.RequestDeviceId();
                         break;
 
-                    case Display.TMiniDisplayRequest.EMiniDisplayRequestDeviceId:
+                    case MiniDisplay.Request.DeviceId:
                         toolStripStatusLabelConnect.Text += " - " + iDisplay.DeviceId();
                         //No more request to issue
                         break;
@@ -865,7 +866,7 @@
         {
             CloseDisplayConnection();
 
-            if (!iDisplay.Open((Display.TMiniDisplayType)cds.DisplayType))
+            if (!iDisplay.Open((MiniDisplay.Type)cds.DisplayType))
             {   
 				UpdateStatus();               
 				toolStripStatusLabelConnect.Text = "Connection error";
@@ -1074,15 +1075,15 @@
 
 				
 				//Check if Volume Label is supported. To date only MDM166AA supports that crap :)
-				checkBoxShowVolumeLabel.Enabled = iDisplay.IconCount(Display.TMiniDisplayIconType.EMiniDisplayIconVolumeLabel)>0;
+				checkBoxShowVolumeLabel.Enabled = iDisplay.IconCount(MiniDisplay.IconType.VolumeLabel)>0;
 
 				if (cds.ShowVolumeLabel)
 				{
-					iDisplay.SetIconOn(Display.TMiniDisplayIconType.EMiniDisplayIconVolumeLabel);
+                    iDisplay.SetIconOn(MiniDisplay.IconType.VolumeLabel);
 				}
 				else
 				{
-					iDisplay.SetIconOff(Display.TMiniDisplayIconType.EMiniDisplayIconVolumeLabel);
+                    iDisplay.SetIconOff(MiniDisplay.IconType.VolumeLabel);
 				}
             }
             else
diff -r 3f6d708e6499 -r 2edc5da1796e Server/SharpDisplayManager.csproj
--- a/Server/SharpDisplayManager.csproj	Wed May 06 21:05:51 2015 +0200
+++ b/Server/SharpDisplayManager.csproj	Wed May 06 21:56:21 2015 +0200
@@ -37,7 +37,7 @@
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <NuGetPackageImportStamp>36fd58bc</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>c59d0cd0</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -107,9 +107,9 @@
   <ItemGroup>
     <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="Microsoft.VisualBasic.PowerPacks.Vs, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="MiniDisplayInterop, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\LibMiniDisplay.1.1.3\lib\MiniDisplayInterop.dll</HintPath>
+    <Reference Include="MiniDisplayInterop">
+      <HintPath>..\packages\LibMiniDisplay.1.1.4\lib\MiniDisplayInterop.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="NAudio, Version=1.7.3.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -262,12 +262,12 @@
     </COMReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\LibMiniDisplay.1.1.3\build\LibMiniDisplay.targets" Condition="Exists('..\packages\LibMiniDisplay.1.1.3\build\LibMiniDisplay.targets')" />
+  <Import Project="..\packages\LibMiniDisplay.1.1.4\build\LibMiniDisplay.targets" Condition="Exists('..\packages\LibMiniDisplay.1.1.4\build\LibMiniDisplay.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\LibMiniDisplay.1.1.3\build\LibMiniDisplay.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibMiniDisplay.1.1.3\build\LibMiniDisplay.targets'))" />
+    <Error Condition="!Exists('..\packages\LibMiniDisplay.1.1.4\build\LibMiniDisplay.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibMiniDisplay.1.1.4\build\LibMiniDisplay.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff -r 3f6d708e6499 -r 2edc5da1796e Server/packages.config
--- a/Server/packages.config	Wed May 06 21:05:51 2015 +0200
+++ b/Server/packages.config	Wed May 06 21:56:21 2015 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="LibMiniDisplay" version="1.1.3" targetFramework="net45" />
+  <package id="LibMiniDisplay" version="1.1.4" targetFramework="net45" />
   <package id="NAudio" version="1.7.3" targetFramework="net45" />
   <package id="SharpLibHid" version="1.0.7" targetFramework="net45" />
 </packages>
\ No newline at end of file