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

Merge branch 'master' of https://github.com/olive-editor/olive

Browse Source
This commit is contained in:
itsmattkc
2018-11-14 21:41:42 +11:00
parent 67efc652a7 36f851c452
commit 4fa21be7f6
5 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
icons/icons.qrc
+1
View File
@@ -11,6 +11,7 @@
<file>razor.png</file>
<file>audiosource.png</file>
<file>videosource.png</file>
<file>imagesource.png</file>
<file>ripple.png</file>
<file>rolling.png</file>
<file>slip.png</file>
icons/imagesource.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

io/previewgenerator.cpp
+13 -9
View File
@@ -172,22 +172,26 @@ 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 {
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;
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");
} else {
item->setText(2, QString::number(media->audio_tracks.at(0)->audio_frequency) + " Hz");
}
}
}
}
io/previewgenerator.h
+2 -1
View File
@@ -5,7 +5,8 @@
#define ICON_TYPE_VIDEO 0
#define ICON_TYPE_AUDIO 1
#define ICON_TYPE_ERROR 2
#define ICON_TYPE_IMAGE 2
#define ICON_TYPE_ERROR 3
struct Media;
struct MediaStream;
panels/project.cpp
+1
View File
@@ -1597,6 +1597,7 @@ void MediaThrobber::stop(int icon_type, bool replace) {
switch (icon_type) {
case ICON_TYPE_VIDEO: item->setIcon(0, QIcon(":/icons/videosource.png")); break;
case ICON_TYPE_AUDIO: item->setIcon(0, QIcon(":/icons/audiosource.png")); break;
case ICON_TYPE_IMAGE: item->setIcon(0, QIcon(":/icons/imagesource.png")); break;
case ICON_TYPE_ERROR: item->setIcon(0, QIcon::fromTheme("dialog-error")); break;
}