OpenShot · jonoomph · Oct 27, 2020 · Aug 26, 2020 · Aug 26, 2020 · Aug 27, 2020
diff --git a/bindings/python/openshot.i b/bindings/python/openshot.i
@@ -92,6 +92,7 @@
 #include "KeyFrame.h"
 #include "RendererBase.h"
 #include "Settings.h"
+#include "TimelineBase.h"
 #include "Timeline.h"
 #include "ZmqLogger.h"
 #include "AudioDeviceInfo.h"
@@ -203,6 +204,7 @@
 %include "KeyFrame.h"
 %include "RendererBase.h"
 %include "Settings.h"
+%include "TimelineBase.h"
 %include "Timeline.h"
 %include "ZmqLogger.h"
 %include "AudioDeviceInfo.h"

diff --git a/bindings/ruby/openshot.i b/bindings/ruby/openshot.i
@@ -100,6 +100,7 @@
 #include "KeyFrame.h"
 #include "RendererBase.h"
 #include "Settings.h"
+#include "TimelineBase.h"
 #include "Timeline.h"
 #include "ZmqLogger.h"
 #include "AudioDeviceInfo.h"
@@ -189,6 +190,7 @@
 %include "KeyFrame.h"
 %include "RendererBase.h"
 %include "Settings.h"
+%include "TimelineBase.h"
 %include "Timeline.h"
 %include "ZmqLogger.h"
 %include "AudioDeviceInfo.h"

diff --git a/examples/back.png b/examples/back.png
diff --git a/examples/final-composite.png b/examples/final-composite.png
diff --git a/examples/front.png b/examples/front.png
diff --git a/examples/front3.png b/examples/front3.png
diff --git a/examples/interlaced.png b/examples/interlaced.png
diff --git a/examples/mask.png b/examples/mask.png
diff --git a/examples/mask2.png b/examples/mask2.png
diff --git a/examples/output-final.png b/examples/output-final.png
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -96,6 +96,7 @@ set(OPENSHOT_SOURCES
   QtPlayer.cpp
   QtTextReader.cpp
   Settings.cpp
+  TimelineBase.cpp
   Timeline.cpp)
 
 # Video effects

diff --git a/src/CacheDisk.cpp b/src/CacheDisk.cpp
@@ -235,7 +235,7 @@ std::shared_ptr<Frame> CacheDisk::GetFrame(int64_t frame_number)
 			image->load(frame_path);
 
 			// Set pixel formatimage->
-			image = std::make_shared<QImage>(image->convertToFormat(QImage::Format_RGBA8888));
+			image = std::make_shared<QImage>(image->convertToFormat(QImage::Format_RGBA8888_Premultiplied));
 
 			// Create frame object
 			auto frame = std::make_shared<Frame>();

diff --git a/src/ChunkReader.cpp b/src/ChunkReader.cpp
@@ -224,15 +224,13 @@ std::shared_ptr<Frame> ChunkReader::GetFrame(int64_t requested_frame)
 		// Close existing reader (if needed)
 		if (local_reader)
 		{
-			std::cout << "Close READER" << std::endl;
 			// Close and delete old reader
 			local_reader->Close();
 			delete local_reader;
 		}
 
 		try
 		{
-			std::cout << "Load READER: " << chunk_video_path << std::endl;
 			// Load new FFmpegReader
 			local_reader = new FFmpegReader(chunk_video_path);
 			local_reader->Open(); // open reader

diff --git a/src/ChunkWriter.cpp b/src/ChunkWriter.cpp
@@ -159,10 +159,6 @@ void ChunkWriter::WriteFrame(std::shared_ptr<Frame> frame)
 	// Write the frames once it reaches the correct chunk size
 	if (frame_count % chunk_size == 0 && frame_count >= chunk_size)
 	{
-		std::cout << "Done with chunk" << std::endl;
-		std::cout << "frame_count: " << frame_count << std::endl;
-		std::cout << "chunk_size: " << chunk_size << std::endl;
-
 		// Pad an additional 12 frames
 		for (int z = 0; z<12; z++)
 		{
@@ -231,10 +227,6 @@ void ChunkWriter::Close()
 	// Write the frames once it reaches the correct chunk size
 	if (is_writing)
 	{
-		std::cout << "Final chunk" << std::endl;
-		std::cout << "frame_count: " << frame_count << std::endl;
-		std::cout << "chunk_size: " << chunk_size << std::endl;
-
 		// Pad an additional 12 frames
 		for (int z = 0; z<12; z++)
 		{