Allow ogl window to be borderless. I found this useful in integrating a "preview...

[casparcg] / core / thumbnail_generator.cpp

diff --git a/core/thumbnail_generator.cpp b/core/thumbnail_generator.cpp
index d98495fd2586b376dfc10d31d2fc8b40fd0974d1..ba832de9758b28eaf90ed04d2ca0dca1a39cf583 100644 (file)
--- a/core/thumbnail_generator.cpp
+++ b/core/thumbnail_generator.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r
@@ -36,6 +36,7 @@
 #include "producer/frame_producer.h"\r
 #include "consumer/frame_consumer.h"\r
 #include "mixer/mixer.h"\r
+#include "mixer/audio/audio_util.h"\r
 #include "video_format.h"\r
 #include "producer/frame/basic_frame.h"\r
 #include "producer/frame/frame_transform.h"\r
@@ -120,7 +121,12 @@ public:
                , ogl_(ogl)\r
                , format_desc_(render_video_mode)\r
                , output_(new thumbnail_output(generate_delay_millis))\r
-               , mixer_(new mixer(graph_, output_, format_desc_, ogl))\r
+               , mixer_(new mixer(\r
+                               graph_,\r
+                               output_,\r
+                               format_desc_,\r
+                               ogl,\r
+                               channel_layout::stereo()))\r
                , thumbnail_creator_(thumbnail_creator)\r
                , monitor_(monitor_factory.create(\r
                                media_path,\r