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

The timeline classes are finally working correctly, and have the following features:

Browse Source 
1) Layers (unlimited # of layers)
2) IN, OUT, and Position (time)
3) X, Y offset
4) Alpha
5) Rotation
6) Transparency + compositing + overlays
This commit is contained in:
Jonathan Thomas
2012-11-08 04:35:21 -06:00
parent 42d7565ba1
commit 5b77abdf27
8 changed files with 82 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Clip.cpp
View File

@@ -23,7 +23,7 @@ void Clip::init_settings()
location_y = Keyframe(0.0);
// Init alpha & rotation
alpha = Keyframe(100.0);
alpha = Keyframe(0.0);
rotation = Keyframe(0.0);
// Init time & volume
@@ -143,7 +143,8 @@ void Clip::Open() throw(InvalidFile)
file_reader->Open();
// Set some clip properties from the file reader
End(file_reader->info.duration);
if (end == 0)
End(file_reader->info.duration);
}
}
@@ -157,15 +158,17 @@ void Clip::Close()
// Get end position of clip (trim end of video), which can be affected by the time curve.
float Clip::End()
{
// Determine the FPS fo this clip
float fps = 24.0;
if (file_reader)
// file reader
fps = file_reader->info.fps.ToFloat();
// if a time curve is present, use it's length
if (time.Points.size() > 1)
{
// Determine the FPS fo this clip
float fps = 24.0;
if (file_reader)
// file reader
fps = file_reader->info.fps.ToFloat();
return float(time.GetLength()) / fps;
}
else
// just use the duration (as detected by the reader)
return end;
@@ -233,7 +236,6 @@ void Clip::reverse_buffer(juce::AudioSampleBuffer* buffer)
// Adjust the audio and image of a time mapped frame
tr1::shared_ptr<Frame> Clip::get_time_mapped_frame(tr1::shared_ptr<Frame> frame, int frame_number)
{
cout << "TIME MAPPER: " << frame_number << endl;
tr1::shared_ptr<Frame> new_frame;
// Check for a valid time map curve