Some NTSC adjustements. Note that you cannot ADD/REMOVE consumer in NTSC without...

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

diff --git a/core/consumer/frame_consumer.cpp b/core/consumer/frame_consumer.cpp
index 5f8448fa63036baa15ff4dec0a7bcb54ae1ee6fd..63bf35bd47f3890b1360da91b02fad8e403cd44f 100644 (file)
--- a/core/consumer/frame_consumer.cpp
+++ b/core/consumer/frame_consumer.cpp
@@ -86,9 +86,12 @@ public:
 \r
        virtual bool send(const safe_ptr<read_frame>& frame) override\r
        {               \r
+               if(audio_cadence_.size() == 1)\r
+                       return consumer_->send(frame);\r
+\r
                bool result = true;\r
                \r
-               if(boost::range::equal(sync_buffer_, audio_cadence_)) \r
+               if(boost::range::equal(sync_buffer_, audio_cadence_) && audio_cadence_.front() == static_cast<size_t>(frame->audio_data().size())) \r
                {       \r
                        // Audio sent so far is in sync, now we can send the next chunk.\r
                        result = consumer_->send(frame);\r

diff --git a/shell/casparcg.config b/shell/casparcg.config
index 2aa3f1cc5d49a3225860765df202f8f4028e898f..c08ef3264f2f3434edf425a9f13ab7385e4d4c03 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -6,9 +6,10 @@
     <data-path>D:\casparcg\_data\</data-path>\r
     <template-path>D:\casparcg\_templates\</template-path>\r
   </paths>\r
+  <log-level>trace</log-level>\r
   <channels>\r
     <channel>\r
-      <video-mode>NTSC</video-mode>\r
+      <video-mode>PAL</video-mode>\r
       <consumers>\r
         <bluefish>\r
           <device>1</device>\r