X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=shell%2Fmain.cpp;h=4ce3e24de7fe7ec70dd51fc3df0965d4b6b3bd44;hb=c91d3ab92b01555e2d5e8e9a1dc0ae0bc1f53522;hp=9923160a9c5ad705aaa73f9129f991cf54e02588;hpb=c99908715445e2c57e7a840ddb707c06cf2f3b77;p=casparcg

diff --git a/shell/main.cpp b/shell/main.cpp
index 9923160a9..4ce3e24de 100644
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -17,15 +17,16 @@
 *    along with CasparCG.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
-#include "resource.h"
-
-#include "server.h"
 
 // tbbmalloc_proxy: 
 // Replace the standard memory allocation routines in Microsoft* C/C++ RTL 
 // (malloc/free, global new/delete, etc.) with the TBB memory allocator. 
 #include <tbb/tbbmalloc_proxy.h>
 
+#include "resource.h"
+
+#include "server.h"
+
 #ifdef _DEBUG
 	#define _CRTDBG_MAP_ALLOC
 	#include <stdlib.h>
@@ -33,12 +34,12 @@
 #endif
 
 #define NOMINMAX
+#define WIN32_LEAN_AND_MEAN
 
 #include <windows.h>
+#include <winnt.h>
+#include <mmsystem.h>
 #include <atlbase.h>
-#include <conio.h>
-
-#include <core/mixer/gpu/ogl_device.h>
 
 #include <protocol/amcp/AMCPProtocolStrategy.h>
 
@@ -52,19 +53,32 @@
 #include <common/exception/win32_exception.h>
 #include <common/exception/exceptions.h>
 #include <common/log/log.h>
+#include <common/gl/gl_check.h>
 #include <common/os/windows/current_version.h>
 #include <common/os/windows/system_info.h>
-#include <common/utility/assert.h>
 
-#include <tbb/task_scheduler_observer.h>
+#include <core/mixer/gpu/ogl_device.h>
+
 #include <tbb/task_scheduler_init.h>
+#include <tbb/task_scheduler_observer.h>
 
-#include <boost/foreach.hpp>
+#include <boost/property_tree/detail/file_parser_error.hpp>
+
+#include <algorithm>
 
 // NOTE: This is needed in order to make CComObject work since this is not a real ATL project.
 CComModule _AtlModule;
 extern __declspec(selectany) CAtlModule* _pAtlModule = &_AtlModule;
 
+void change_icon( const HICON hNewIcon )
+{
+   auto hMod = ::LoadLibrary(L"Kernel32.dll"); 
+   typedef DWORD(__stdcall *SCI)(HICON);
+   auto pfnSetConsoleIcon = reinterpret_cast<SCI>(::GetProcAddress(hMod, "SetConsoleIcon")); 
+   pfnSetConsoleIcon(hNewIcon); 
+   ::FreeLibrary(hMod);
+}
+
 void setup_console_window()
 {	 
 	auto hOut = GetStdHandle(STD_OUTPUT_HANDLE);
@@ -81,12 +95,23 @@ void setup_console_window()
 
 	SMALL_RECT DisplayArea = {0, 0, 0, 0};
 	DisplayArea.Right = coord.X-1;
-	DisplayArea.Bottom = coord.Y-1;
+	DisplayArea.Bottom = (coord.Y-1)/2;
 	SetConsoleWindowInfo(hOut, TRUE, &DisplayArea);
-		
+		 
+	change_icon(::LoadIcon(GetModuleHandle(0), MAKEINTRESOURCE(101)));
+
 	// Set console title.
 	std::wstringstream str;
 	str << "CasparCG Server " << caspar::env::version();
+#ifdef COMPILE_RELEASE
+	str << " Release";
+#elif  COMPILE_PROFILE
+	str << " Profile";
+#elif  COMPILE_DEVELOP
+	str << " Develop";
+#elif  COMPILE_DEBUG
+	str << " Debug";
+#endif
 	SetConsoleTitle(str.str().c_str());
 }
 
