From 922ef41995a2a28635384cd6cf413d113a4ebb46 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 1 Apr 2013 18:39:15 +0200 Subject: [PATCH] vtl: draw cross if info-request fails in open-video preview. --- gtk2_ardour/add_video_dialog.cc | 16 ++++++++++++---- gtk2_ardour/add_video_dialog.h | 1 + 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/gtk2_ardour/add_video_dialog.cc b/gtk2_ardour/add_video_dialog.cc index a7de9d2c33..7490042222 100644 --- a/gtk2_ardour/add_video_dialog.cc +++ b/gtk2_ardour/add_video_dialog.cc @@ -347,6 +347,15 @@ AddVideoDialog::auto_set_session_fps () return set_session_fps_checkbox.get_active(); } +void +AddVideoDialog::clear_preview_image () +{ + imgbuf->fill(RGBA_TO_UINT(0,0,0,255)); + video_draw_cross(imgbuf); + preview_image->set(imgbuf); + preview_image->show(); +} + void AddVideoDialog::set_action_ok (bool yn) { @@ -359,10 +368,7 @@ AddVideoDialog::set_action_ok (bool yn) pi_aspect.set_text("-"); pi_fps.set_text("-"); ok_button->set_sensitive(false); - imgbuf->fill(RGBA_TO_UINT(0,0,0,255)); - video_draw_cross(imgbuf); - preview_image->set(imgbuf); - preview_image->show(); + clear_preview_image(); } } @@ -563,6 +569,8 @@ AddVideoDialog::request_preview(std::string u) pi_tcout.set_text("-"); pi_aspect.set_text("-"); pi_fps.set_text("-"); + + clear_preview_image(); return; } diff --git a/gtk2_ardour/add_video_dialog.h b/gtk2_ardour/add_video_dialog.h index 54a7e4ca83..985d64e4cc 100644 --- a/gtk2_ardour/add_video_dialog.h +++ b/gtk2_ardour/add_video_dialog.h @@ -51,6 +51,7 @@ class AddVideoDialog : public ArdourDialog void on_show (); bool page_switch(); void set_action_ok(bool yn); + void clear_preview_image(); /* preview pane related */ void request_preview(std::string vpath);