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

diff --git a/modules/ffmpeg/producer/frame_muxer.cpp b/modules/ffmpeg/producer/frame_muxer.cpp
index 683b059ed545dd4b1abc1954e2ef60349f3085a0..14a20ddf6318eefffac7c44e96900b89e2037e53 100644 (file)
--- a/modules/ffmpeg/producer/frame_muxer.cpp
+++ b/modules/ffmpeg/producer/frame_muxer.cpp
@@ -226,9 +226,9 @@ struct frame_muxer::implementation : boost::noncopyable
 \r
                        // Fix field-order if needed\r
                        if(frame->get_type() == core::field_mode::lower && format_desc_.field_mode == core::field_mode::upper)\r
-                               frame->get_frame_transform().fill_translation[1] += 0.5/static_cast<double>(frame->get_pixel_format_desc().planes[0].height);\r
+                               frame->get_frame_transform().fill_translation[1] += 1.0/static_cast<double>(frame->get_pixel_format_desc().planes[0].height);\r
                        else if(frame->get_type() == core::field_mode::upper && format_desc_.field_mode == core::field_mode::lower)\r
-                               frame->get_frame_transform().fill_translation[1] -= 0.5/static_cast<double>(frame->get_pixel_format_desc().planes[0].height);\r
+                               frame->get_frame_transform().fill_translation[1] -= 1.0/static_cast<double>(frame->get_pixel_format_desc().planes[0].height);\r
 \r
                        video_streams_.back().push(frame);\r
                        ++video_frame_count_;\r

diff --git a/modules/image/producer/image_scroll_producer.cpp b/modules/image/producer/image_scroll_producer.cpp
index 6e888e59fbee8769761c63b296eea2137bb2b406..d839c8fa6fbbd1641b172af0e43689d620f30f32 100644 (file)
--- a/modules/image/producer/image_scroll_producer.cpp
+++ b/modules/image/producer/image_scroll_producer.cpp
@@ -167,7 +167,7 @@ struct image_scroll_producer : public core::frame_producer
                        for(size_t n = 0; n < frames_.size(); ++n)\r
                        {\r
                                frames_[n]->get_frame_transform().fill_translation[0] = start_offset_[0];\r
-                               frames_[n]->get_frame_transform().fill_translation[1] = start_offset_[1] - (n+1) + delta_ * 0.5/static_cast<double>(format_desc_.height);\r
+                               frames_[n]->get_frame_transform().fill_translation[1] = start_offset_[1] - (n+1) + delta_ * static_cast<double>(format_desc_.height);\r
                        }\r
                }\r
                else\r
@@ -177,7 +177,7 @@ struct image_scroll_producer : public core::frame_producer
 \r
                        for(size_t n = 0; n < frames_.size(); ++n)\r
                        {\r
-                               frames_[n]->get_frame_transform().fill_translation[0] = start_offset_[0] - (n+1) + delta_ * 0.5/static_cast<double>(format_desc_.width);                                \r
+                               frames_[n]->get_frame_transform().fill_translation[0] = start_offset_[0] - (n+1) + delta_ * static_cast<double>(format_desc_.width);                            \r
                                frames_[n]->get_frame_transform().fill_translation[1] = start_offset_[1];\r
                        }\r
                }\r

diff --git a/shell/casparcg.config b/shell/casparcg.config
index 02ce7a9a8d91d6dab9cfadf568f159bb1994736e..0b319e0958aa0854f103b33888d59d2cd788d305 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <configuration>\r
   <paths>\r
-    <media-path>C:\Lokala Filer\server\branches\2.0.0.2\bin\_media</media-path>\r
-    <log-path>L:\\casparcg\\_log\\</log-path>\r
-    <data-path>L:\\casparcg\\_data\\</data-path>\r
-    <template-path>L:\\casparcg\\_templates\\</template-path>\r
+    <media-path>L:\casparcg\_media\</media-path>\r
+    <log-path>L:\casparcg\_log\</log-path>\r
+    <data-path>L:\casparcg\_data\</data-path>\r
+    <template-path>L:\casparcg\_templates\</template-path>\r
   </paths>\r
   <diagnostics>\r
     <graphs>true</graphs>\r
@@ -51,10 +51,9 @@
     <channel>\r
       <video-mode>PAL</video-mode>\r
       <consumers>\r
-        <screen>\r
-          <key-only>false</key-only>\r
-        </screen>\r
-        <audio></audio>\r
+        <decklink>\r
+          <device>1</device>\r
+        </decklink>\r
       </consumers>\r
     </channel>\r
 </channels>\r