@@ -97,30 +122,55 @@ void print_info()
 	CASPAR_LOG(info) << L"on " << caspar::get_win_product_name() << L" " << caspar::get_win_sp_version();
 	CASPAR_LOG(info) << caspar::get_cpu_info();
 	CASPAR_LOG(info) << caspar::get_system_product_name();
-	CASPAR_LOG(info) << L"Flash " << caspar::get_flash_version();
-	CASPAR_LOG(info) << L"Flash-Template-Host " << caspar::get_cg_version();
-	CASPAR_LOG(info) << L"FreeImage " << caspar::get_image_version();
+	CASPAR_LOG(info) << L"Flash " << caspar::flash::get_version();
+	CASPAR_LOG(info) << L"Flash-Template-Host " << caspar::flash::get_cg_version();
+	CASPAR_LOG(info) << L"FreeImage " << caspar::image::get_version();
 	
-	CASPAR_LOG(info) << L"Decklink " << caspar::get_decklink_version();
-	BOOST_FOREACH(auto& device, caspar::get_decklink_device_list())
+	CASPAR_LOG(info) << L"Decklink " << caspar::decklink::get_version();
+	auto deck = caspar::decklink::get_device_list();
+	std::for_each(deck.begin(), deck.end(), [](const std::wstring& device)
+	{
 		CASPAR_LOG(info) << device;
+	});
 		
-	CASPAR_LOG(info) << L"Bluefish " << caspar::get_bluefish_version();
-	BOOST_FOREACH(auto& device, caspar::get_bluefish_device_list())
+	auto blue = caspar::bluefish::get_device_list();
+	std::for_each(blue.begin(), blue.end(), [](const std::wstring& device)
+	{
 		CASPAR_LOG(info) << device;
+	});
+	
+	CASPAR_LOG(info) << L"FFMPEG-avcodec "  << caspar::ffmpeg::get_avcodec_version();
+	CASPAR_LOG(info) << L"FFMPEG-avformat " << caspar::ffmpeg::get_avformat_version();
+	CASPAR_LOG(info) << L"FFMPEG-avfilter " << caspar::ffmpeg::get_avfilter_version();
+	CASPAR_LOG(info) << L"FFMPEG-avutil "	<< caspar::ffmpeg::get_avutil_version();
+	CASPAR_LOG(info) << L"FFMPEG-swscale "  << caspar::ffmpeg::get_swscale_version();
+	CASPAR_LOG(info) << L"OpenGL " << caspar::core::ogl_device::get_version() << "\n\n";
+}
 
-	CASPAR_LOG(info) << L"FFMPEG-avcodec "  << caspar::get_avcodec_version();
-	CASPAR_LOG(info) << L"FFMPEG-swscale "  << caspar::get_avformat_version();
-	CASPAR_LOG(info) << L"FFMPEG-avformat " << caspar::get_swscale_version();
-	CASPAR_LOG(info) << L"OpenGL " << caspar::mixer::ogl_device::get_version() << "\n\n";
+LONG WINAPI UserUnhandledExceptionFilter(EXCEPTION_POINTERS* info)
+{
+	try
+	{
+		CASPAR_LOG(fatal) << L"#######################\n UNHANDLED EXCEPTION: \n" 
+			<< L"Adress:" << info->ExceptionRecord->ExceptionAddress << L"\n"
+			<< L"Code:" << info->ExceptionRecord->ExceptionCode << L"\n"
+			<< L"Flag:" << info->ExceptionRecord->ExceptionFlags << L"\n"
+			<< L"Info:" << info->ExceptionRecord->ExceptionInformation << L"\n"
+			<< L"Continuing execution. \n#######################";
+	}
+	catch(...){}
+
+    return EXCEPTION_CONTINUE_EXECUTION;
 }
