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

diff --git a/common/common.vcxproj b/common/common.vcxproj
index f0eb2ab5f2beebfd10cc0a07ba82c1950948cf7a..029b5a3f729b08bdb31f00395b5f5b93d4ed14f0 100644 (file)
--- a/common/common.vcxproj
+++ b/common/common.vcxproj
@@ -214,8 +214,8 @@
     <ClInclude Include="env.h" />\r
     <ClInclude Include="stdafx.h" />\r
     <ClInclude Include="utility\assert.h" />\r
-    <ClInclude Include="utility\printable.h" />\r
-    <ClInclude Include="utility\string_convert.h" />\r
+    <ClInclude Include="utility\printer.h" />\r
+    <ClInclude Include="utility\string.h" />\r
     <ClInclude Include="utility\timer.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r

diff --git a/common/common.vcxproj.filters b/common/common.vcxproj.filters
index 3194db3277e4a89d2737df77d974977bec88330b..280c0650eca2c37f8092933f674de2efa0ce6f7d 100644 (file)
--- a/common/common.vcxproj.filters
+++ b/common/common.vcxproj.filters
@@ -75,9 +75,6 @@
     <ClInclude Include="utility\timer.h">\r
       <Filter>Source\utility</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="utility\string_convert.h">\r
-      <Filter>Source\utility</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="gl\gl_check.h">\r
       <Filter>Source\gl</Filter>\r
     </ClInclude>\r
@@ -96,7 +93,10 @@
     <ClInclude Include="diagnostics\graph.h">\r
       <Filter>Source\diagnostics</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="utility\printable.h">\r
+    <ClInclude Include="utility\string.h">\r
+      <Filter>Source\utility</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="utility\printer.h">\r
       <Filter>Source\utility</Filter>\r
     </ClInclude>\r
   </ItemGroup>\r

diff --git a/common/diagnostics/graph.h b/common/diagnostics/graph.h
index aab1136326bd97d236865acc7644497b7f663e08..08590f67f03fab936cb000328f2457abb59d0003 100644 (file)
--- a/common/diagnostics/graph.h
+++ b/common/diagnostics/graph.h
@@ -2,7 +2,7 @@
 \r
 #include "../memory/safe_ptr.h"\r
 \r
-#include "../utility/printable.h"\r
+#include "../utility/printer.h"\r
 \r
 #include <string>\r
 \r

diff --git a/common/env.cpp b/common/env.cpp
index 8d3b9c73f197048705d6857e906de0182fe373aa..923e4669b9237a07221f2c1fc3b36a7e6b73e432 100644 (file)
--- a/common/env.cpp
+++ b/common/env.cpp
@@ -4,7 +4,7 @@
 \r
 #include "../version.h"\r
 \r
-#include "utility/string_convert.h"\r
+#include "utility/string.h"\r
 \r
 #include <boost/property_tree/ptree.hpp>\r
 #include <boost/property_tree/xml_parser.hpp>\r

diff --git a/common/log/log.h b/common/log/log.h
index 1cde097ef17195b6cc0214090ed3d8bb9c085e3a..d028ea2a4f1391c9bd62ec3ccecb12f4357de5a1 100644 (file)
--- a/common/log/log.h
+++ b/common/log/log.h
@@ -15,7 +15,7 @@
 #include <boost/log/sources/severity_logger.hpp>\r
 #include <boost/log/sources/record_ostream.hpp>\r
 \r
-#include "../utility/string_convert.h"\r
+#include "../utility/string.h"\r
 \r
 namespace caspar { namespace log {\r
        \r

diff --git a/common/utility/assert.h b/common/utility/assert.h
index 518103eb76773e1007e8af4253220acc47ed6e9c..6b45d51a2a80deda2f844cc74eba4c33ecd816a9 100644 (file)
--- a/common/utility/assert.h
+++ b/common/utility/assert.h
@@ -8,10 +8,16 @@
 #define _CASPAR_DBG_BREAK\r
 #endif\r
 \r
-#define CASPAR_ASSERT_EXPR_STR(str) #str\r
+#define CASPAR_VERIFY_EXPR_STR(str) #str\r
 \r
-#define CASPAR_ASSERT(expr) do{if(!(expr)){ CASPAR_LOG(warning) << "Assertion Failed: " << \\r
-       CASPAR_ASSERT_EXPR_STR(expr) << " " \\r
+#define CASPAR_VERIFY(expr) do{if(!(expr)){ CASPAR_LOG(warning) << "Assertion Failed: " << \\r
+       CASPAR_VERIFY_EXPR_STR(expr) << " " \\r
        __FILE__ << " "; \\r
        _CASPAR_DBG_BREAK;\\r
-       }}while(0);
\ No newline at end of file
+       }}while(0);\r
+\r
+#ifdef _DEBUG\r
+#define CASPAR_ASSERT(expr) CASPAR_VERIFY(expr)\r
+#else\r
+#define CASPAR_ASSERT(expr)\r
+#endif
\ No newline at end of file

