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

fixed #422

Browse Source
This commit is contained in:
itsmattkc
2019-02-09 17:45:18 -08:00
parent 39bf40c3d6
commit 760c8232c6
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dialogs/mediapropertiesdialog.cpp
+3 -2
View File
@@ -53,10 +53,11 @@ MediaPropertiesDialog::MediaPropertiesDialog(QWidget *parent, Media *i) :
for (int i=0;i<f->audio_tracks.size();i++) {
const FootageStream& fs = f->audio_tracks.at(i);
QListWidgetItem* item = new QListWidgetItem(
tr("Audio %1: %2Hz %3 channels").arg(
tr("Audio %1: %2Hz %3 %4").arg(
QString::number(fs.file_index),
QString::number(fs.audio_frequency),
QString::number(fs.audio_channels)
QString::number(fs.audio_channels),
tr("channel(s)", "", fs.audio_channels)
),
track_list
);
project/media.cpp
+7 -4
View File
@@ -8,8 +8,8 @@
#include "panels/project.h"
#include "projectmodel.h"
#include <QPainter>
#include <QCoreApplication>
#include <QtMath>
#include "debug.h"
@@ -117,9 +117,12 @@ void Media::update_tooltip(const QString& error) {
if (f->video_tracks.at(i).video_interlacing == VIDEO_PROGRESSIVE) {
tooltip += QString::number(f->video_tracks.at(i).video_frame_rate * f->speed);
} else {
tooltip += QCoreApplication::translate("Media", "%1 fields (%2 frames)").arg(
QString::number(f->video_tracks.at(i).video_frame_rate * f->speed * 2),
QString::number(f->video_tracks.at(i).video_frame_rate * f->speed)
double adjusted_rate = f->video_tracks.at(i).video_frame_rate * f->speed;
tooltip += QString("%1 %2 (%3 %4)").arg(
QString::number(adjusted_rate * 2),
QCoreApplication::translate("Media", "field(s)", "", qCeil(adjusted_rate * 2)),
QString::number(adjusted_rate),
QCoreApplication::translate("Media", "frame(s)", "", qCeil(adjusted_rate))
);
}
}