- 
+
 int main(int argc, wchar_t* argv[])
 {	
 	static_assert(sizeof(void*) == 4, "64-bit code generation is not supported.");
 	
-	CASPAR_LOG(info) << L"THIS IS AN UNSTABLE BUILD";
+	SetUnhandledExceptionFilter(UserUnhandledExceptionFilter);
 
+	CASPAR_LOG(info) << L"Type \"q\" to close application";
+	
 	// Set debug mode.
 	#ifdef _DEBUG
 		_CrtSetDbgFlag ( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF | _CRTDBG_CHECK_ALWAYS_DF );
@@ -134,6 +184,8 @@ int main(int argc, wchar_t* argv[])
 
 	// Install structured exception handler.
 	caspar::win32_exception::install_handler();
+
+	caspar::log::set_log_level(L"debug");
 			
 	// Increase time precision. This will increase accuracy of function like Sleep(1) from 10 ms to 1 ms.
 	struct inc_prec
@@ -146,13 +198,19 @@ int main(int argc, wchar_t* argv[])
 	struct tbb_thread_installer : public tbb::task_scheduler_observer
 	{
 		tbb_thread_installer(){observe(true);}
-		void on_scheduler_entry(bool is_worker){caspar::win32_exception::install_handler();}
+		void on_scheduler_entry(bool is_worker)
+		{
+			//caspar::detail::SetThreadName(GetCurrentThreadId(), "tbb-worker-thread");
+			caspar::win32_exception::install_handler();
+		}
 	} tbb_thread_installer;
+
+	tbb::task_scheduler_init init;
 	
 	try 
 	{
 		// Configure environment properties from configuration.
-		caspar::env::configure("caspar.config");
+		caspar::env::configure("casparcg.config");
 
 	#ifdef _DEBUG
 		if(caspar::env::properties().get("configuration.debugging.remote", false))
@@ -184,53 +242,75 @@ int main(int argc, wchar_t* argv[])
 			std::getline(std::wcin, wcmd); // TODO: It's blocking...
 
 			is_running = wcmd != L"exit" && wcmd != L"q";
-			if(wcmd.substr(0, 2) == L"12")
-			{
-				wcmd = L"LOADBG 1-1 A LOOP \r\nPLAY 1-1\r\n";
-				amcp.Parse(wcmd.c_str(), wcmd.length(), dummy);
-				wcmd = L"LOADBG 1-2 DV LOOP AUTOPLAY\r\nnPLAY 1-1\r\n";
-				amcp.Parse(wcmd.c_str(), wcmd.length(), dummy);
-				wcmd = L"MIXER 1-1 VIDEO FIX_RECT 0.0 0.0 0.5 0.5\r\n";
-				amcp.Parse(wcmd.c_str(), wcmd.length(), dummy);
-				wcmd = L"MIXER 1-2 VIDEO FIX_RECT 0.5 0.0 0.5 0.5\r\n";
-				amcp.Parse(wcmd.c_str(), wcmd.length(), dummy);
-			}
-			else if(wcmd.substr(0, 2) == L"10")
-				wcmd = L"MIXER 1-1 VIDEO CLIP_RECT 0.4 0.4 0.5 0.5";
-			if(wcmd.substr(0, 2) == L"11")
-				wcmd = L"MIXER 1-1 VIDEO FIX_RECT 0.4 0.4 0.5 0.5";
-			else if(wcmd.substr(0, 1) == L"1")
+			if(wcmd.substr(0, 1) == L"1")
 				wcmd = L"LOADBG 1-1 " + wcmd.substr(1, wcmd.length()-1) + L" SLIDE 100 LOOP \r\nPLAY 1-1";
 			else if(wcmd.substr(0, 1) == L"2")
 				wcmd = L"MIXER 1-0 VIDEO IS_KEY 1";
 			else if(wcmd.substr(0, 1) == L"3")
-				wcmd = L"LOADBG 1-1 " + wcmd.substr(1, wcmd.length()-1) + L" MIX 100 LOOP \r\nPLAY 1-1";
+				wcmd = L"CG 1-2 ADD 1 BBTELEFONARE 1";
 			else if(wcmd.substr(0, 1) == L"4")
-				wcmd = L"LOADBG 1-1 " + wcmd.substr(1, wcmd.length()-1) + L" WIPE 100 LOOP \r\nPLAY 1-1";
+				wcmd = L"PLAY 1-1 DV FILTER yadif=1:-1 LOOP";
 			else if(wcmd.substr(0, 1) == L"5")
-				wcmd = L"LOADBG 1-2 " + wcmd.substr(1, wcmd.length()-1) + L" LOOP \r\nPLAY 1-2";
-			else if(wcmd.substr(0, 1) == L"6")
-				wcmd = L"CG 1-2 ADD 1 BBTELEFONARE 1";
-			else if(wcmd.substr(0, 1) == L"7")
-				wcmd = L"CG 1-2 ADD 1 " + wcmd.substr(1, wcmd.length()-1) + L" 1";
-			else if(wcmd.substr(0, 1) == L"8")
-				wcmd = L"LOAD 1-1 #FFFFFFFF AUTOPLAY";
-			else if(wcmd.substr(0, 1) == L"9")
-				wcmd = L"LOADBG 1-2 " + wcmd.substr(1, wcmd.length()-1) + L" [1.0-2.0] LOOP AUTOPLAY";
+			{
+				auto file = wcmd.substr(2, wcmd.length()-1);
+				wcmd = L"PLAY 1-1 " + file + L" LOOP\r\n" 
+					   L"PLAY 1-2 " + file + L" LOOP\r\n" 
+					   L"PLAY 1-3 " + file + L" LOOP\r\n"
+					   L"PLAY 2-1 " + file + L" LOOP\r\n" 
+					   L"PLAY 2-2 " + file + L" LOOP\r\n" 
+					   L"PLAY 2-3 " + file + L" LOOP\r\n";
+			}
+			else if(wcmd.substr(0, 1) == L"X")
+			{
+				int num = 0;
+				std::wstring file;
+				try
+				{
+					num = boost::lexical_cast<int>(wcmd.substr(1, 2));
+					file = wcmd.substr(4, wcmd.length()-1);
+				}
+				catch(...)
+				{
+					num = boost::lexical_cast<int>(wcmd.substr(1, 1));
+					file = wcmd.substr(3, wcmd.length()-1);
+				}
+
+				int n = 0;
+				int num2 = num;
+				while(num2 > 0)
+				{
+					num2 >>= 1;
+					n++;
+				}
+
+				wcmd = L"MIXER 1 GRID " + boost::lexical_cast<std::wstring>(n);
+
+				for(int i = 1; i <= num; ++i)
+					wcmd += L"\r\nPLAY 1-" + boost::lexical_cast<std::wstring>(i) + L" " + file + L" LOOP";// + L" SLIDE 100 LOOP";
+			}
 
 			wcmd += L"\r\n";
 			amcp.Parse(wcmd.c_str(), wcmd.length(), dummy);
 		}
 	}
