corrected merge mistake and improved footage tooltip

This commit is contained in:
itsmattkc
2018-11-14 21:44:58 +11:00
parent 4fa21be7f6
commit 30bfeef64a
2 changed files with 18 additions and 16 deletions
-1
View File
@@ -192,7 +192,6 @@ void PreviewGenerator::finalize_media() {
item->setText(2, QString::number(media->audio_tracks.at(0)->audio_frequency) + " Hz"); item->setText(2, QString::number(media->audio_tracks.at(0)->audio_frequency) + " Hz");
} }
} }
}
} }
void PreviewGenerator::generate_waveform() { void PreviewGenerator::generate_waveform() {
+18 -15
View File
@@ -1644,19 +1644,21 @@ void update_footage_tooltip(QTreeWidgetItem *item, Media *media, QString error)
} }
tooltip += "\n"; tooltip += "\n";
tooltip += "Frame Rate: "; if (!media->video_tracks.at(0)->infinite_length) {
for (int i=0;i<media->video_tracks.size();i++) { tooltip += "Frame Rate: ";
if (i > 0) { for (int i=0;i<media->video_tracks.size();i++) {
tooltip += ", "; if (i > 0) {
} tooltip += ", ";
if (media->video_tracks.at(i)->video_interlacing == VIDEO_PROGRESSIVE) { }
tooltip += QString::number(media->video_tracks.at(i)->video_frame_rate); if (media->video_tracks.at(i)->video_interlacing == VIDEO_PROGRESSIVE) {
} else { tooltip += QString::number(media->video_tracks.at(i)->video_frame_rate);
tooltip += QString::number(media->video_tracks.at(i)->video_frame_rate * 2); } else {
tooltip += " fields (" + QString::number(media->video_tracks.at(i)->video_frame_rate) + " frames)"; tooltip += QString::number(media->video_tracks.at(i)->video_frame_rate * 2);
} tooltip += " fields (" + QString::number(media->video_tracks.at(i)->video_frame_rate) + " frames)";
} }
tooltip += "\n"; }
tooltip += "\n";
}
tooltip += "Interlacing: "; tooltip += "Interlacing: ";
for (int i=0;i<media->video_tracks.size();i++) { for (int i=0;i<media->video_tracks.size();i++) {
@@ -1664,11 +1666,12 @@ void update_footage_tooltip(QTreeWidgetItem *item, Media *media, QString error)
tooltip += ", "; tooltip += ", ";
} }
tooltip += get_interlacing_name(media->video_tracks.at(i)->video_interlacing); tooltip += get_interlacing_name(media->video_tracks.at(i)->video_interlacing);
} }
tooltip += "\n";
} }
if (media->audio_tracks.size() > 0) { if (media->audio_tracks.size() > 0) {
tooltip += "\n";
tooltip += "Audio Frequency: "; tooltip += "Audio Frequency: ";
for (int i=0;i<media->audio_tracks.size();i++) { for (int i=0;i<media->audio_tracks.size();i++) {
if (i > 0) { if (i > 0) {