Merge pull request #31 from Azure/next-public-release

Next public release
Azure · Jan 9, 2015 · 7354ee4 · 7354ee4
2 parents 4f9f3e6 + 79854d2
commit 7354ee4
Show file tree

Hide file tree

Showing 10 changed files with 333 additions and 257 deletions.
diff --git a/AMSExplorer/ChannelInformation.Designer.cs b/AMSExplorer/ChannelInformation.Designer.cs
diff --git a/AMSExplorer/ChannelInformation.cs b/AMSExplorer/ChannelInformation.cs
@@ -82,7 +82,6 @@ public TimeSpan? KeyframeInterval
         {
             get
             {
-
                 TimeSpan? ts = null;
                 if (checkBoxKeyFrameIntDefined.Checked)
                 {
@@ -98,6 +97,14 @@ public TimeSpan? KeyframeInterval
             }
         }
 
+        public short? HLSFragPerSegment
+        {
+            get
+            {
+                return checkBoxHLSFragPerSeg.Checked ? (short?)numericUpDownHLSFragPerSeg.Value : null;
+            }
+        }
+
         public ChannelInformation()
         {
             InitializeComponent();
@@ -114,7 +121,6 @@ private void contextMenuStripDG_MouseClick(object sender, MouseEventArgs e)
                 if (DG.SelectedCells[0].Value != null)
                 {
                     System.Windows.Forms.Clipboard.SetText(DG.SelectedCells[0].Value.ToString());
-
                 }
                 else
                 {
@@ -124,8 +130,6 @@ private void contextMenuStripDG_MouseClick(object sender, MouseEventArgs e)
         }
 
 
-
-
         private void ChannelInformation_Load(object sender, EventArgs e)
         {
             labelChannelName.Text += MyChannel.Name;
@@ -154,7 +158,7 @@ private void ChannelInformation_Load(object sender, EventArgs e)
                 DGChannel.Rows.Add(string.Format("Input URL ({0})", endpoint.Protocol), endpoint.Url);
                 if (MyChannel.Input.StreamingProtocol == StreamingProtocol.FragmentedMP4)
                 {
-                    DGChannel.Rows.Add(string.Format("Input URL ({0}, SSL)", endpoint.Protocol), endpoint.Url.ToString().Replace("http://","https://"));
+                    DGChannel.Rows.Add(string.Format("Input URL ({0}, SSL)", endpoint.Protocol), endpoint.Url.ToString().Replace("http://", "https://"));
                 }
             }
             foreach (var endpoint in MyChannel.Preview.Endpoints)
@@ -168,6 +172,8 @@ private void ChannelInformation_Load(object sender, EventArgs e)
                     if (MyChannel.Output.Hls.FragmentsPerSegment != null)
                     {
                         DGChannel.Rows.Add("Output HLS Fragments per segment", MyChannel.Output.Hls.FragmentsPerSegment);
+                        checkBoxHLSFragPerSeg.Checked = true;
+                        numericUpDownHLSFragPerSeg.Value = (int)MyChannel.Output.Hls.FragmentsPerSegment;
                     }
                 }
             }
@@ -311,5 +317,11 @@ private void checkBoxKeyFrameIntDefined_CheckedChanged(object sender, EventArgs
         {
             textBoxKeyFrame.Enabled = checkBoxKeyFrameIntDefined.Checked;
         }
+
+        private void checkBoxHLSFragPerSeg_CheckedChanged(object sender, EventArgs e)
+        {
+            numericUpDownHLSFragPerSeg.Enabled = checkBoxHLSFragPerSeg.Checked;
+
+        }
     }
 }
diff --git a/AMSExplorer/CreateLiveChannel.cs b/AMSExplorer/CreateLiveChannel.cs
@@ -56,12 +56,12 @@ public short? HLSFragmentPerSegment
         {
             get
             {
-                return checkBoxHLSFragPerSegDefined.Checked ? (short?) numericUpDownHLSFragPerSeg.Value : null;
+                return checkBoxHLSFragPerSegDefined.Checked ? (short?)numericUpDownHLSFragPerSeg.Value : null;
             }
             set
             {
-                if (value!=null)
-                numericUpDownHLSFragPerSeg.Value = (short) value;
+                if (value != null)
+                    numericUpDownHLSFragPerSeg.Value = (short)value;
             }
         }