further work on timeline rewrite
This commit is contained in:
+16
-18
@@ -64,7 +64,6 @@ ClipPtr Clip::copy(Track* s) {
|
||||
copy->set_clip_in(clip_in());
|
||||
copy->set_timeline_in(timeline_in());
|
||||
copy->set_timeline_out(timeline_out());
|
||||
copy->set_track(track());
|
||||
copy->set_color(color());
|
||||
copy->set_media(media(), media_stream_index());
|
||||
copy->set_autoscaled(autoscaled());
|
||||
@@ -75,7 +74,7 @@ ClipPtr Clip::copy(Track* s) {
|
||||
copy->effects.append(effects.at(i)->copy(copy.get()));
|
||||
}
|
||||
|
||||
copy->set_cached_frame_rate((this->track_ == nullptr) ? cached_frame_rate() : this->track_->frame_rate);
|
||||
copy->set_cached_frame_rate((this->track_ == nullptr) ? cached_frame_rate() : this->track_->sequence()->frame_rate);
|
||||
|
||||
copy->refresh();
|
||||
|
||||
@@ -207,13 +206,13 @@ void Clip::reset_audio() {
|
||||
cacher.ResetAudio();
|
||||
}
|
||||
if (media() != nullptr && media()->get_type() == MEDIA_TYPE_SEQUENCE) {
|
||||
Sequence* nested_sequence = media()->to_sequence().get();
|
||||
for (int i=0;i<nested_sequence->clips.size();i++) {
|
||||
Clip* c = nested_sequence->clips.at(i).get();
|
||||
if (c != nullptr) {
|
||||
c->reset_audio();
|
||||
}
|
||||
|
||||
QVector<Clip*> nested_sequence_clips = media()->to_sequence()->GetAllClips();
|
||||
|
||||
for (int i=0;i<nested_sequence_clips.size();i++) {
|
||||
nested_sequence_clips.at(i)->reset_audio();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -266,7 +265,6 @@ void Clip::Save(QXmlStreamWriter &stream)
|
||||
stream.writeAttribute("clipin", QString::number(clip_in()));
|
||||
stream.writeAttribute("in", QString::number(timeline_in()));
|
||||
stream.writeAttribute("out", QString::number(timeline_out()));
|
||||
stream.writeAttribute("track", QString::number(track()));
|
||||
|
||||
stream.writeAttribute("r", QString::number(color().red()));
|
||||
stream.writeAttribute("g", QString::number(color().green()));
|
||||
@@ -277,9 +275,9 @@ void Clip::Save(QXmlStreamWriter &stream)
|
||||
stream.writeAttribute("maintainpitch", QString::number(speed().maintain_audio_pitch));
|
||||
stream.writeAttribute("reverse", QString::number(reversed()));
|
||||
|
||||
if (c->media() != nullptr) {
|
||||
if (media() != nullptr) {
|
||||
stream.writeAttribute("type", QString::number(media()->get_type()));
|
||||
switch (c->media()->get_type()) {
|
||||
switch (media()->get_type()) {
|
||||
case MEDIA_TYPE_FOOTAGE:
|
||||
stream.writeAttribute("media", QString::number(media()->to_footage()->save_id));
|
||||
stream.writeAttribute("stream", QString::number(media_stream_index()));
|
||||
@@ -302,7 +300,7 @@ void Clip::Save(QXmlStreamWriter &stream)
|
||||
stream.writeStartElement("linked"); // linked
|
||||
for (int k=0;k<linked.size();k++) {
|
||||
stream.writeStartElement("link"); // link
|
||||
stream.writeAttribute("id", QString::number(linked.at(k)));
|
||||
stream.writeAttribute("id", QString::number(linked.at(k)->load_id));
|
||||
stream.writeEndElement(); // link
|
||||
}
|
||||
stream.writeEndElement(); // linked
|
||||
@@ -457,13 +455,13 @@ double Clip::media_frame_rate() {
|
||||
double rate = media_->get_frame_rate(media_stream_index());
|
||||
if (!qIsNaN(rate)) return rate;
|
||||
}
|
||||
if (sequence != nullptr) return sequence->frame_rate;
|
||||
if (track() != nullptr) return track()->sequence()->frame_rate;
|
||||
return qSNaN();
|
||||
}
|
||||
|
||||
long Clip::media_length() {
|
||||
if (this->sequence != nullptr) {
|
||||
double fr = this->sequence->frame_rate;
|
||||
if (this->track() != nullptr) {
|
||||
double fr = this->track()->sequence()->frame_rate;
|
||||
|
||||
fr /= speed_.value;
|
||||
|
||||
@@ -474,7 +472,7 @@ long Clip::media_length() {
|
||||
case MEDIA_TYPE_FOOTAGE:
|
||||
{
|
||||
Footage* m = media_->to_footage();
|
||||
const FootageStream* ms = m->get_stream_from_file_index(track_ < 0, media_stream_index());
|
||||
const FootageStream* ms = m->get_stream_from_file_index(type() == Track::kTypeVideo, media_stream_index());
|
||||
if (ms != nullptr && ms->infinite_length) {
|
||||
return LONG_MAX;
|
||||
} else {
|
||||
@@ -493,13 +491,13 @@ long Clip::media_length() {
|
||||
}
|
||||
|
||||
int Clip::media_width() {
|
||||
if (media_ == nullptr && sequence != nullptr) return sequence->width;
|
||||
if (media_ == nullptr && track() != nullptr) return track()->sequence()->width;
|
||||
switch (media_->get_type()) {
|
||||
case MEDIA_TYPE_FOOTAGE:
|
||||
{
|
||||
const FootageStream* ms = media_stream();
|
||||
if (ms != nullptr) return ms->video_width;
|
||||
if (sequence != nullptr) return sequence->width;
|
||||
if (track() != nullptr) return track()->sequence()->width;
|
||||
break;
|
||||
}
|
||||
case MEDIA_TYPE_SEQUENCE:
|
||||
|
||||
+3
-2
@@ -3,17 +3,18 @@
|
||||
|
||||
#include "effects/transition.h"
|
||||
#include "timelinefunctions.h"
|
||||
#include "track.h"
|
||||
|
||||
struct Ghost {
|
||||
int clip;
|
||||
long in;
|
||||
long out;
|
||||
int track;
|
||||
Track* track;
|
||||
long clip_in;
|
||||
|
||||
long old_in;
|
||||
long old_out;
|
||||
int old_track;
|
||||
Track* old_track;
|
||||
long old_clip_in;
|
||||
|
||||
// importing variables
|
||||
|
||||
+265
-24
@@ -33,10 +33,10 @@ Sequence::Sequence() :
|
||||
wrapper_sequence(false)
|
||||
{
|
||||
// Set up tracks
|
||||
track_lists.resize(Track::kTypeCount);
|
||||
track_lists_.resize(Track::kTypeCount);
|
||||
|
||||
for (int i=0;i<track_lists.size();i++) {
|
||||
track_lists[i] = std::make_shared<TrackList>(this, i);
|
||||
for (int i=0;i<track_lists_.size();i++) {
|
||||
track_lists_[i] = new TrackList(this, static_cast<Track::Type>(i));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -50,8 +50,8 @@ SequencePtr Sequence::copy() {
|
||||
s->audio_layout = audio_layout;
|
||||
|
||||
// deep copy all of the sequence's clips
|
||||
for (int i=0;i<track_lists.size();i++) {
|
||||
s->track_lists[i] = track_lists.at(i).copy(s.get());
|
||||
for (int i=0;i<track_lists_.size();i++) {
|
||||
s->track_lists_[i] = track_lists_.at(i)->copy(s.get());
|
||||
}
|
||||
|
||||
// copy all of the sequence's markers
|
||||
@@ -62,6 +62,12 @@ SequencePtr Sequence::copy() {
|
||||
|
||||
void Sequence::Save(QXmlStreamWriter &stream)
|
||||
{
|
||||
// Provide unique IDs for each Clip
|
||||
QVector<Clip*> all_clips = GetAllClips();
|
||||
for (int i=0;i<all_clips.size();i++) {
|
||||
all_clips.at(i)->load_id = i;
|
||||
}
|
||||
|
||||
stream.writeStartElement("sequence");
|
||||
stream.writeAttribute("id", QString::number(save_id));
|
||||
stream.writeAttribute("name", name);
|
||||
@@ -80,22 +86,28 @@ void Sequence::Save(QXmlStreamWriter &stream)
|
||||
QVector<TransitionPtr> transition_save_cache;
|
||||
QVector<int> transition_clip_save_cache;
|
||||
|
||||
for (int j=0;j<tracks.size();j++) {
|
||||
tracks.at(j)->Save(stream);
|
||||
for (int j=0;j<track_lists_.size();j++) {
|
||||
track_lists_.at(j)->Save(stream);
|
||||
}
|
||||
|
||||
|
||||
for (int j=0;j<markers.size();j++) {
|
||||
markers.at(j).Save(stream);
|
||||
}
|
||||
|
||||
stream.writeEndElement();
|
||||
}
|
||||
|
||||
long Sequence::GetEndFrame() {
|
||||
long end_frame = 0;
|
||||
|
||||
for (int i=0;i<tracks.size();i++) {
|
||||
end_frame = qMax(tracks.at(i)->GetEndFrame(), end_frame);
|
||||
for (int j=0;j<track_lists_.size();j++) {
|
||||
|
||||
TrackList* track_list = track_lists_.at(j);
|
||||
|
||||
for (int i=0;i<track_list->TrackCount();i++) {
|
||||
end_frame = qMax(track_list->TrackAt(i)->GetEndFrame(), end_frame);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return end_frame;
|
||||
@@ -105,8 +117,14 @@ QVector<Clip *> Sequence::GetAllClips()
|
||||
{
|
||||
QVector<Clip*> all_clips;
|
||||
|
||||
for (int i=0;i<tracks.size();i++) {
|
||||
all_clips.append(tracks.at(i)->GetAllClips());
|
||||
for (int j=0;j<track_lists_.size();j++) {
|
||||
|
||||
TrackList* track_list = track_lists_.at(j);
|
||||
|
||||
for (int i=0;i<track_list->TrackCount();i++) {
|
||||
all_clips.append(track_list->TrackAt(i)->GetAllClips());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return all_clips;
|
||||
@@ -114,7 +132,7 @@ QVector<Clip *> Sequence::GetAllClips()
|
||||
|
||||
TrackList *Sequence::GetTrackList(Track::Type type)
|
||||
{
|
||||
return track_lists.at(type).get();
|
||||
return track_lists_.at(type);
|
||||
}
|
||||
|
||||
void Sequence::Close()
|
||||
@@ -143,20 +161,158 @@ void Sequence::RefreshClipsUsingMedia(Media *m) {
|
||||
|
||||
QVector<Clip *> Sequence::SelectedClips(bool containing)
|
||||
{
|
||||
QVector<Clip*> all_clips = GetAllClips();
|
||||
|
||||
QVector<Clip*> selected_clips;
|
||||
|
||||
for (int i=0;i<clips.size();i++) {
|
||||
Clip* c = clips.at(i).get();
|
||||
if (c != nullptr && IsClipSelected(c, containing)) {
|
||||
selected_clips.append(c);
|
||||
for (int i=0;i<track_lists_.size();i++) {
|
||||
TrackList* tl = track_lists_.at(i);
|
||||
|
||||
for (int j=0;j<tl->TrackCount();j++) {
|
||||
Track* t = tl->TrackAt(j);
|
||||
|
||||
selected_clips.append(t->GetAllClips());
|
||||
}
|
||||
}
|
||||
|
||||
return selected_clips;
|
||||
}
|
||||
|
||||
void Sequence::DeleteAreas(ComboAction* ca, QVector<Selection>& areas, bool deselect_areas)
|
||||
{
|
||||
clean_up_selections(areas);
|
||||
|
||||
panel_graph_editor->set_row(nullptr);
|
||||
panel_effect_controls->Clear(true);
|
||||
|
||||
QVector<int> pre_clips;
|
||||
QVector<ClipPtr> post_clips;
|
||||
|
||||
QVector<Clip*> all_clips = GetAllClips();
|
||||
|
||||
for (int i=0;i<areas.size();i++) {
|
||||
const Selection& s = areas.at(i);
|
||||
for (int j=0;j<all_clips.size();j++) {
|
||||
Clip* c = all_clips.at(j);
|
||||
if (c != nullptr && c->track() == s.track && !c->undeletable) {
|
||||
if (selection_contains_transition(s, c, kTransitionOpening)) {
|
||||
// delete opening transition
|
||||
ca->append(new DeleteTransitionCommand(c->opening_transition));
|
||||
} else if (selection_contains_transition(s, c, kTransitionClosing)) {
|
||||
// delete closing transition
|
||||
ca->append(new DeleteTransitionCommand(c->closing_transition));
|
||||
} else if (c->timeline_in() >= s.in && c->timeline_out() <= s.out) {
|
||||
// clips falls entirely within deletion area
|
||||
ca->append(new DeleteClipAction(c));
|
||||
} else if (c->timeline_in() < s.in && c->timeline_out() > s.out) {
|
||||
// middle of clip is within deletion area
|
||||
|
||||
// duplicate clip
|
||||
ClipPtr post = SplitClip(ca, true, c, s.in, s.out);
|
||||
|
||||
pre_clips.append(j);
|
||||
post_clips.append(post);
|
||||
} else if (c->timeline_in() < s.in && c->timeline_out() > s.in) {
|
||||
// only out point is in deletion area
|
||||
c->move(ca, c->timeline_in(), s.in, c->clip_in(), c->track());
|
||||
|
||||
if (c->closing_transition != nullptr) {
|
||||
if (s.in < c->timeline_out() - c->closing_transition->get_true_length()) {
|
||||
ca->append(new DeleteTransitionCommand(c->closing_transition));
|
||||
} else {
|
||||
ca->append(new ModifyTransitionCommand(c->closing_transition, c->closing_transition->get_true_length() - (c->timeline_out() - s.in)));
|
||||
}
|
||||
}
|
||||
} else if (c->timeline_in() < s.out && c->timeline_out() > s.out) {
|
||||
// only in point is in deletion area
|
||||
c->move(ca, s.out, c->timeline_out(), c->clip_in() + (s.out - c->timeline_in()), c->track());
|
||||
|
||||
if (c->opening_transition != nullptr) {
|
||||
if (s.out > c->timeline_in() + c->opening_transition->get_true_length()) {
|
||||
ca->append(new DeleteTransitionCommand(c->opening_transition));
|
||||
} else {
|
||||
ca->append(new ModifyTransitionCommand(c->opening_transition, c->opening_transition->get_true_length() - (s.out - c->timeline_in())));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// deselect selected clip areas
|
||||
if (deselect_areas) {
|
||||
QVector<Selection> area_copy = areas;
|
||||
for (int i=0;i<area_copy.size();i++) {
|
||||
const Selection& s = area_copy.at(i);
|
||||
deselect_area(s.in, s.out, s.track);
|
||||
}
|
||||
}
|
||||
|
||||
relink_clips_using_ids(pre_clips, post_clips);
|
||||
ca->append(new AddClipCommand(olive::ActiveSequence.get(), post_clips));
|
||||
}
|
||||
|
||||
bool Sequence::SplitAllClipsAtPoint(ComboAction *ca, long point)
|
||||
{
|
||||
bool split = false;
|
||||
|
||||
QVector<Clip*> all_clips = GetAllClips();
|
||||
|
||||
for (int j=0;j<all_clips.size();j++) {
|
||||
Clip* c = all_clips.at(j);
|
||||
|
||||
if (c->IsActiveAt(point)) {
|
||||
SplitClipAtPositions(ca, c, {point}, true);
|
||||
split = true;
|
||||
}
|
||||
}
|
||||
|
||||
return split;
|
||||
}
|
||||
|
||||
void Sequence::SplitClipAtPositions(ComboAction *ca, Clip* clip, QVector<long> positions, bool relink)
|
||||
{
|
||||
// Add the clip and each of its links to the pre_splits array
|
||||
|
||||
QVector<Clip*> pre_splits;
|
||||
pre_splits.append(clip);
|
||||
|
||||
if (relink) {
|
||||
for (int i=0;i<clip->linked.size();i++) {
|
||||
pre_splits.append(clip->linked.at(i));
|
||||
}
|
||||
}
|
||||
|
||||
std::sort(positions.begin(), positions.end());
|
||||
|
||||
// Remove any duplicate positions
|
||||
for (int i=1;i<positions.size();i++) {
|
||||
if (positions.at(i-1) == positions.at(i)) {
|
||||
positions.removeAt(i);
|
||||
i--;
|
||||
}
|
||||
}
|
||||
|
||||
QVector< QVector<ClipPtr> > post_splits(positions.size());
|
||||
|
||||
for (int i=positions.size()-1;i>=0;i--) {
|
||||
|
||||
post_splits[i].resize(pre_splits.size());
|
||||
|
||||
for (int j=0;j<pre_splits.size();j++) {
|
||||
post_splits[i][j] = SplitClip(ca, true, pre_splits.at(j), positions.at(i));
|
||||
|
||||
if (post_splits[i][j] != nullptr && i + 1 < positions.size()) {
|
||||
post_splits[i][j]->set_timeline_out(positions.at(i+1));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (int i=0;i<post_splits.size();i++) {
|
||||
olive::timeline::RelinkClips(pre_splits, post_splits[i]);
|
||||
ca->append(new AddClipCommand(olive::ActiveSequence.get(), post_splits[i]));
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
QVector<int> Sequence::SelectedClipIndexes()
|
||||
{
|
||||
QVector<int> selected_clips;
|
||||
@@ -170,15 +326,17 @@ QVector<int> Sequence::SelectedClipIndexes()
|
||||
|
||||
return selected_clips;
|
||||
}
|
||||
*/
|
||||
|
||||
Effect *Sequence::GetSelectedGizmo()
|
||||
{
|
||||
Effect* gizmo_ptr = nullptr;
|
||||
|
||||
QVector<Clip*> clips = GetAllClips();
|
||||
|
||||
for (int i=0;i<clips.size();i++) {
|
||||
Clip* c = clips.at(i).get();
|
||||
if (c != nullptr
|
||||
&& c->IsActiveAt(playhead)
|
||||
Clip* c = clips.at(i);
|
||||
if (c->IsActiveAt(playhead)
|
||||
&& IsClipSelected(c, true)) {
|
||||
// This clip is selected and currently active - we'll use this for gizmos
|
||||
|
||||
@@ -214,10 +372,93 @@ Effect *Sequence::GetSelectedGizmo()
|
||||
|
||||
void Sequence::ClearSelections()
|
||||
{
|
||||
for (int i=0;i<tracks.size();i++) {
|
||||
tracks.at(i)->ClearSelections();
|
||||
for (int j=0;j<track_lists_.size();j++) {
|
||||
TrackList* tl = track_lists_.at(j);
|
||||
|
||||
for (int i=0;i<tl->TrackCount();i++) {
|
||||
tl->TrackAt(i)->ClearSelections();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ClipPtr Sequence::SplitClip(ComboAction *ca, bool transitions, Clip* pre, long frame)
|
||||
{
|
||||
return SplitClip(ca, transitions, pre, frame, frame);
|
||||
}
|
||||
|
||||
ClipPtr Sequence::SplitClip(ComboAction *ca, bool transitions, Clip* pre, long frame, long post_in)
|
||||
{
|
||||
if (pre == nullptr) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
if (pre->timeline_in() < frame && pre->timeline_out() > frame) {
|
||||
// duplicate clip without duplicating its transitions, we'll restore them later
|
||||
|
||||
ClipPtr post = pre->copy(pre->track());
|
||||
|
||||
long new_clip_length = frame - pre->timeline_in();
|
||||
|
||||
post->set_timeline_in(post_in);
|
||||
post->set_clip_in(pre->clip_in() + (post->timeline_in() - pre->timeline_in()));
|
||||
|
||||
pre->move(ca, pre->timeline_in(), frame, pre->clip_in(), pre->track(), false);
|
||||
|
||||
if (transitions) {
|
||||
|
||||
// check if this clip has a closing transition
|
||||
if (pre->closing_transition != nullptr) {
|
||||
|
||||
// if so, move closing transition to the post clip
|
||||
post->closing_transition = pre->closing_transition;
|
||||
|
||||
// and set the original clip's closing transition to nothing
|
||||
ca->append(new SetPointer(reinterpret_cast<void**>(&pre->closing_transition), nullptr));
|
||||
|
||||
// and set the transition's reference to the post clip
|
||||
if (post->closing_transition->parent_clip == pre) {
|
||||
ca->append(new SetPointer(reinterpret_cast<void**>(&post->closing_transition->parent_clip), post.get()));
|
||||
}
|
||||
if (post->closing_transition->secondary_clip == pre) {
|
||||
ca->append(new SetPointer(reinterpret_cast<void**>(&post->closing_transition->secondary_clip), post.get()));
|
||||
}
|
||||
|
||||
// and make sure it's at the correct size to the closing clip
|
||||
if (post->closing_transition != nullptr && post->closing_transition->get_true_length() > post->length()) {
|
||||
ca->append(new ModifyTransitionCommand(post->closing_transition, post->length()));
|
||||
post->closing_transition->set_length(post->length());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// we're keeping the opening clip, so ensure that's a correct size too
|
||||
if (pre->opening_transition != nullptr && pre->opening_transition->get_true_length() > new_clip_length) {
|
||||
ca->append(new ModifyTransitionCommand(pre->opening_transition, new_clip_length));
|
||||
}
|
||||
}
|
||||
|
||||
return post;
|
||||
|
||||
} else if (frame == pre->timeline_in()
|
||||
&& pre->opening_transition != nullptr
|
||||
&& pre->opening_transition->secondary_clip != nullptr) {
|
||||
// special case for shared transitions to split it into two
|
||||
|
||||
// set transition to single-clip mode
|
||||
ca->append(new SetPointer(reinterpret_cast<void**>(&pre->opening_transition->secondary_clip), nullptr));
|
||||
|
||||
// clone transition for other clip
|
||||
ca->append(new AddTransitionCommand(nullptr,
|
||||
pre->opening_transition->secondary_clip,
|
||||
pre->opening_transition,
|
||||
nullptr,
|
||||
0)
|
||||
);
|
||||
|
||||
}
|
||||
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
// static variable for the currently active sequence
|
||||
SequencePtr olive::ActiveSequence = nullptr;
|
||||
|
||||
+10
-2
@@ -63,7 +63,12 @@ public:
|
||||
|
||||
void RefreshClipsUsingMedia(Media* m = nullptr);
|
||||
QVector<Clip*> SelectedClips(bool containing = true);
|
||||
QVector<int> SelectedClipIndexes();
|
||||
//QVector<int> SelectedClipIndexes();
|
||||
|
||||
void DeleteAreas();
|
||||
|
||||
bool SplitAllClipsAtPoint(ComboAction *ca, long point);
|
||||
void SplitClipAtPositions(ComboAction* ca, Clip *clip, QVector<long> positions, bool relink = true);
|
||||
|
||||
Effect* GetSelectedGizmo();
|
||||
|
||||
@@ -84,7 +89,10 @@ public:
|
||||
|
||||
QVector<Marker> markers;
|
||||
private:
|
||||
QVector<TrackList*> track_lists;
|
||||
QVector<TrackList*> track_lists_;
|
||||
|
||||
ClipPtr SplitClip(ComboAction* ca, bool transitions, Clip *clip, long frame);
|
||||
ClipPtr SplitClip(ComboAction* ca, bool transitions, Clip *clip, long frame, long post_in);
|
||||
};
|
||||
|
||||
using SequencePtr = std::shared_ptr<Sequence>;
|
||||
|
||||
@@ -1,6 +1,30 @@
|
||||
#include "timelinefunctions.h"
|
||||
|
||||
TimelineFunctions::TimelineFunctions()
|
||||
{
|
||||
|
||||
|
||||
void olive::timeline::RelinkClips(QVector<Clip *> &pre_clips, QVector<ClipPtr> &post_clips)
|
||||
{
|
||||
// Loop through each "pre" clip
|
||||
for (int i=0;i<pre_clips.size();i++) {
|
||||
|
||||
Clip* pre = pre_clips.at(i);
|
||||
|
||||
// Loop through each "pre" clip's linked array
|
||||
for (int j=0;j<pre->linked.size();j++) {
|
||||
|
||||
// Loop again through the "pre" clips to determine which are linked to each other
|
||||
for (int l=0;l<pre_clips.size();l++) {
|
||||
|
||||
// If this "pre" is linked to this "pre"
|
||||
if (pre->linked.at(j) == pre_clips.at(l)) {
|
||||
|
||||
// Check if we have an equivalent in the post_clips, and link it if so
|
||||
if (post_clips.at(l) != nullptr) {
|
||||
post_clips.at(i)->linked.append(post_clips.at(l).get());
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
#ifndef TIMELINEFUNCTIONS_H
|
||||
#define TIMELINEFUNCTIONS_H
|
||||
|
||||
#include <QVector>
|
||||
|
||||
#include "timeline/clip.h"
|
||||
|
||||
namespace olive {
|
||||
namespace timeline {
|
||||
|
||||
@@ -25,13 +29,9 @@ enum Alignment {
|
||||
kAlignmentSingle
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
void RelinkClips(QVector<Clip*>& pre_clips, QVector<ClipPtr> &post_clips);
|
||||
|
||||
class TimelineFunctions
|
||||
{
|
||||
public:
|
||||
TimelineFunctions();
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
#endif // TIMELINEFUNCTIONS_H
|
||||
|
||||
+90
-8
@@ -1,6 +1,8 @@
|
||||
#include "track.h"
|
||||
|
||||
#include "timeline/clip.h"
|
||||
#include "timeline/tracklist.h"
|
||||
#include "timeline/sequence.h"
|
||||
|
||||
int olive::timeline::kTrackDefaultHeight = 40;
|
||||
int olive::timeline::kTrackMinHeight = 30;
|
||||
@@ -30,20 +32,29 @@ Track *Track::copy(TrackList *parent)
|
||||
return t;
|
||||
}
|
||||
|
||||
Sequence *Track::sequence()
|
||||
{
|
||||
return parent_->GetParent();
|
||||
}
|
||||
|
||||
TrackList *Track::track_list()
|
||||
{
|
||||
return parent_;
|
||||
}
|
||||
|
||||
void Track::Save(QXmlStreamWriter &stream)
|
||||
{
|
||||
stream.writeStartElement("track");
|
||||
|
||||
for (int j=0;j<clips_.size();j++) {
|
||||
Clip* c = clips_.at(j).get();
|
||||
if (c != nullptr) {
|
||||
stream.writeStartElement("clip");
|
||||
stream.writeAttribute("id", QString::number(j));
|
||||
|
||||
c->Save(stream);
|
||||
stream.writeStartElement("clip");
|
||||
stream.writeAttribute("id", QString::number(c->load_id));
|
||||
|
||||
stream.writeEndElement(); // clip
|
||||
}
|
||||
c->Save(stream);
|
||||
|
||||
stream.writeEndElement(); // clip
|
||||
}
|
||||
|
||||
stream.writeEndElement(); // track
|
||||
@@ -93,9 +104,49 @@ void Track::ResizeClipArray(int new_size)
|
||||
clips_.resize(new_size);
|
||||
}
|
||||
|
||||
QVector<ClipPtr> Track::GetAllClips()
|
||||
QVector<Clip*> Track::GetAllClips()
|
||||
{
|
||||
return clips_;
|
||||
QVector<Clip*> clips;
|
||||
|
||||
clips.resize(clips_.size());
|
||||
for (int i=0;i<clips_.size();i++) {
|
||||
clips[i] = clips_.at(i).get();
|
||||
}
|
||||
|
||||
return clips;
|
||||
}
|
||||
|
||||
QVector<Clip *> Track::GetSelectedClips(bool containing)
|
||||
{
|
||||
QVector<Clip*> selected_clips;
|
||||
|
||||
for (int i=0;i<clips_.size();i++) {
|
||||
|
||||
Clip* c = clips_.at(i).get();
|
||||
|
||||
if (IsClipSelected(c, containing)) {
|
||||
selected_clips.append(c);
|
||||
}
|
||||
}
|
||||
|
||||
return selected_clips;
|
||||
}
|
||||
|
||||
ClipPtr Track::GetClipObjectFromRawPtr(Clip *c)
|
||||
{
|
||||
for (int i=0;i<clips_.size();i++) {
|
||||
if (clips_.at(i).get() == c) {
|
||||
return clips_.at(i);
|
||||
}
|
||||
}
|
||||
|
||||
// Assert here since we shouldn't be calling this function ever
|
||||
Q_ASSERT(false);
|
||||
}
|
||||
|
||||
int Track::Index()
|
||||
{
|
||||
return parent_->IndexOfTrack(this);
|
||||
}
|
||||
|
||||
bool Track::IsClipSelected(int clip_index, bool containing)
|
||||
@@ -157,6 +208,37 @@ bool Track::IsTransitionSelected(Transition *t)
|
||||
return false;
|
||||
}
|
||||
|
||||
void Track::TidySelections()
|
||||
{
|
||||
for (int i=0;i<areas.size();i++) {
|
||||
Selection& s = areas[i];
|
||||
for (int j=0;j<areas.size();j++) {
|
||||
if (i != j) {
|
||||
Selection& ss = areas[j];
|
||||
if (s.track == ss.track) {
|
||||
bool remove = false;
|
||||
if (s.in < ss.in && s.out > ss.out) {
|
||||
// do nothing
|
||||
} else if (s.in >= ss.in && s.out <= ss.out) {
|
||||
remove = true;
|
||||
} else if (s.in <= ss.out && s.out > ss.out) {
|
||||
ss.out = s.out;
|
||||
remove = true;
|
||||
} else if (s.out >= ss.in && s.in < ss.in) {
|
||||
ss.in = s.in;
|
||||
remove = true;
|
||||
}
|
||||
if (remove) {
|
||||
areas.removeAt(i);
|
||||
i--;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void Track::ClearSelections()
|
||||
{
|
||||
selections_.clear();
|
||||
|
||||
+9
-2
@@ -43,6 +43,9 @@ public:
|
||||
Track(TrackList* parent, Type type);
|
||||
Track* copy(TrackList* parent);
|
||||
|
||||
Sequence* sequence();
|
||||
TrackList* track_list();
|
||||
|
||||
void Save(QXmlStreamWriter& stream);
|
||||
|
||||
Type type();
|
||||
@@ -55,13 +58,17 @@ public:
|
||||
ClipPtr GetClip(int i);
|
||||
void RemoveClip(int i);
|
||||
void RemoveClip(Clip* c);
|
||||
QVector<ClipPtr> GetAllClips();
|
||||
QVector<Clip*> GetSelectedClips();
|
||||
QVector<Clip*> GetAllClips();
|
||||
QVector<Clip*> GetSelectedClips(bool containing);
|
||||
ClipPtr GetClipObjectFromRawPtr(Clip* c);
|
||||
|
||||
int Index();
|
||||
|
||||
bool IsClipSelected(int clip_index, bool containing = true);
|
||||
bool IsClipSelected(Clip* clip, bool containing = true);
|
||||
bool IsTransitionSelected(Transition* t);
|
||||
|
||||
void TidySelections();
|
||||
void ClearSelections();
|
||||
|
||||
long GetEndFrame();
|
||||
|
||||
+39
-6
@@ -1,5 +1,7 @@
|
||||
#include "tracklist.h"
|
||||
|
||||
#include "timeline/sequence.h"
|
||||
|
||||
TrackList::TrackList(Sequence *parent, Track::Type type) :
|
||||
QObject(parent),
|
||||
type_(type)
|
||||
@@ -8,13 +10,24 @@ TrackList::TrackList(Sequence *parent, Track::Type type) :
|
||||
AddTrack();
|
||||
}
|
||||
|
||||
TrackListPtr TrackList::copy(Sequence *parent)
|
||||
void TrackList::Save(QXmlStreamWriter &stream)
|
||||
{
|
||||
TrackListPtr t = std::make_shared<TrackList>(parent, type_);
|
||||
stream.writeStartElement("Tracks");
|
||||
|
||||
for (int i=0;i<tracks_.size();i++) {
|
||||
tracks_.at(i)->Save(stream);
|
||||
}
|
||||
|
||||
stream.writeEndElement(); // Tracks
|
||||
}
|
||||
|
||||
TrackList* TrackList::copy(Sequence *parent)
|
||||
{
|
||||
TrackList* t = new TrackList(parent, type_);
|
||||
|
||||
t->ResizeTrackArray(tracks_.size());
|
||||
for (int i=0;i<tracks_.size();i++) {
|
||||
t->tracks_[i] = tracks_.at(i)->copy(t.get());
|
||||
t->tracks_[i] = tracks_.at(i)->copy(t);
|
||||
}
|
||||
|
||||
return t;
|
||||
@@ -22,7 +35,7 @@ TrackListPtr TrackList::copy(Sequence *parent)
|
||||
|
||||
void TrackList::AddTrack()
|
||||
{
|
||||
TrackPtr track = std::make_shared<Track>(this, type_);
|
||||
Track* track = new Track(this, type_);
|
||||
tracks_.append(track);
|
||||
}
|
||||
|
||||
@@ -36,7 +49,7 @@ void TrackList::RemoveTrack(int i)
|
||||
|
||||
Track *TrackList::First()
|
||||
{
|
||||
return tracks_.first().get();
|
||||
return tracks_.first();
|
||||
}
|
||||
|
||||
int TrackList::TrackCount()
|
||||
@@ -44,7 +57,27 @@ int TrackList::TrackCount()
|
||||
return tracks_.size();
|
||||
}
|
||||
|
||||
QVector<TrackPtr> TrackList::tracks()
|
||||
int TrackList::IndexOfTrack(Track *track)
|
||||
{
|
||||
for (int i=0;i<tracks_.size();i++) {
|
||||
if (tracks_.at(i) == track) {
|
||||
return i;
|
||||
}
|
||||
}
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
Track *TrackList::TrackAt(int i)
|
||||
{
|
||||
while (i >= tracks_.size()) {
|
||||
AddTrack();
|
||||
}
|
||||
|
||||
return tracks_.at(i);
|
||||
}
|
||||
|
||||
QVector<Track*> TrackList::tracks()
|
||||
{
|
||||
return tracks_;
|
||||
}
|
||||
|
||||
@@ -10,10 +10,14 @@ public:
|
||||
TrackList(Sequence* parent, Track::Type type);
|
||||
TrackList* copy(Sequence* parent);
|
||||
|
||||
void Save(QXmlStreamWriter& stream);
|
||||
|
||||
void AddTrack();
|
||||
void RemoveTrack(int i);
|
||||
Track* First();
|
||||
int TrackCount();
|
||||
int IndexOfTrack(Track* track);
|
||||
Track* TrackAt(int i);
|
||||
QVector<Track*> tracks();
|
||||
|
||||
Sequence* GetParent();
|
||||
|
||||
Reference in New Issue
Block a user