Merge branch 'master' into imagesource_icon

2018-11-14 21:38:09 +11:00
parent cf7fdb3b3b 1c3fc815e3
commit 7caad47078
3 changed files with 18 additions and 2 deletions
@@ -185,7 +185,14 @@ void PreviewGenerator::finalize_media() {
        double frame_rate = 30;
        if (!contains_still_image && media->video_tracks.size() > 0) frame_rate = media->video_tracks.at(0)->video_frame_rate;
        item->setText(1, frame_to_timecode(media->get_length_in_frames(frame_rate), config.timecode_view, frame_rate));
+      
+        if (media->video_tracks.size() > 0) {
+            item->setText(2, QString::number(frame_rate) + " FPS");
+        } else {
+            item->setText(2, QString::number(media->audio_tracks.at(0)->audio_frequency) + " Hz");
+        }
    }
+	}
 }

 void PreviewGenerator::generate_waveform() {