From: ronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Date: Mon, 22 Aug 2011 07:30:04 +0000 (+0000)
Subject: git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches... 
X-Git-Tag: 2.0.1~82
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=6217d51c8c995dd3f3f3b25be6aa14179c18239f;p=casparcg

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

diff --git a/modules/ffmpeg/producer/frame_muxer.cpp b/modules/ffmpeg/producer/frame_muxer.cpp
index 683b059ed..14a20ddf6 100644
--- a/modules/ffmpeg/producer/frame_muxer.cpp
+++ b/modules/ffmpeg/producer/frame_muxer.cpp
@@ -226,9 +226,9 @@ struct frame_muxer::implementation : boost::noncopyable
 
 			// Fix field-order if needed
 			if(frame->get_type() == core::field_mode::lower && format_desc_.field_mode == core::field_mode::upper)
-				frame->get_frame_transform().fill_translation[1] += 0.5/static_cast<double>(frame->get_pixel_format_desc().planes[0].height);
+				frame->get_frame_transform().fill_translation[1] += 1.0/static_cast<double>(frame->get_pixel_format_desc().planes[0].height);
 			else if(frame->get_type() == core::field_mode::upper && format_desc_.field_mode == core::field_mode::lower)
-				frame->get_frame_transform().fill_translation[1] -= 0.5/static_cast<double>(frame->get_pixel_format_desc().planes[0].height);
+				frame->get_frame_transform().fill_translation[1] -= 1.0/static_cast<double>(frame->get_pixel_format_desc().planes[0].height);
 
 			video_streams_.back().push(frame);
 			++video_frame_count_;
diff --git a/modules/image/producer/image_scroll_producer.cpp b/modules/image/producer/image_scroll_producer.cpp
index 6e888e59f..d839c8fa6 100644
--- 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)
 			{
 				frames_[n]->get_frame_transform().fill_translation[0] = start_offset_[0];
-				frames_[n]->get_frame_transform().fill_translation[1] =	start_offset_[1] - (n+1) + delta_ * 0.5/static_cast<double>(format_desc_.height);
+				frames_[n]->get_frame_transform().fill_translation[1] =	start_offset_[1] - (n+1) + delta_ * static_cast<double>(format_desc_.height);
 			}
 		}
 		else
@@ -177,7 +177,7 @@ struct image_scroll_producer : public core::frame_producer
 
 			for(size_t n = 0; n < frames_.size(); ++n)
 			{
-				frames_[n]->get_frame_transform().fill_translation[0] = start_offset_[0] - (n+1) + delta_ * 0.5/static_cast<double>(format_desc_.width);				
+				frames_[n]->get_frame_transform().fill_translation[0] = start_offset_[0] - (n+1) + delta_ * static_cast<double>(format_desc_.width);				
 				frames_[n]->get_frame_transform().fill_translation[1] = start_offset_[1];
 			}
 		}
diff --git a/shell/casparcg.config b/shell/casparcg.config
index 02ce7a9a8..0b319e095 100644
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <paths>
-    <media-path>C:\Lokala Filer\server\branches\2.0.0.2\bin\_media</media-path>
-    <log-path>L:\\casparcg\\_log\\</log-path>
-    <data-path>L:\\casparcg\\_data\\</data-path>
-    <template-path>L:\\casparcg\\_templates\\</template-path>
+    <media-path>L:\casparcg\_media\</media-path>
+    <log-path>L:\casparcg\_log\</log-path>
+    <data-path>L:\casparcg\_data\</data-path>
+    <template-path>L:\casparcg\_templates\</template-path>
   </paths>
   <diagnostics>
     <graphs>true</graphs>
@@ -51,10 +51,9 @@
     <channel>
       <video-mode>PAL</video-mode>
       <consumers>
-        <screen>
-          <key-only>false</key-only>
-        </screen>
-        <audio></audio>
+        <decklink>
+          <device>1</device>
+        </decklink>
       </consumers>
     </channel>
 </channels>