diff --git a/common/utility/printable.h b/common/utility/printer.h
similarity index 100%
rename from common/utility/printable.h
rename to common/utility/printer.h

diff --git a/common/utility/string_convert.h b/common/utility/string.h
similarity index 100%
rename from common/utility/string_convert.h
rename to common/utility/string.h

diff --git a/core/StdAfx.h b/core/StdAfx.h
index 5598e5a77a038caba9dc81575238c3345df81cd8..5adedf1ec5698368bb7940fa4ab2a5f6a6d2514b 100644 (file)
--- a/core/StdAfx.h
+++ b/core/StdAfx.h
@@ -75,7 +75,7 @@
 #include <SFML/Window.hpp>\r
 #include <SFML/Audio.hpp>\r
 \r
-#include "../common/utility/string_convert.h"\r
+#include "../common/utility/string.h"\r
 #include "../common/memory/safe_ptr.h"\r
 //#include "../common/concurrency/executor.h" // Can't include this due to MSVC lambda bug\r
 \r

diff --git a/core/channel.cpp b/core/channel.cpp
index 3f1522c25aed9317ca92544ea05027924268d06b..141af1f4c5f5fec9d0c440a516824143bfa303aa 100644 (file)
--- a/core/channel.cpp
+++ b/core/channel.cpp
@@ -12,7 +12,7 @@
 #include "producer/layer.h"\r
 \r
 #include <common/concurrency/executor.h>\r
-#include <common/utility/printable.h>\r
+#include <common/utility/printer.h>\r
 \r
 #include <boost/range/algorithm_ext/erase.hpp>\r
 \r

diff --git a/core/consumer/ffmpeg/ffmpeg_consumer.cpp b/core/consumer/ffmpeg/ffmpeg_consumer.cpp
index dbbb419422f1a6a0ac1f3698785aab607009bf7d..a8cf372fea7e3bf9e733df7c12d0d54efc4e43a9 100644 (file)
--- a/core/consumer/ffmpeg/ffmpeg_consumer.cpp
+++ b/core/consumer/ffmpeg/ffmpeg_consumer.cpp
@@ -25,7 +25,7 @@
 #include <mixer/frame/read_frame.h>\r
 \r
 #include <common/concurrency/executor.h>\r
-#include <common/utility/string_convert.h>\r
+#include <common/utility/string.h>\r
 #include <common/env.h>\r
 \r
 #include <boost/thread/once.hpp>\r

diff --git a/core/consumer/frame_consumer.h b/core/consumer/frame_consumer.h
index 7c17859adaf620266bc6a08260c0997ce0a98d8e..96a9ec6ea65c18d8b6f46940da1c86859d586ded 100644 (file)
--- a/core/consumer/frame_consumer.h
+++ b/core/consumer/frame_consumer.h
@@ -23,7 +23,7 @@
 \r
 #include <boost/noncopyable.hpp>\r
 \r
