Merge pull request #20 from lucidcode/volume-control

Add volume control for video feed

Author: IAmCoder

Halovision/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.9.0")]
-[assembly: AssemblyFileVersion("1.2.9.0")]
+[assembly: AssemblyVersion("1.3.0.0")]
+[assembly: AssemblyFileVersion("1.3.0.0")]

Halovision/VisionForm.cs

@@ -14,6 +14,7 @@
 using Emgu.CV;
 using Emgu.CV.Structure;
 using LibVLCSharp.Shared;
+using System.Runtime.Remoting.Messaging;
 
 namespace lucidcode.LucidScribe.Plugin.Halovision
 {
@@ -243,6 +244,7 @@ private void LoadSettings()
                 defaultSettings += "<DashThreshold>600</DashThreshold>";
                 defaultSettings += "<Classifier>None</Classifier>";
                 defaultSettings += "<WaveForm>Triangle</WaveForm>";
+                defaultSettings += "<Volume>0</Volume>";
                 defaultSettings += "</Plugin>";
                 defaultSettings += "</LucidScribeData>";
                 File.WriteAllText(settingsFilePath, defaultSettings);
@@ -275,6 +277,11 @@ private void LoadSettings()
                 txtDeviceURL.Text = xmlSettings.DocumentElement.SelectSingleNode("//DeviceURL").InnerText;
             }
 
+            if (xmlSettings.DocumentElement.SelectSingleNode("//Volume") != null)
+            {
+                VolumeTrackBar.Value = Convert.ToInt32(xmlSettings.DocumentElement.SelectSingleNode("//Volume").InnerText);
+            }
+
             if (xmlSettings.DocumentElement.SelectSingleNode("//CopyFromScreen") != null && xmlSettings.DocumentElement.SelectSingleNode("//CopyFromScreen").InnerText == "1")
             {
                 chkCopyFromScreen.Checked = true;
@@ -438,7 +445,7 @@ private void ConnectHalovisionDevice()
                     {
                         player = new MediaPlayer(media);
                         player.Hwnd = pbDisplay.Handle;
-                        player.Volume = 0;
+                        player.Volume = VolumeTrackBar.Value;
 
                         player.Play();
                     }
@@ -473,7 +480,7 @@ private void ConnectHalovisionDevice()
 
                     player = new MediaPlayer(media);
                     player.Hwnd = pbDisplay.Handle;
-                    player.Volume = 0;
+                    player.Volume = VolumeTrackBar.Value;
 
                     // Note: This will connect the pipe and read the video.
                     player.Play();
@@ -517,7 +524,7 @@ private void ConnectInspecDevice()
                 {
                     player = new MediaPlayer(media);
                     player.Hwnd = pbDisplay.Handle;
-                    player.Volume = 0;
+                    player.Volume = VolumeTrackBar.Value;
                     player.Play();
                 }
             }
@@ -949,6 +956,7 @@ private void SaveSettings()
             settings += "<EyeMoveMin>" + eyeMoveMinInput.Value + "</EyeMoveMin>";
             settings += "<EyeMoveMax>" + eyeMoveMaxInput.Value + "</EyeMoveMax>";
             settings += "<IdleTicks>" + idleTicksInput.Value + "</IdleTicks>";
+            settings += "<Volume>" + VolumeTrackBar.Value + "</Volume>";
             settings += "<IgnorePercentage>" + cmbIgnorePercentage.Text + "</IgnorePercentage>";
 
             if (chkCopyFromScreen.Checked)
@@ -1145,5 +1153,14 @@ private void cmbWaveForm_SelectedIndexChanged(object sender, EventArgs e)
             }
             SaveSettings();
         }
+
+        private void VolumeTrackBar_Scroll(object sender, EventArgs e)
+        {
+            if (player != null)
+            {
+                player.Volume = VolumeTrackBar.Value;
+            }
+            SaveSettings();
+        }
     }
 }

Halovision/VisionForm.designer.cs

@@ -128,7 +128,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACW
-        DQAAAk1TRnQBSQFMAwEBAAE4AQIBOAECAR8BAAEcAQAE/wEZAQAI/wFCAU0BNgcAATYDAAEoAwABfAMA
+        DQAAAk1TRnQBSQFMAwEBAAFAAQIBQAECAR8BAAEcAQAE/wEZAQAI/wFCAU0BNgcAATYDAAEoAwABfAMA
         ARwDAAEBAQABGAUAAbABKBIAXf//ABgABv8B6QHWAccB6QHWAccB6QHWAccB6QHWAccB6QHWAccB6QHW
         AccB6QHWAccB6QHWAccB6QHWAccB6QHWAccB6QHWAccB6QHWAccB6QHWAccB6QHWAccB6QHWAccB6QHW
         AccB6QHWAccB6QHWAccB6QHWAccB6QHWAccB6QHWAccB6QHWAccB6QHWAccB6QHWAccB6QHWAccB6AHX

Halovision/VisionForm.resx

@@ -28626,15 +28626,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Lucid Scribe Halovision"
-        "ProductCode" = "8:{20F60104-49E6-4E5D-B892-7DE307B4BC0A}"
-        "PackageCode" = "8:{77F22B94-0B0F-410F-AFF9-755443491580}"
+        "ProductCode" = "8:{7EDFD84B-BBFD-4883-B987-C3125EF36595}"
+        "PackageCode" = "8:{DCD15C6E-BE54-4E96-B2FA-9F50AC7397BF}"
         "UpgradeCode" = "8:{CAAB2187-AD23-435C-A3DB-568744247625}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:1.2.9"
+        "ProductVersion" = "8:1.3.0"
         "Manufacturer" = "8:lucidcode"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://www.lucidcode.com/Contact"