2.0.0.2: - bluefish_consumer: Cleanup.

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

diff --git a/modules/bluefish/consumer/bluefish_consumer.cpp b/modules/bluefish/consumer/bluefish_consumer.cpp
index f6b61304674afca304e0c928f8a874d962fd4a24..afcac5196a95e40e00658a0a5e2d4f9d461d7a71 100644 (file)
--- a/modules/bluefish/consumer/bluefish_consumer.cpp
+++ b/modules/bluefish/consumer/bluefish_consumer.cpp
@@ -53,32 +53,24 @@ struct bluefish_consumer : boost::noncopyable
        boost::timer                                            frame_timer_;\r
        boost::timer                                            tick_timer_;\r
        boost::timer                                            sync_timer_;    \r
-               \r
-       const EVideoMode                                        vid_fmt_; \r
-       const EMemoryFormat                                     mem_fmt_;\r
-       const EUpdateMethod                                     upd_fmt_;\r
-       const EResoFormat                                       res_fmt_; \r
-       EEngineMode                                                     engine_mode_;\r
-       \r
-       std::array<blue_dma_buffer_ptr, 4> reserved_frames_;    \r
+                       \r
+       unsigned int                                            vid_fmt_;\r
+\r
+       std::array<blue_dma_buffer_ptr, 4>      reserved_frames_;       \r
        tbb::concurrent_bounded_queue<std::shared_ptr<const core::read_frame>> frame_buffer_;\r
 \r
-       int preroll_count_;\r
+       int                                                                     preroll_count_;\r
 \r
-       const bool embedded_audio_;\r
+       const bool                                                      embedded_audio_;\r
        \r
-       executor executor_;\r
+       executor                                                        executor_;\r
 public:\r
        bluefish_consumer(const core::video_format_desc& format_desc, unsigned int device_index, bool embedded_audio) \r
                : blue_(create_blue())\r
                , device_index_(device_index)\r
                , format_desc_(format_desc) \r
                , model_name_(get_card_desc(*blue_))\r
-               , vid_fmt_(get_video_mode(*blue_, format_desc)) \r
-               , mem_fmt_(MEM_FMT_ARGB_PC)\r
-               , upd_fmt_(UPD_FMT_FRAME)\r
-               , res_fmt_(RES_FMT_NORMAL) \r
-               , engine_mode_(VIDEO_ENGINE_FRAMESTORE) \r
+               , vid_fmt_(get_video_mode(*blue_, format_desc))\r
                , preroll_count_(0)\r
                , embedded_audio_(embedded_audio)\r
                , executor_(print())\r
@@ -101,7 +93,7 @@ public:
                        BOOST_THROW_EXCEPTION(bluefish_exception() << msg_info(narrow(print()) + " Failed to set videomode."));\r
 \r
                //Select Update Mode for output\r
-               if(BLUE_FAIL(set_card_property(blue_, VIDEO_UPDATE_TYPE, upd_fmt_))) \r
+               if(BLUE_FAIL(set_card_property(blue_, VIDEO_UPDATE_TYPE, UPD_FMT_FRAME))) \r
                        BOOST_THROW_EXCEPTION(bluefish_exception() << msg_info(narrow(print()) + " Failed to set update type."));\r
        \r
                disable_video_output();\r
@@ -114,7 +106,7 @@ public:
                        BOOST_THROW_EXCEPTION(bluefish_exception() << msg_info(narrow(print()) + " Failed to set dual link format type to 4:2:2:4."));\r
                        \r
                //Select output memory format\r
-               if(BLUE_FAIL(set_card_property(blue_, VIDEO_MEMORY_FORMAT, mem_fmt_))) \r
+               if(BLUE_FAIL(set_card_property(blue_, VIDEO_MEMORY_FORMAT, MEM_FMT_ARGB_PC))) \r
                        BOOST_THROW_EXCEPTION(bluefish_exception() << msg_info(narrow(print()) + " Failed to set memory format."));\r
                \r
                //Select image orientation\r
@@ -150,7 +142,8 @@ public:
                if(blue_->GetHDCardType(device_index_) != CRD_HD_INVALID) \r
                        blue_->Set_DownConverterSignalType(vid_fmt_ == VID_FMT_PAL ? SD_SDI : HD_SDI);  \r
        \r
-               if(BLUE_FAIL(blue_->set_video_engine(*reinterpret_cast<unsigned long*>(&engine_mode_))))\r
+               unsigned long engine_mode = VIDEO_ENGINE_FRAMESTORE;\r
+               if(BLUE_FAIL(blue_->set_video_engine(engine_mode)))\r
                        BOOST_THROW_EXCEPTION(bluefish_exception() << msg_info(narrow(print()) + " Failed to set video engine."));\r
 \r
                enable_video_output();\r