merged with master

2019-03-25 12:43:23 +11:00
parent e2c5c87a0a a3c1342f77
commit 93c009c7fd
83 changed files with 7823 additions and 1469 deletions
@@ -153,8 +153,6 @@ bool PreviewGenerator::retrieve_preview(const QString& hash) {
    QString thumb_path = get_thumbnail_path(hash, ms);
    QFile f(thumb_path);
    if (f.exists() && ms.video_preview.load(thumb_path)) {
-      //dout << "loaded thumb" << ms->file_index << "from" << thumb_path;
-      ms.make_square_thumb();
      ms.preview_done = true;
    } else {
      found = false;
@@ -364,8 +362,6 @@ void PreviewGenerator::generate_waveform() {
                        &data,
                        linesize);

-              s->make_square_thumb();
-
              // is video interlaced?
              s->video_auto_interlacing = (temp_frame->interlaced_frame) ? ((temp_frame->top_field_first) ? VIDEO_TOP_FIELD_FIRST : VIDEO_BOTTOM_FIELD_FIRST) : VIDEO_PROGRESSIVE;
              s->video_interlacing = s->video_auto_interlacing;