git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

[casparcg] / shell / main.cpp

diff --git a/shell/main.cpp b/shell/main.cpp
index 56118a51e5eb52de901d325f86e59c2410a54efe..7fac0539d82829256866d7800ceec1db211aa344 100644 (file)
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -17,15 +17,16 @@
 *    along with CasparCG.  If not, see <http://www.gnu.org/licenses/>.\r
 *\r
 */\r
-#include "resource.h"\r
-\r
-#include "server.h"\r
 \r
 // tbbmalloc_proxy: \r
 // Replace the standard memory allocation routines in Microsoft* C/C++ RTL \r
 // (malloc/free, global new/delete, etc.) with the TBB memory allocator. \r
 #include <tbb/tbbmalloc_proxy.h>\r
 \r
+#include "resource.h"\r
+\r
+#include "server.h"\r
+\r
 #ifdef _DEBUG\r
        #define _CRTDBG_MAP_ALLOC\r
        #include <stdlib.h>\r
@@ -279,7 +280,7 @@ int main(int argc, wchar_t* argv[])
                                        n++;\r
                                }\r
 \r
-                               wcmd = L"MIXER 1 VIDEO GRID " + boost::lexical_cast<std::wstring>(n);\r
+                               wcmd = L"MIXER 1 GRID " + boost::lexical_cast<std::wstring>(n);\r
 \r
                                for(int i = 1; i <= num; ++i)\r
                                        wcmd += L"\r\nPLAY 1-" + boost::lexical_cast<std::wstring>(i) + L" " + file + L" LOOP";// + L" SLIDE 100 LOOP";\r