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

Removed some unneeded methods, due to the previous refactor involving shared_ptr objects. They no longer require some special overloads which "delete" the objects in the cache.

Browse Source
This commit is contained in:
Jonathan Thomas
2012-10-14 21:09:22 -05:00
parent 617088cebf
commit 48bef6b566
7 changed files with 15 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Main.cpp
View File

@@ -16,9 +16,6 @@ void FrameReady(int number)
int main()
{
shared_ptr<Frame> f(new Frame(1,2,2));
// Create timeline
Timeline t(640, 360, Framerate(24,1));
@@ -118,10 +115,10 @@ int main()
// openshot::FFmpegReader r("../../src/examples/test.mp4");
// openshot::FFmpegReader r("../../src/examples/test1.mp4");
openshot::FFmpegReader r("../../src/examples/piano.wav");
// openshot::FFmpegReader r("../../src/examples/piano.wav");
// openshot::FFmpegReader r("/home/jonathan/Videos/big-buck-bunny_trailer.webm");
// openshot::FFmpegReader r("/home/jonathan/Videos/sintel-1024-stereo.mp4");
openshot::FFmpegReader r("/home/jonathan/Videos/sintel-1024-stereo.mp4");
// openshot::FFmpegReader r("/home/jonathan/Videos/OpenShot_Now_In_3d.mp4");
// openshot::FFmpegReader r("/home/jonathan/Videos/sintel_trailer-720p.mp4");
// openshot::FFmpegReader r("/home/jonathan/Aptana Studio Workspace/OpenShotLibrary/src/examples/piano.wav");
@@ -140,7 +137,7 @@ int main()
//
// // Set options
// w.SetAudioOptions(true, "libvorbis", 44100, 2, 128000, false);
// //w.SetVideoOptions(true, "libvpx", Fraction(24, 1), 640, 360, Fraction(1,1), false, false, 2000000);
// w.SetVideoOptions(true, "libvpx", Fraction(24, 1), 640, 360, Fraction(1,1), false, false, 2000000);
//
// // Prepare Streams
// w.PrepareStreams();
@@ -170,10 +167,10 @@ int main()
// //Frame *f = r.GetFrame(1);
//
// //for (int frame = 131; frame >= 1; frame--)
// for (int frame = 1; frame <= 131; frame++)
// for (int frame = 1; frame <= 2000; frame++)
// {
// tr1::shared_ptr<Frame> f = r.GetFrame(frame);
// //f->AddOverlayNumber(0);
// f->AddOverlayNumber(0);
// //f->Display();
//
// // Write frame