added effects and fixed some crashes

This commit is contained in:
itsmattkc
2018-11-15 21:02:08 +11:00
parent 0e924caf8e
commit f007f39dd2
17 changed files with 414 additions and 111 deletions
+19 -18
View File
@@ -1,4 +1,4 @@
#include "previewgenerator.h"
#include "previewgenerator.h"
#include "media.h"
#include "panels/viewer.h"
@@ -172,24 +172,25 @@ void PreviewGenerator::finalize_media() {
media->ready_lock.unlock();
media->ready = true;
if (media->video_tracks.size() == 0) {
emit set_icon(ICON_TYPE_AUDIO, replace);
} else if (contains_still_image) {
emit set_icon(ICON_TYPE_IMAGE, replace);
} else {
emit set_icon(ICON_TYPE_VIDEO, replace);
}
if (!contains_still_image || media->audio_tracks.size() > 0) {
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");
if (!cancelled) {
if (media->video_tracks.size() == 0) {
emit set_icon(ICON_TYPE_AUDIO, replace);
} else if (contains_still_image) {
emit set_icon(ICON_TYPE_IMAGE, replace);
} else {
item->setText(2, QString::number(media->audio_tracks.at(0)->audio_frequency) + " Hz");
emit set_icon(ICON_TYPE_VIDEO, replace);
}
if (!contains_still_image || media->audio_tracks.size() > 0) {
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");
}
}
}
}