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

tweaked merge

Browse Source
This commit is contained in:
itsmattkc
2018-11-17 12:56:00 +11:00
parent d3739c2776
commit f427e37f46
4 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
io/media.h
+1 -1
View File
@@ -37,7 +37,7 @@ struct MediaStream {
// preview thumbnail/waveform
bool preview_done;
QPixmap video_preview; // TODO change to QPixmap
QPixmap video_preview;
QVector<char> audio_preview;
};
io/previewgenerator.cpp
+1 -3
View File
@@ -439,9 +439,7 @@ void PreviewGenerator::run() {
// save preview to file
for (int i=0;i<media->video_tracks.size();i++) {
MediaStream* ms = media->video_tracks.at(i);
if (ms->video_preview.save(get_thumbnail_path(hash, ms), "PNG")) {
//dout << "saved" << ms->file_index << "thumb to" << get_thumbnail_path(hash, ms);
}
ms->video_preview.save(get_thumbnail_path(hash, ms), "PNG");
}
for (int i=0;i<media->audio_tracks.size();i++) {
MediaStream* ms = media->audio_tracks.at(i);