Config changes

diff --git a/.gitignore b/.gitignore
index 864e36ec8bbd110af2947f7d50703a19b3f5101c..80f9816caa5ff3dd77c327beabda48dc5cc6dca2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -99,3 +99,7 @@
 /modules/portaudio/portaudio.vcxproj.user
 /modules/portaudio/bin
 /modules/portaudio/tmp
+
+/modules/newtek/newtek.vcxproj.user
+/modules/newtek/bin
+/modules/newtek/tmp

diff --git a/modules/newtek/bin/Release/newtek.lib b/modules/newtek/bin/Release/newtek.lib
index e423c97101ebcadc1807dd7938734471499b79f3..14bd375030174a9be820549a17039505e59b6661 100644 (file)
Binary files a/modules/newtek/bin/Release/newtek.lib and b/modules/newtek/bin/Release/newtek.lib differ

diff --git a/modules/newtek/newtek.vcxproj.filters b/modules/newtek/newtek.vcxproj.filters
new file mode 100644 (file)
index 0000000..c2830ab
--- /dev/null
+++ b/modules/newtek/newtek.vcxproj.filters
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="StdAfx.cpp" />
+    <ClCompile Include="newtek.cpp">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClCompile Include="consumer\newtek_consumer.cpp">
+      <Filter>source\consumer</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="StdAfx.h" />
+    <ClInclude Include="newtek.h">
+      <Filter>source</Filter>
+    </ClInclude>
+    <ClInclude Include="consumer\newtek_consumer.h">
+      <Filter>source\consumer</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="source">
+      <UniqueIdentifier>{2b647728-2513-4a6f-8fcd-0bd4decd163e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="source\consumer">
+      <UniqueIdentifier>{c4a0a6b8-00cd-475e-a6a4-775bba93dbc2}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+</Project>
\ No newline at end of file

diff --git a/shell/casparcg.config b/shell/casparcg.config
index 8e815c21058c9fe3dc2799d0c62a49b1af6f9e2c..37c5ae117d7a60ff37eb8bb0b6b0e70f4310a873 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <configuration>\r
   <paths>\r
-    <media-path>\\192.168.1.6\nas\CasparCG\_media\</media-path>\r
+    <media-path>media\</media-path>\r
     <log-path>log\</log-path>\r
     <data-path>data\</data-path>\r
     <template-path>templates\</template-path>\r
@@ -16,7 +16,6 @@
             <device>1</device>\r
             <windowed>true</windowed>\r
           </screen>\r
-          <newtek></newtek>\r
         </consumers>\r
     </channel>\r
   </channels>\r
@@ -103,6 +102,7 @@
                 <auto-deinterlace>true [true|false]</auto-deinterlace>\r
                 <vsync>false [true|false]</vsync>\r
             </screen>\r
+            <newtek></newtek>\r
             <file>\r
                 <path></path>\r
                 <vcodec>libx264 [libx264|qtrle]</vcodec>\r