2.0.0.2: audio_mixer: Fixed no-audio bug.

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

diff --git a/core/mixer/audio/audio_mixer.cpp b/core/mixer/audio/audio_mixer.cpp
index 806989d99c6ab0142e64124ec87556883f6d016a..b9e9b0b59224807723a9dd1671a9ab11ad72fe79 100644 (file)
--- a/core/mixer/audio/audio_mixer.cpp
+++ b/core/mixer/audio/audio_mixer.cpp
@@ -79,7 +79,7 @@ public:
                const auto in_size = static_cast<size_t>(audio_data.size());\r
                CASPAR_VERIFY(in_size == 0 || in_size == audio_data_.back().size());\r
 \r
-               if(in_size > audio_data_.size())\r
+               if(in_size > audio_data_.back().size())\r
                        return;\r
 \r
                tbb::parallel_for\r

diff --git a/shell/casparcg.config b/shell/casparcg.config
index f6f71249395751cb6220464f3c79fd5f79c860ec..cd3ddadb6ee80a0d1eb72aa09aa06e489402d4e1 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>C:\Lokala Filer\server\branches\2.0.0.2\bin\\_log\\</log-path>\r
-    <data-path>C:\Lokala Filer\server\branches\2.0.0.2\bin\\_data\\</data-path>\r
-    <template-path>C:\Lokala Filer\server\branches\2.0.0.2\bin\\_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
     <template-host>cg.fth.18</template-host>\r
   </paths>\r
   <diagnostics>\r