Merge pull request #7 from Julusian/master

Update to Server 2.0.7

Author: Zebiolo

.gitignore

@@ -8,3 +8,5 @@
 /src/CasparCGFrontend/obj/
 /src/CasparCGFrontend/CasparCGFrontend.suo
 /src/CasparCGFrontend/CasparCGFrontend.csproj.user
+
+/Server/

README.md

@@ -4,15 +4,25 @@
         <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
             <section name="CasparCGFrontend.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
         </sectionGroup>
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+            <section name="CasparCGFrontend.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+        </sectionGroup>
     </configSections>
     <applicationSettings>
         <CasparCGFrontend.Properties.Settings>
             <setting name="ServerPath" serializeAs="String">
-                <value>C:/Users/Peter/Downloads/CasparCG Server 2.0.7 Beta 1/Server/casparcg.exe</value>
+                <value>casparcg.exe</value>
             </setting>
             <setting name="Version" serializeAs="String">
-                <value>2.0.7 Beta</value>
+                <value>2.0.7</value>
             </setting>
         </CasparCGFrontend.Properties.Settings>
     </applicationSettings>
+    <userSettings>
+        <CasparCGFrontend.Properties.Settings>
+            <setting name="AutoStartServer" serializeAs="String">
+                <value>True</value>
+            </setting>
+        </CasparCGFrontend.Properties.Settings>
+    </userSettings>
 </configuration>

src/CasparCGFrontend/App.config

@@ -83,20 +83,20 @@
     <Compile Include="Consumers\ConsumerControlBase.designer.cs">
       <DependentUpon>ConsumerControlBase.cs</DependentUpon>
     </Compile>
-    <Compile Include="Consumers\BlockingDecklinkConsumer.cs" />
-    <Compile Include="Consumers\BlockingDecklinkConsumerControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Consumers\BlockingDecklinkConsumerControl.designer.cs">
-      <DependentUpon>BlockingDecklinkConsumerControl.cs</DependentUpon>
-    </Compile>
     <Compile Include="Consumers\NewTekIVGAConsumerControl.cs">
       <SubType>UserControl</SubType>
     </Compile>
     <Compile Include="Consumers\NewTekIVGAConsumerControl.designer.cs">
       <DependentUpon>NewTekIVGAConsumerControl.cs</DependentUpon>
     </Compile>
     <Compile Include="Consumers\NewTekIVGAConsumer.cs" />
+    <Compile Include="Consumers\StreamConsumer.cs" />
+    <Compile Include="Consumers\StreamConsumerControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Consumers\StreamConsumerControl.designer.cs">
+      <DependentUpon>StreamConsumerControl.cs</DependentUpon>
+    </Compile>
     <Compile Include="Consumers\SynchronizingConsumer.cs" />
     <Compile Include="Consumers\DecklinkConsumer.cs" />
     <Compile Include="Consumers\DecklinkConsumerControl.cs">
@@ -143,9 +143,6 @@
     <EmbeddedResource Include="Consumers\ConsumerControlBase.resx">
       <DependentUpon>ConsumerControlBase.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Consumers\BlockingDecklinkConsumerControl.resx">
-      <DependentUpon>BlockingDecklinkConsumerControl.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Consumers\NewTekIVGAConsumerControl.resx">
       <DependentUpon>NewTekIVGAConsumerControl.cs</DependentUpon>
     </EmbeddedResource>
@@ -155,6 +152,9 @@
     <EmbeddedResource Include="Consumers\ScreenConsumerControl.resx">
       <DependentUpon>ScreenConsumerControl.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Consumers\StreamConsumerControl.resx">
+      <DependentUpon>StreamConsumerControl.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="MainForm.resx">
       <DependentUpon>MainForm.cs</DependentUpon>
     </EmbeddedResource>
@@ -174,7 +174,6 @@
     <None Include="App.config">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Properties\DataSources\BlockingDecklinkConsumer.datasource" />
     <None Include="Properties\DataSources\BluefishConsumer.datasource" />
     <None Include="Properties\DataSources\Channel.datasource" />
     <None Include="Properties\DataSources\configuration.datasource" />

src/CasparCGFrontend/CasparCGFrontend.csproj

@@ -11,8 +11,8 @@ namespace CasparCGFrontend
     [XmlInclude(typeof(ScreenConsumer))]
     [XmlInclude(typeof(SystemAudioConsumer))]
     [XmlInclude(typeof(BluefishConsumer))]
-    [XmlInclude(typeof(BlockingDecklinkConsumer))]
     [XmlInclude(typeof(NewTekIVGAConsumer))]
+    [XmlInclude(typeof(StreamConsumer))]
     public abstract class AbstractConsumer : INotifyPropertyChanged
     {
         public virtual event PropertyChangedEventHandler PropertyChanged = delegate{};