openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Yet another huge refactor, to use shared_ptr objects instead of actual pointers, due to the difficulties in managing the lifecycle of pointers between the timeline, clip, and readers. Seems to work great, and solves all sorts of bugs. =)

Browse Source
This commit is contained in:
Jonathan Thomas
2012-10-14 03:43:52 -05:00
parent b647ff77c8
commit 617088cebf
19 changed files with 208 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ImageReader.cpp
View File

@@ -31,7 +31,7 @@ void ImageReader::Open() throw(InvalidFile)
}
// Create or get frame object
image_frame = new Frame(1, source->size().width(), source->size().height(), "#000000", 0, 2);
image_frame = tr1::shared_ptr<Frame>(new Frame(1, source->size().width(), source->size().height(), "#000000", 0, 2));
// Add Image data to frame
image_frame->AddImage(source);
@@ -74,7 +74,7 @@ void ImageReader::Close()
if (is_open)
{
// Deallocate frame
delete image_frame;
image_frame.reset();
// Mark as "closed"
is_open = false;
@@ -82,7 +82,7 @@ void ImageReader::Close()
}
// Get an openshot::Frame object for a specific frame number of this reader.
Frame* ImageReader::GetFrame(int requested_frame) throw(ReaderClosed)
tr1::shared_ptr<Frame> ImageReader::GetFrame(int requested_frame) throw(ReaderClosed)
{
// Check for open reader (or throw exception)
if (!is_open)