oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

corrected merge mistake and improved footage tooltip

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
io/previewgenerator.cpp
-1
View File
@@ -192,7 +192,6 @@ void PreviewGenerator::finalize_media() {
item->setText(2, QString::number(media->audio_tracks.at(0)->audio_frequency) + " Hz");
}
}
}
}
void PreviewGenerator::generate_waveform() {
panels/project.cpp
+18 -15
View File
@@ -1644,19 +1644,21 @@ void update_footage_tooltip(QTreeWidgetItem *item, Media *media, QString error)
}
tooltip += "\n";
tooltip += "Frame Rate: ";
for (int i=0;i<media->video_tracks.size();i++) {
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);
} else {
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";
if (!media->video_tracks.at(0)->infinite_length) {
tooltip += "Frame Rate: ";
for (int i=0;i<media->video_tracks.size();i++) {
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);
} else {
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 += "Interlacing: ";
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 += get_interlacing_name(media->video_tracks.at(i)->video_interlacing);
}
tooltip += "\n";
}
}
if (media->audio_tracks.size() > 0) {
tooltip += "\n";
tooltip += "Audio Frequency: ";
for (int i=0;i<media->audio_tracks.size();i++) {
if (i > 0) {