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

Fixed bug in clip and effect sorting by multiple attributes. They are now sorted by Position(), and then Layer(), and then Order().

Browse Source
This commit is contained in:
Jonathan Thomas
2013-10-06 16:55:38 -05:00
parent 555efc413e
commit ffe3be756e
2 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/Timeline.h
View File

@@ -58,13 +58,18 @@ namespace openshot {
/// Comparison method for sorting clip pointers (by Position and Layer)
struct CompareClips{
bool operator()( Clip* lhs, Clip* rhs){
return lhs->Position() < rhs->Position() && lhs->Layer() < rhs->Layer();
if( lhs->Position() < rhs->Position() ) return true;
if( lhs->Position() == rhs->Position() ) return lhs->Layer() < rhs->Layer();
return false;
}};
/// Comparison method for sorting effect pointers (by Position, Layer, and Order)
struct CompareEffects{
bool operator()( EffectBase* lhs, EffectBase* rhs){
return lhs->Position() < rhs->Position() && lhs->Layer() < rhs->Layer() && lhs->Order() < rhs->Order();
if( lhs->Position() < rhs->Position() ) return true;
if( lhs->Position() == rhs->Position() ) return lhs->Layer() < rhs->Layer();
if( lhs->Position() == rhs->Position() && lhs->Layer() == rhs->Layer() ) return lhs->Order() < rhs->Order();
return false;
}};
/**

46
src/Main.cpp
View File

@@ -46,28 +46,42 @@ using namespace tr1;
int main(int argc, char* argv[])
{
// Create a empty clip
Clip c1a;
//c1a.Open();
// // Check basic settings
// CHECK_EQUAL(ANCHOR_CANVAS, c1a.anchor);
// CHECK_EQUAL(GRAVITY_CENTER, c1a.gravity);
// CHECK_EQUAL(SCALE_FIT, c1a.scale);
// CHECK_EQUAL(0, c1a.Layer());
// CHECK_CLOSE(0.0f, c1a.Position(), 0.00001);
// CHECK_CLOSE(0.0f, c1a.Start(), 0.00001);
// CHECK_CLOSE(0.0f, c1a.End(), 0.00001);
Timeline t1(720, 480, Framerate(24,1), 44100, 2);
DummyReader dr1(Framerate(24,1),720,480, 41000, 2, 10.0);
// Change some properties
Clip c1a(&dr1);
c1a.Layer(1);
c1a.Position(5.0);
c1a.Start(3.5);
c1a.Start(5);
c1a.End(10.5);
t1.AddClip(&c1a);
cout << c1a.Layer() << endl;
cout << c1a.Position() << endl;
cout << c1a.Start() << endl;
cout << c1a.End() << endl;
Clip c2a(&dr1);
c2a.Layer(1);
c2a.Position(5.0);
c2a.Start(1);
c2a.End(10.5);
t1.AddClip(&c2a);
Clip c3a(&dr1);
c3a.Layer(1);
c3a.Position(5.0);
c3a.Start(3);
c3a.End(10.5);
t1.AddClip(&c3a);
list<Clip*>::iterator clip_itr;
list<Clip*> myClips = t1.Clips();
for (clip_itr=myClips.begin(); clip_itr != myClips.end(); ++clip_itr)
{
// Get clip object from the iterator
Clip *clip = (*clip_itr);
// Open or Close this clip, based on if it's intersecting or not
cout << clip->Start() << endl;
}
return 0;