Changes to vWebClient

Tim-R · Jan 6, 2014 · d773712 · d773712
1 parent 769f4ea
commit d773712
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 55 deletions.
diff --git a/vController/Preferences.Designer.cs b/vController/Preferences.Designer.cs
diff --git a/vController/Preferences.cs b/vController/Preferences.cs
@@ -81,11 +81,6 @@ private void ud_linger_ValueChanged(object sender, EventArgs e)
             _vMixLinger = (int)ud_linger.Value;
         }
 
-        private void vMixPreferences_Load(object sender, EventArgs e)
-        {
-
-        }
-
         private void vMixPreferences_FormClosing(object sender, FormClosingEventArgs e)
         {
             SaveSettings();

diff --git a/vController/vController.Designer.cs b/vController/vController.Designer.cs
diff --git a/vController/vController.csproj b/vController/vController.csproj
@@ -116,16 +116,16 @@
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="vMixEvent.cs" />
-    <Compile Include="vMixMicroEvent.cs" />
+    <Compile Include="vEvent.cs" />
+    <Compile Include="vMicroEvent.cs" />
     <Compile Include="Preferences.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="Preferences.Designer.cs">
       <DependentUpon>Preferences.cs</DependentUpon>
     </Compile>
-    <Compile Include="vMixScheduler.cs" />
-    <Compile Include="vMixWebClient.cs" />
+    <Compile Include="vScheduler.cs" />
+    <Compile Include="vWebClient.cs" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>

diff --git a/vController/vMixEvent.cs → vController/vEvent.cs b/vController/vMixEvent.cs → vController/vEvent.cs
diff --git a/vController/vMixMicroEvent.cs → vController/vMicroEvent.cs b/vController/vMixMicroEvent.cs → vController/vMicroEvent.cs
diff --git a/vController/vMixScheduler.cs → vController/vScheduler.cs b/vController/vMixScheduler.cs → vController/vScheduler.cs
diff --git a/vController/vMixWebClient.cs → vController/vWebClient.cs b/vController/vMixWebClient.cs → vController/vWebClient.cs
@@ -26,11 +26,14 @@ public bool GetStatus()
         {
             vMixInputs.Clear();
             XmlDocument doc = new XmlDocument();
+
             try
             {
                 doc.LoadXml(vMix.DownloadString("api"));
 
-                if (!CheckVersion())
+                string[] v = doc.SelectNodes("vmix/version")[0].InnerText.Split('.');
+
+                if (int.Parse(v[0]) < 11)
                     return false;
 
                 foreach (XmlNode node in doc.SelectNodes("vmix/inputs/input"))
@@ -49,21 +52,7 @@ public bool GetStatus()
                 }
                 return true;
             }
-            catch { }
-            return false;
-        }
-
-        public bool CheckVersion()
-        {
-            XmlDocument doc = new XmlDocument();
-            try
-            {
-                doc.LoadXml(vMix.DownloadString("api"));
-                string[] v = doc.SelectNodes("vmix/version")[0].InnerText.Split('.');
-                if (int.Parse(v[0]) >= 11)
-                    return true;
-            }
-            catch { }
+            catch {}
             return false;
         }
 
@@ -75,23 +64,28 @@ public bool GetGUID(string inputname, out string guid)
                 return false;
 
             foreach (vMixInput vmi in vMixInputs)
+            {
                 if (vmi.name == inputname)
                 {
                     guid = vmi.guid;
                     break;
                 }
+            }
+
             return true;
         }
 
         public bool AddInput(string type, string path, string guid)
         {
             try
             {
-                vMix.DownloadString("api?function=AddInput&Input=" + guid + "&Value=" + type + "|" + HttpUtility.UrlEncode(path));
-                return true;
+                vMix.DownloadString("api?function=AddInput&Input=" + guid + "&Value=" + type + "|" + HttpUtility.UrlEncode(path));                
             }
-            catch { }
-            return false;
+            catch
+            {
+                return false;
+            }
+            return true;
         }
 
         public bool SetupSlideshow(int intervall, string transitioneffect, int transitiontime, string guid)
@@ -101,18 +95,19 @@ public bool SetupSlideshow(int intervall, string transitioneffect, int transitio
                 vMix.DownloadString("api?function=SetPictureTransition&Input=" + guid + "&Value=" + intervall.ToString());
                 vMix.DownloadString("api?function=SetPictureEffect&Input=" + guid + "&Value=" + transitioneffect);
                 vMix.DownloadString("api?function=SetPictureEffectDuration&Input=" + guid + "&Value=" + transitiontime.ToString());
-                return true;
             }
-            catch { }
-            return false;
+            catch 
+            {
+                return false;
+            }
+            return true;
         }
 
         public bool ForwardTo(string guid, int position)
         {
             try
             {
                 vMix.DownloadString("api?function=SetPosition&Value=" + position.ToString() + "&Input=" + guid);
-                //vMix.DownloadString("api?function=PlayPause&Input=" + guid);
             }
             catch
             {

diff --git a/vManager/vManager.Designer.cs b/vManager/vManager.Designer.cs
diff --git a/vManager/vManager.cs b/vManager/vManager.cs
@@ -41,11 +41,13 @@ private void EventList_RetrieveVirtualItem(object sender, RetrieveVirtualItemEve
 
         public ListViewItem EventListItem(vMixEvent vmixevent)
         {
-            string[] caption = { vmixevent.Title,
+            string[] caption = { 
+                                   vmixevent.Title,
                                    vmixevent.EventStart.ToString("MM-dd  HH:mm:ss"),
                                    vmixevent.EventDuration.ToString(@"hh\:mm\:ss"),
                                    vmixevent.EventTypeString(),
-                                   vmixevent.EventPath };
+                                   vmixevent.EventPath 
+                               };
             ListViewItem lvi = new ListViewItem(caption);
             lvi.ToolTipText = vmixevent.EventInfoText;
             return lvi;
@@ -55,6 +57,7 @@ private void UpdateDisplay()
         {
             if (donotredraw)
                 return;
+
             donotredraw = true;
             if (ActiveEvent != null)
             {
@@ -944,9 +947,5 @@ private void bn_dr_25_Click(object sender, EventArgs e)
                 FixInPointAndDuration();
             }
         }
-
-
-
-
     }
-}
+}