-#include <common/utility/printable.h>\r
+#include <common/utility/printer.h>\r
 \r
 namespace caspar { namespace core {\r
        \r

diff --git a/core/consumer/frame_consumer_device.h b/core/consumer/frame_consumer_device.h
index 77434446deea6ee28ce012fc2d3c02f584fc32f9..1940b6574dd6a635dfe18cb6c50660856c294e1d 100644 (file)
--- a/core/consumer/frame_consumer_device.h
+++ b/core/consumer/frame_consumer_device.h
@@ -3,7 +3,7 @@
 #include "../consumer/frame_consumer.h"\r
 \r
 #include <common/memory/safe_ptr.h>\r
-#include <common/utility/printable.h>\r
+#include <common/utility/printer.h>\r
 \r
 #include <vector>\r
 \r

diff --git a/core/producer/ffmpeg/input.cpp b/core/producer/ffmpeg/input.cpp
index 5860a15002e1c7b8289c6a4609563ffda8e6179a..02aa984b3223d13ef11f6ffa97974cc60523fc2f 100644 (file)
--- a/core/producer/ffmpeg/input.cpp
+++ b/core/producer/ffmpeg/input.cpp
@@ -6,7 +6,7 @@
 \r
 #include <common/concurrency/executor.h>\r
 #include <common/diagnostics/graph.h>\r
-#include <common/utility/printable.h>\r
+#include <common/utility/printer.h>\r
 \r
 #include <tbb/concurrent_queue.h>\r
 #include <tbb/queuing_mutex.h>\r

diff --git a/core/producer/ffmpeg/input.h b/core/producer/ffmpeg/input.h
index 34bde78258f7e76ec562312b3086fab2bda27b9e..c0d4ed184dd488f27ccb01d90d690c72b5ad68c3 100644 (file)
--- a/core/producer/ffmpeg/input.h
+++ b/core/producer/ffmpeg/input.h
@@ -1,7 +1,7 @@
 #pragma once\r
 \r
 #include <common/diagnostics/graph.h>\r
-#include <common/utility/printable.h>\r
+#include <common/utility/printer.h>\r
 \r
 #include <tbb/cache_aligned_allocator.h>\r
 \r

diff --git a/core/producer/frame_producer.h b/core/producer/frame_producer.h
index aafe2dd1d4a86cec949635ed0280b66654a264bc..7b90b58091f4ae6a218b35c22ff6df82b46f43ac 100644 (file)
--- a/core/producer/frame_producer.h
+++ b/core/producer/frame_producer.h
@@ -23,7 +23,7 @@
 #include "../mixer/frame_factory.h"\r
 \r
 #include <common/memory/safe_ptr.h>\r
-#include <common/utility/printable.h>\r
+#include <common/utility/printer.h>\r
 \r
 #include <boost/noncopyable.hpp>\r
 \r

diff --git a/core/producer/frame_producer_device.cpp b/core/producer/frame_producer_device.cpp
index 7bf63113b83f121f1108651e83f1452f146f250a..763f031b4573958dd67bdb5a2e556f70ccbf584f 100644 (file)
--- a/core/producer/frame_producer_device.cpp
+++ b/core/producer/frame_producer_device.cpp
@@ -8,7 +8,7 @@
 #include "layer.h"\r
 \r
 #include <common/concurrency/executor.h>\r
-#include <common/utility/printable.h>\r
+#include <common/utility/printer.h>\r
 \r
 #include <boost/range/algorithm_ext/erase.hpp>\r
 #include <boost/lexical_cast.hpp>\r

diff --git a/core/producer/frame_producer_device.h b/core/producer/frame_producer_device.h
index eb57eaa401d3cf5618b76dd8ba1fa3a15fd633ad..65dc584ea8783cd4b8e9319687e09373f1893c13 100644 (file)
--- a/core/producer/frame_producer_device.h
+++ b/core/producer/frame_producer_device.h
@@ -3,7 +3,7 @@
 #include "frame_producer.h"\r
 \r
 #include <common/memory/safe_ptr.h>\r
-#include <common/utility/printable.h>\r
+#include <common/utility/printer.h>\r
 \r
 #include <boost/noncopyable.hpp>\r
 #include <boost/thread/future.hpp>\r

diff --git a/core/producer/layer.cpp b/core/producer/layer.cpp
index fc1e9d4fa94cd1482dc0383f27ecf26862e7ab5c..fa21c5b16433b1860ac86bd4ff381b0b2c4ff4a2 100644 (file)
--- a/core/producer/layer.cpp
+++ b/core/producer/layer.cpp
@@ -7,7 +7,7 @@
 \r
 #include <common/concurrency/executor.h>\r
 #include <common/utility/assert.h>\r
-#include <common/utility/printable.h>\r
+#include <common/utility/printer.h>\r
 \r
 #include <mixer/frame/draw_frame.h>\r
 #include <mixer/image/image_mixer.h>\r
@@ -39,7 +39,7 @@ public:
 \r
        void remove(safe_ptr<frame_producer>&& producer)\r
        {\r
-               CASPAR_ASSERT(producer.unique());\r
+               CASPAR_VERIFY(producer.unique());\r
                executor_.begin_invoke(std::bind(&frame_producer_remover::do_remove, this, std::move(producer)));\r
        }\r
 };\r
@@ -127,7 +127,7 @@ public:
                        last_frame_ = foreground_->receive(); \r
                        if(last_frame_ == draw_frame::eof())\r
                        {\r
-                               CASPAR_ASSERT(foreground_ != frame_producer::empty());\r
+                               CASPAR_VERIFY(foreground_ != frame_producer::empty());\r
 \r
                                auto following = foreground_->get_following_producer();\r
                                following->set_leading_producer(foreground_);\r

diff --git a/core/producer/layer.h b/core/producer/layer.h
index f3103932c651db9e573d2540851cfecaeea7a273..9e70ae583e79f451f7f9ccd9c0b39c4d3ffbd3c5 100644 (file)
--- a/core/producer/layer.h
+++ b/core/producer/layer.h
@@ -1,7 +1,7 @@
 #pragma once\r
 \r
 #include <common/memory/safe_ptr.h>\r
-#include <common/utility/printable.h>\r
+#include <common/utility/printer.h>\r
 \r
 #include <boost/noncopyable.hpp>\r
 \r

diff --git a/mixer/StdAfx.h b/mixer/StdAfx.h
index ae5ef5a5c19e42a7cecc9b356c2f72bbd8eb20d7..7b19d3b5894a3e851c4e2fc97a77b08a67b9a029 100644 (file)
--- a/mixer/StdAfx.h
+++ b/mixer/StdAfx.h
@@ -70,7 +70,7 @@
 \r
 #include <SFML/Window.hpp>\r
 \r
-#include <common/utility/string_convert.h>\r
+#include <common/utility/string.h>\r
 #include <common/memory/safe_ptr.h>\r
 //#include <common/concurrency/executor.h> // Can't include this due to MSVC lambda bug\r
 \r

diff --git a/mixer/frame_mixer_device.h b/mixer/frame_mixer_device.h
index c64ddc393e1aa943d1d6d086c945e235cf1de42a..a526feb944fd99069f4056e0727eecc270df7745 100644 (file)
--- a/mixer/frame_mixer_device.h
+++ b/mixer/frame_mixer_device.h
@@ -30,7 +30,7 @@
 #include "frame/pixel_format.h"\r
 \r
 #include <common/memory/safe_ptr.h>\r
-#include <common/utility/printable.h>\r
+#include <common/utility/printer.h>\r
 \r
 #include <functional>\r
 \r

diff --git a/mixer/gpu/ogl_device.cpp b/mixer/gpu/ogl_device.cpp
index 0630d3ea132214d02cbb2e38f54fc42f16aaed9a..082043bfd7cfcf3c26bfc87a9ccbdc6976eb52dd 100644 (file)
--- a/mixer/gpu/ogl_device.cpp
+++ b/mixer/gpu/ogl_device.cpp
@@ -34,8 +34,8 @@ ogl_device::~ogl_device()
                                \r
 safe_ptr<device_buffer> ogl_device::create_device_buffer(size_t width, size_t height, size_t stride)\r
 {\r
-       CASPAR_ASSERT(stride > 0 && stride < 5);\r
-       CASPAR_ASSERT(width > 0 && height > 0);\r
+       CASPAR_VERIFY(stride > 0 && stride < 5);\r
+       CASPAR_VERIFY(width > 0 && height > 0);\r
        auto pool = &device_pools_[stride-1][((width << 16) & 0xFFFF0000) | (height & 0x0000FFFF)];\r
        std::shared_ptr<device_buffer> buffer;\r
        if(!pool->try_pop(buffer))              \r
@@ -51,8 +51,8 @@ safe_ptr<device_buffer> ogl_device::create_device_buffer(size_t width, size_t he
        \r
 safe_ptr<host_buffer> ogl_device::create_host_buffer(size_t size, host_buffer::usage_t usage)\r
 {\r
-       CASPAR_ASSERT(usage == host_buffer::write_only || usage == host_buffer::read_only);\r
-       CASPAR_ASSERT(size > 0);\r
+       CASPAR_VERIFY(usage == host_buffer::write_only || usage == host_buffer::read_only);\r
+       CASPAR_VERIFY(size > 0);\r
        auto pool = &host_pools_[usage][size];\r
        std::shared_ptr<host_buffer> buffer;\r
        if(!pool->try_pop(buffer))\r

diff --git a/protocol/StdAfx.h b/protocol/StdAfx.h
index ab8c7fa583e0f97cc99ec07c824e32654dd09f32..ee02caebff81c238756b1b2dcd2146febfc8ac5c 100644 (file)
--- a/protocol/StdAfx.h
+++ b/protocol/StdAfx.h
@@ -69,7 +69,7 @@
 #include <boost/foreach.hpp>\r
 #include <boost/range/algorithm.hpp>\r
 \r
-#include "../common/utility/string_convert.h"\r
+#include "../common/utility/string.h"\r
 #include "../common/memory/safe_ptr.h"\r
 //#include "../common/concurrency/executor.h" // Can't include this due to MSVC lambda bug\r
 \r

diff --git a/shell/boostrapper.cpp b/shell/boostrapper.cpp
index fd28287628cffa20b5dcf0934ee127dfc7d8e6fe..9ae02f45b72a76f275a14661a2cabf2662f5a3e6 100644 (file)
--- a/shell/boostrapper.cpp
+++ b/shell/boostrapper.cpp
@@ -17,7 +17,7 @@
 \r
 #include <common/env.h>\r
 #include <common/exception/exceptions.h>\r
-#include <common/utility/string_convert.h>\r
+#include <common/utility/string.h>\r
 \r
 #include <boost/algorithm/string.hpp>\r
 #include <boost/lexical_cast.hpp>\r