2.0.0.2: gl_check: Disabled GL_CHECK for non debug builds.

         ogl_consumer: Only reinitialize if it is actually running.

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

diff --git a/common/gl/gl_check.h b/common/gl/gl_check.h
index 4b00c3f2bc5f8081ee86aa1b4467afcbfdbb8eb8..4437af60f816df8267e383015e39a5ba140efa68 100644 (file)
--- a/common/gl/gl_check.h
+++ b/common/gl/gl_check.h
@@ -107,7 +107,7 @@ inline void SMFL_GLCheckError(const std::string& expr, const std::string& File,
        }\r
 }\r
 \r
-//#ifdef _DEBUG\r
+#ifdef _DEBUG\r
        \r
 #define CASPAR_GL_EXPR_STR(expr) #expr\r
 \r
@@ -117,8 +117,8 @@ inline void SMFL_GLCheckError(const std::string& expr, const std::string& File,
                (expr);  \\r
                caspar::gl::SMFL_GLCheckError(CASPAR_GL_EXPR_STR(expr), __FILE__, __LINE__);\\r
        }while(0);\r
-//#else\r
-//#define GL(expr) expr\r
-//#endif\r
+#else\r
+#define GL(expr) expr\r
+#endif\r
 \r
 }}
\ No newline at end of file

diff --git a/modules/ogl/consumer/ogl_consumer.cpp b/modules/ogl/consumer/ogl_consumer.cpp
index 24ee295a2fa5e3664ff07c8a489bda66b0e7ce2b..b4d26cf8d5ad4320b2df571e5392e353112726b2 100644 (file)
--- a/modules/ogl/consumer/ogl_consumer.cpp
+++ b/modules/ogl/consumer/ogl_consumer.cpp
@@ -300,7 +300,8 @@ void ogl_consumer::send(const safe_ptr<const core::read_frame>& frame){impl_->se
 size_t ogl_consumer::buffer_depth() const{return impl_->buffer_depth();}\r
 void ogl_consumer::initialize(const core::video_format_desc& format_desc)\r
 {\r
-       impl_.reset(new implementation(impl_->screen_index_, impl_->stretch_, impl_->windowed_));\r
+       if(impl_->executor_.is_running())\r
+               impl_.reset(new implementation(impl_->screen_index_, impl_->stretch_, impl_->windowed_));\r
        impl_->initialize(format_desc);\r
 }\r
 std::wstring ogl_consumer::print() const {return impl_->print();}\r

diff --git a/shell/caspar.config b/shell/caspar.config
index ff3414eefb608958d711b1b53e6f4fd073da8621..9cccf95d3f09b2b11e9860a906867255cb2bea42 100644 (file)
--- a/shell/caspar.config
+++ b/shell/caspar.config
@@ -12,7 +12,7 @@
   </diagnostics>\r
   <channels>\r
     <channel>\r
-      <videomode>1080i5000</videomode>\r
+      <videomode>PAL</videomode>\r
       <consumers>\r
         <decklink>\r
           <device>1</device>\r