X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=shell%2Fmain.cpp;h=6843c9d225033b51802ccbc9b47d102461f6cd04;hb=09362ec89302304408ed6d39494b102cb694b0e4;hp=48bf5e2263bbb21269d88616459229ef0a214703;hpb=cd22a45bbd82a0471c223dbc94ad834b4bdb079d;p=casparcg

diff --git a/shell/main.cpp b/shell/main.cpp
index 48bf5e226..6843c9d22 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/property_tree/detail/file_parser_error.hpp>
 
-#include <boost/foreach.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);
@@ -83,10 +97,21 @@ void setup_console_window()
 	DisplayArea.Right = coord.X-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());
 }
 
@@ -102,13 +127,18 @@ void print_info()
 	CASPAR_LOG(info) << L"FreeImage " << caspar::get_image_version();
 	
 	CASPAR_LOG(info) << L"Decklink " << caspar::get_decklink_version();
-	BOOST_FOREACH(auto& device, caspar::get_decklink_device_list())
+	auto deck = caspar::get_decklink_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::get_bluefish_device_list();
+	std::for_each(blue.begin(), blue.end(), [](const std::wstring& device)
+	{
 		CASPAR_LOG(info) << device;
-
+	});
+	
 	CASPAR_LOG(info) << L"FFMPEG-avcodec "  << caspar::get_avcodec_version();
 	CASPAR_LOG(info) << L"FFMPEG-avformat " << caspar::get_avformat_version();
 	CASPAR_LOG(info) << L"FFMPEG-avfilter " << caspar::get_avfilter_version();
@@ -116,12 +146,32 @@ void print_info()
 	CASPAR_LOG(info) << L"FFMPEG-swscale "  << caspar::get_swscale_version();
 	CASPAR_LOG(info) << L"OpenGL " << caspar::core::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";
+
+	CASPAR_LOG(info) << L"THIS IS AN ALPHA BUILD";
 
 	// Set debug mode.
 	#ifdef _DEBUG
@@ -148,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))
@@ -192,6 +248,18 @@ int main(int argc, wchar_t* argv[])
 				wcmd = L"MIXER 1-0 VIDEO IS_KEY 1";
 			else if(wcmd.substr(0, 1) == L"3")
 				wcmd = L"CG 1-2 ADD 1 BBTELEFONARE 1";
+			else if(wcmd.substr(0, 1) == L"4")
+				wcmd = L"PLAY 1-1 DV FILTER yadif=1:-1 LOOP";
+			else if(wcmd.substr(0, 1) == L"5")
+			{
+				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;
@@ -215,25 +283,34 @@ int main(int argc, wchar_t* argv[])
 					n++;
 				}
 
-				wcmd = L"MIXER 1 VIDEO GRID " + boost::lexical_cast<std::wstring>(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" SLIDE 100 LOOP";
+					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