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

throw error if no streams were found when importing

Browse Source
This commit is contained in:
itsmattkc
2019-03-08 18:39:27 +11:00
parent 2f1ff270b0
commit d4df411526
2 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
io/previewgenerator.cpp
+29 -14
View File
@@ -196,16 +196,28 @@ bool PreviewGenerator::retrieve_preview(const QString& hash) {
}
void PreviewGenerator::finalize_media() {
footage_->ready_lock.unlock();
footage_->ready = true;
if (!cancelled_) {
if (footage_->video_tracks.size() == 0) {
olive::media_icon_service->SetMediaIcon(media_, ICON_TYPE_AUDIO);
} else if (contains_still_image_) {
olive::media_icon_service->SetMediaIcon(media_, ICON_TYPE_IMAGE);
} else {
bool footage_is_ready = true;
if (footage_->video_tracks.isEmpty() && footage_->audio_tracks.isEmpty()) {
// ERROR
footage_is_ready = false;
invalidate_media(tr("Failed to find any valid video/audio streams"));
} else if (!footage_->video_tracks.isEmpty() && !contains_still_image_) {
// VIDEO
olive::media_icon_service->SetMediaIcon(media_, ICON_TYPE_VIDEO);
} else if (!footage_->audio_tracks.isEmpty()) {
// AUDIO
olive::media_icon_service->SetMediaIcon(media_, ICON_TYPE_AUDIO);
} else {
// IMAGE
olive::media_icon_service->SetMediaIcon(media_, ICON_TYPE_IMAGE);
}
if (footage_is_ready) {
footage_->ready_lock.unlock();
footage_->ready = true;
media_->update_tooltip();
}
if (olive::ActiveSequence != nullptr) {
@@ -214,6 +226,14 @@ void PreviewGenerator::finalize_media() {
}
}
void PreviewGenerator::invalidate_media(const QString &error_msg)
{
media_->update_tooltip(error_msg);
olive::media_icon_service->SetMediaIcon(media_, ICON_TYPE_ERROR);
footage_->invalid = true;
footage_->ready_lock.unlock();
}
void thumb_data_cleanup(void *info) {
delete [] static_cast<uint8_t*>(info);
}
@@ -584,12 +604,7 @@ void PreviewGenerator::run() {
if (!cancelled_) {
if (error) {
media_->update_tooltip(errorStr);
olive::media_icon_service->SetMediaIcon(media_, ICON_TYPE_ERROR);
footage_->invalid = true;
footage_->ready_lock.unlock();
} else {
media_->update_tooltip();
invalidate_media(errorStr);
}
}
io/previewgenerator.h
+2 -1
View File
@@ -48,7 +48,8 @@ private:
void parse_media();
bool retrieve_preview(const QString &hash);
void generate_waveform();
void finalize_media();
void finalize_media();
void invalidate_media(const QString& error_msg);
QString get_thumbnail_path(const QString &hash, const FootageStream &ms);
QString get_waveform_path(const QString& hash, const FootageStream &ms);