file/folder restructuring

project/footage.cpp

@@ -23,9 +23,9 @@
 #include <QDebug>
 #include <QtMath>
 #include <QPainter>
-#include "io/previewgenerator.h"
 
-#include "project/clip.h"
+#include "project/previewgenerator.h"
+#include "timeline/clip.h"
 
 Footage::Footage() {
   ready = (false);
@@ -38,56 +38,56 @@ Footage::Footage() {
   proxy = (false);
   start_number = 0;
 
-	ready_lock.lock();
+  ready_lock.lock();
 }
 
 Footage::~Footage() {
-	reset();
+  reset();
 }
 
 void Footage::reset() {
-	if (preview_gen != nullptr) {
-		preview_gen->cancel();
-	}
-	video_tracks.clear();
-	audio_tracks.clear();
-	ready = false;
+  if (preview_gen != nullptr) {
+    preview_gen->cancel();
+  }
+  video_tracks.clear();
+  audio_tracks.clear();
+  ready = false;
 }
 
 long Footage::get_length_in_frames(double frame_rate) {
   if (length >= 0) {
     return qFloor((double(length) / double(AV_TIME_BASE)) * frame_rate / speed);
   }
-	return 0;
+  return 0;
 }
 
 FootageStream* Footage::get_stream_from_file_index(bool video, int index) {
-	if (video) {
-		for (int i=0;i<video_tracks.size();i++) {
-			if (video_tracks.at(i).file_index == index) {
-				return &video_tracks[i];
-			}
-		}
-	} else {
-		for (int i=0;i<audio_tracks.size();i++) {
-			if (audio_tracks.at(i).file_index == index) {
-				return &audio_tracks[i];
-			}
-		}
-	}
-	return nullptr;
+  if (video) {
+    for (int i=0;i<video_tracks.size();i++) {
+      if (video_tracks.at(i).file_index == index) {
+        return &video_tracks[i];
+      }
+    }
+  } else {
+    for (int i=0;i<audio_tracks.size();i++) {
+      if (audio_tracks.at(i).file_index == index) {
+        return &audio_tracks[i];
+      }
+    }
+  }
+  return nullptr;
 }
 
 void FootageStream::make_square_thumb() {
-	// generate square version for QListView?
-	int square_size = qMax(video_preview.width(), video_preview.height());
-	QPixmap pixmap(square_size, square_size);
-	pixmap.fill(Qt::transparent);
-	QPainter p(&pixmap);
-	int diff = (video_preview.width() - video_preview.height())>>1;
-	int sqx = (diff < 0) ? -diff : 0;
-	int sqy = (diff > 0) ? diff : 0;
-	p.drawImage(sqx, sqy, video_preview);
-	p.end();
-	video_preview_square = QIcon(pixmap);
+  // generate square version for QListView?
+  int square_size = qMax(video_preview.width(), video_preview.height());
+  QPixmap pixmap(square_size, square_size);
+  pixmap.fill(Qt::transparent);
+  QPainter p(&pixmap);
+  int diff = (video_preview.width() - video_preview.height())>>1;
+  int sqx = (diff < 0) ? -diff : 0;
+  int sqy = (diff > 0) ? diff : 0;
+  p.drawImage(sqx, sqy, video_preview);
+  p.end();
+  video_preview_square = QIcon(pixmap);
 }