-	catch(const std::exception&)
+	catch(boost::property_tree::file_parser_error&)
+	{
+		CASPAR_LOG_CURRENT_EXCEPTION();
+		CASPAR_LOG(fatal) << L"Unhandled configuration error in main thread. Please check the configuration file (casparcg.config) for errors.";
+	}
+	catch(caspar::gl::ogl_exception&)
+	{
+		CASPAR_LOG_CURRENT_EXCEPTION();
+		CASPAR_LOG(fatal) << L"Unhandled OpenGL Error in main thread. Please try to update graphics drivers in order to receive full OpenGL 3.1+ Support.";
+	}
+	catch(...)
 	{
-		CASPAR_LOG(fatal) << "UNHANDLED EXCEPTION in main thread.";
 		CASPAR_LOG_CURRENT_EXCEPTION();
+		CASPAR_LOG(fatal) << L"Unhandled exception in main thread. Please report this error on the CasparCG forums (www.casparcg.com/forum).";
 	}	
 	
 	CASPAR_LOG(info) << "Successfully shutdown CasparCG Server.";
 	Sleep(100); // CAPSAR_LOG is asynchronous. Try to get text in correct order.
-	std::wcout << L"Press Any Key To Exit.\n";
-	_getwch();
+	system("pause");
 	return 0;
 }
\ No newline at end of file