* Merged mipmapping_defaul_on configuration property.

diff --git a/accelerator/accelerator.cpp b/accelerator/accelerator.cpp
index d9747c38f661870ad2cdda90b41e437b9e9c7dee..4fbd90073cd28713177255b38a6c0971008097f7 100644 (file)
--- a/accelerator/accelerator.cpp
+++ b/accelerator/accelerator.cpp
@@ -37,7 +37,7 @@ struct accelerator::impl
                                if(!ogl_device_)
                                        ogl_device_.reset(new ogl::device());
 
-                               return std::unique_ptr<core::image_mixer>(new ogl::image_mixer(spl::make_shared_ptr(ogl_device_), env::properties().get(L"configuration.blend-modes", false)));
+                               return std::unique_ptr<core::image_mixer>(new ogl::image_mixer(spl::make_shared_ptr(ogl_device_), env::properties().get(L"configuration.mixer.blend-modes", false)));
                        }
                }
                catch(...)

diff --git a/core/frame/frame_transform.h b/core/frame/frame_transform.h
index 3d245171f1b72ecf7a2f47774a0e1b7f8c4d10d6..d0d2277cc1b7201a96e0522f9268c1ffc26c59c3 100644 (file)
--- a/core/frame/frame_transform.h
+++ b/core/frame/frame_transform.h
@@ -22,10 +22,13 @@
 #pragma once
 
 #include <common/tweener.h>
+#include <common/env.h>
+
 #include <core/video_format.h>
 #include <core/mixer/image/blend_modes.h>
 
 #include <boost/array.hpp>
+#include <boost/property_tree/ptree.hpp>
 
 namespace caspar { namespace core {
                        
@@ -135,6 +138,7 @@ public:
                : duration_(0)
                , time_(0)
        {
+               dest_.image_transform.use_mipmap = env::properties().get(L"configuration.mixer.mipmapping_default_on", false);
        }
 
        tweened_transform(const frame_transform& source, const frame_transform& dest, int duration, const tweener& tween)

diff --git a/shell/casparcg.config b/shell/casparcg.config
index 01dcf8df47ec027a326921b6ac74ee652a5fb5af..2e740acb9a8b6aa86b4467e0d24e34cd35a02268 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <configuration>\r
   <paths>\r
-       <media-path>media/</media-path>\r
-       <log-path>log/</log-path>\r
-       <data-path>data/</data-path>\r
-       <template-path>templates/</template-path>\r
-       <thumbnails-path>thumbnails/</thumbnails-path>\r
-       <fonts-path>fonts/</fonts-path>\r
+    <media-path>media/</media-path>\r
+    <log-path>log/</log-path>\r
+    <data-path>data/</data-path>\r
+    <template-path>templates/</template-path>\r
+    <thumbnails-path>thumbnails/</thumbnails-path>\r
+    <fonts-path>fonts/</fonts-path>\r
   </paths>\r
   <flash>\r
     <buffer-depth>4</buffer-depth>\r
@@ -45,7 +45,10 @@
 <log-level>           trace [trace|debug|info|warning|error]</log-level>\r
 <force-deinterlace>   true  [true|false]</force-deinterlacing>\r
 <channel-grid>        false [true|false]</channel-grid>\r
-<blend-modes>         true  [true|false]</blend-modes>\r
+<mixer>\r
+    <blend-modes>          false [true|false]</blend-modes>\r
+    <mipmapping_default_on>false [true|false]</mipmapping_default_on>\r
+</mixer>\r
 <auto-transcode>      true  [true|false]</auto-transcode>\r
 <accelerator>auto [cpu|gpu|auto]</accelerator>\r
 <template-hosts>\r