From 644b14707a303aaa0c0ae40376ae4bb2e541cc3d Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 15 Mar 2019 13:01:58 +1100
Subject: [PATCH] replaced sequence::isclipselected with clip::isselected

---
 panels/effectcontrols.cpp |  2 +-
 panels/timeline.cpp       | 12 ++++++------
 ui/timelinewidget.cpp     |  8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/panels/effectcontrols.cpp b/panels/effectcontrols.cpp
index 98fd01e11..5132fe333 100644
--- a/panels/effectcontrols.cpp
+++ b/panels/effectcontrols.cpp
@@ -628,7 +628,7 @@ void EffectControls::Load() {
     QVector<Effect*> effects_to_open;
 
     // Determine based on the current selections whether to load all effects or just the transitions
-    bool whole_clip_is_selected = c->sequence->IsClipSelected(c, true);
+    bool whole_clip_is_selected = c->IsSelected();
 
     if (whole_clip_is_selected) {
       for (int j=0;j<c->effects.size();j++) {
diff --git a/panels/timeline.cpp b/panels/timeline.cpp
index 9a3732db1..f10941a4e 100644
--- a/panels/timeline.cpp
+++ b/panels/timeline.cpp
@@ -371,7 +371,7 @@ void Timeline::add_transition() {
 
   for (int i=0;i<olive::ActiveSequence->clips.size();i++) {
     Clip* c = olive::ActiveSequence->clips.at(i).get();
-    if (c != nullptr && olive::ActiveSequence->IsClipSelected(c, true)) {
+    if (c != nullptr && c->IsSelected()) {
       int transition_to_add = (c->track() < 0) ? TRANSITION_INTERNAL_CROSSDISSOLVE : TRANSITION_INTERNAL_LINEARFADE;
       if (c->opening_transition == nullptr) {
         ca->append(new AddTransitionCommand(c,
@@ -944,14 +944,14 @@ bool Timeline::split_clip_and_relink(ComboAction *ca, int clip, long frame, bool
       if (relink) {
         pre_clips.append(clip);
 
-        bool original_clip_is_selected = olive::ActiveSequence->IsClipSelected(c, true);
+        bool original_clip_is_selected = c->IsSelected();
 
         // find linked clips of old clip
         for (int i=0;i<c->linked.size();i++) {
           int l = c->linked.at(i);
           if (!split_cache.contains(l)) {
             Clip* link = olive::ActiveSequence->clips.at(l).get();
-            if ((original_clip_is_selected && olive::ActiveSequence->IsClipSelected(link, true)) || !original_clip_is_selected) {
+            if ((original_clip_is_selected && link->IsSelected()) || !original_clip_is_selected) {
               split_cache.append(l);
               ClipPtr s = split_clip(ca, true, l, frame);
               if (s != nullptr) {
@@ -1487,7 +1487,7 @@ void Timeline::split_at_playhead() {
     QVector<ClipPtr> post_clips;
     for (int j=0;j<olive::ActiveSequence->clips.size();j++) {
       Clip* clip = olive::ActiveSequence->clips.at(j).get();
-      if (clip != nullptr && olive::ActiveSequence->IsClipSelected(clip, true)) {
+      if (clip != nullptr && clip->IsSelected()) {
         ClipPtr s = split_clip(ca, true, j, olive::ActiveSequence->playhead);
         if (s != nullptr) {
           pre_clips.append(j);
@@ -1630,7 +1630,7 @@ void Timeline::set_marker() {
   for (int i=0;i<olive::ActiveSequence->clips.size();i++) {
     Clip* c = olive::ActiveSequence->clips.at(i).get();
     if (c != nullptr
-        && olive::ActiveSequence->IsClipSelected(c, true)) {
+        && c->IsSelected()) {
 
       // only add markers if the playhead is inside the clip
       if (olive::ActiveSequence->playhead >= c->timeline_in()
@@ -1684,7 +1684,7 @@ void Timeline::toggle_links() {
   command->s = olive::ActiveSequence.get();
   for (int i=0;i<olive::ActiveSequence->clips.size();i++) {
     Clip* c = olive::ActiveSequence->clips.at(i).get();
-    if (c != nullptr && olive::ActiveSequence->IsClipSelected(c, true)) {
+    if (c != nullptr && c->IsSelected()) {
       if (!command->clips.contains(i)) command->clips.append(i);
 
       if (c->linked.size() > 0) {
diff --git a/ui/timelinewidget.cpp b/ui/timelinewidget.cpp
index 01252a49f..0db9e46d0 100644
--- a/ui/timelinewidget.cpp
+++ b/ui/timelinewidget.cpp
@@ -656,7 +656,7 @@ void TimelineWidget::mousePressEvent(QMouseEvent *event) {
           if (hovered_clip >= 0) {
             Clip* clip = olive::ActiveSequence->clips.at(hovered_clip).get();
 
-            if (olive::ActiveSequence->IsClipSelected(clip, true)) {
+            if (clip->IsSelected()) {
 
               if (shift) {
 
@@ -759,7 +759,7 @@ void TimelineWidget::mousePressEvent(QMouseEvent *event) {
                   Clip* link = olive::ActiveSequence->clips.at(clip->linked.at(i)).get();
 
                   // check if the clip is already selected
-                  if (!olive::ActiveSequence->IsClipSelected(link, true)) {
+                  if (!link->IsSelected()) {
                     Selection ss;
                     ss.in = link->timeline_in();
                     ss.out = link->timeline_out();
@@ -2065,7 +2065,7 @@ void TimelineWidget::mouseMoveEvent(QMouseEvent *event) {
 
           Clip* c = olive::ActiveSequence->clips.at(j).get();
 
-          if (c != nullptr && olive::ActiveSequence->IsClipSelected(c, false)) {
+          if (c != nullptr && c->IsSelected(false)) {
 
             // loop through linked clips
             for (int k=0;k<c->linked.size();k++) {
@@ -2195,7 +2195,7 @@ void TimelineWidget::mouseMoveEvent(QMouseEvent *event) {
 
             // if a transition isn't selected, check if the whole clip is
             if (!add) {
-              add = olive::ActiveSequence->IsClipSelected(c, true);
+              add = c->IsSelected();
             }
 
             if (add) {