2.0.0.2: Added application icon.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@647 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/shell/CasparCG.ico b/shell/CasparCG.ico
new file mode 100644 (file)
index 0000000..41771dc
Binary files /dev/null and b/shell/CasparCG.ico differ

diff --git a/shell/caspar.config b/shell/caspar.config
index 351bd8e31ec4d8d71c7ed2a690de73f8a2f17564..8bbde2e6e206550acaedaf4002547389cb4d92fb 100644 (file)
--- a/shell/caspar.config
+++ b/shell/caspar.config
@@ -12,11 +12,11 @@
   </diagnostics>\r
   <channels>\r
     <channel>\r
-      <videomode>PAL</videomode>\r
+      <videomode>1080i5000</videomode>\r
       <consumers>\r
-        <!--<decklink>\r
+        <!-- <decklink>\r
           <device>1</device>\r
-          <embedded-audio>true</embedded-audio>\r
+          <embedded-audio>false</embedded-audio>\r
           <internal-key>false</internal-key>\r
         </decklink>-->\r
         <ogl>\r

diff --git a/shell/main.cpp b/shell/main.cpp
index a3648b7612ef2ca2780d0f173833c72f93cc02cb..4c8764d1cdd8cab566400d417de7e73d73dd18b8 100644 (file)
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -18,6 +18,8 @@
 *\r
 */\r
 \r
+#include "resource.h"\r
+\r
 #include <windows.h>\r
 #include <conio.h>\r
 \r
@@ -79,7 +81,7 @@ public:
 };\r
 \r
 void setup_console_window()\r
-{      \r
+{       \r
        auto hOut = GetStdHandle(STD_OUTPUT_HANDLE);\r
 \r
        EnableMenuItem(GetSystemMenu(GetConsoleWindow(), FALSE), SC_CLOSE , MF_GRAYED);\r
@@ -208,7 +210,7 @@ int main(int argc, wchar_t* argv[])
                        else if(wcmd.substr(0, 1) == L"5")\r
                                wcmd = L"LOADBG 1-2 " + wcmd.substr(1, wcmd.length()-1) + L" LOOP \r\nPLAY 1-2";\r
                        else if(wcmd.substr(0, 1) == L"6")\r
-                               wcmd = L"CG 1-2 ADD 1 THING 1";\r
+                               wcmd = L"CG 1-2 ADD 1 BBTELEFONARE 1";\r
                        else if(wcmd.substr(0, 1) == L"7")\r
                                wcmd = L"LOAD 1-1 720p2500";\r
                        else if(wcmd.substr(0, 1) == L"8")\r

diff --git a/shell/resource.h b/shell/resource.h
new file mode 100644 (file)
index 0000000..9486e8e
Binary files /dev/null and b/shell/resource.h differ

diff --git a/shell/shell.rc b/shell/shell.rc
new file mode 100644 (file)
index 0000000..8e8fb93
Binary files /dev/null and b/shell/shell.rc differ

diff --git a/shell/shell.vcxproj b/shell/shell.vcxproj
index 89e61527a62b6c9a67735bb45ed94350de41d246..b7b95fc8b46bd3f8171ef51fb22985c18ceee8cb 100644 (file)
--- a/shell/shell.vcxproj
+++ b/shell/shell.vcxproj
@@ -69,9 +69,14 @@
     <None Include="caspar.config">\r
       <SubType>Designer</SubType>\r
     </None>\r
+    <None Include="CasparCG.ico" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="bootstrapper.h" />\r
+    <ClInclude Include="resource.h" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ResourceCompile Include="shell.rc" />\r
   </ItemGroup>\r
   <PropertyGroup Label="Globals">\r
     <ProjectGuid>{8C26C94F-8092-4769-8D84-DEA479721C5B}</ProjectGuid>\r

diff --git a/shell/shell.vcxproj.filters b/shell/shell.vcxproj.filters
index 6a05762fa8c85ff2a864426f40d2c1c7c84f8cd4..ac101144b6011ba3491630c25761d4cc693ab110 100644 (file)
--- a/shell/shell.vcxproj.filters
+++ b/shell/shell.vcxproj.filters
@@ -6,8 +6,13 @@
   </ItemGroup>\r
   <ItemGroup>\r
     <None Include="caspar.config" />\r
+    <None Include="CasparCG.ico" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="bootstrapper.h" />\r
+    <ClInclude Include="resource.h" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ResourceCompile Include="shell.rc" />\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file