slight code enhancement
This commit is contained in:
@@ -602,20 +602,7 @@ void EffectControls::SetClips()
|
||||
Clear(true);
|
||||
|
||||
// replace clip vector
|
||||
selected_clips_ = olive::ActiveSequence->SelectedClips();
|
||||
|
||||
if (selected_clips_.isEmpty()) {
|
||||
// If no clips are selected, there may be transitions that are
|
||||
for (int i=0;i<olive::ActiveSequence->clips.size();i++) {
|
||||
Clip* c = olive::ActiveSequence->clips.at(i).get();
|
||||
if (c != nullptr) {
|
||||
if (olive::ActiveSequence->IsTransitionSelected(c->opening_transition.get())
|
||||
|| olive::ActiveSequence->IsTransitionSelected(c->closing_transition.get())) {
|
||||
selected_clips_.append(c);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
selected_clips_ = olive::ActiveSequence->SelectedClips(false);
|
||||
|
||||
Load();
|
||||
}
|
||||
|
||||
@@ -87,13 +87,13 @@ void Sequence::RefreshClips(Media *m) {
|
||||
}
|
||||
}
|
||||
|
||||
QVector<Clip *> Sequence::SelectedClips()
|
||||
QVector<Clip *> Sequence::SelectedClips(bool containing)
|
||||
{
|
||||
QVector<Clip*> selected_clips;
|
||||
|
||||
for (int i=0;i<clips.size();i++) {
|
||||
Clip* c = clips.at(i).get();
|
||||
if (c != nullptr && IsClipSelected(c, true)) {
|
||||
if (c != nullptr && IsClipSelected(c, containing)) {
|
||||
selected_clips.append(c);
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -43,7 +43,7 @@ public:
|
||||
int audio_layout;
|
||||
|
||||
void RefreshClips(Media* m = nullptr);
|
||||
QVector<Clip*> SelectedClips();
|
||||
QVector<Clip*> SelectedClips(bool containing = true);
|
||||
QVector<int> SelectedClipIndexes();
|
||||
|
||||
Effect* GetSelectedGizmo();
|
||||
|
||||
Reference in New Issue
Block a user