add wine/windows-vst start script

[ardour.git] / gtk2_ardour / add_video_dialog.cc

diff --git a/gtk2_ardour/add_video_dialog.cc b/gtk2_ardour/add_video_dialog.cc
index a7de9d2c331fca80649c749728b6c04b60dc90e0..57938ac3f154eb4da8c36dc2c33df2c67900c3cf 100644 (file)
--- a/gtk2_ardour/add_video_dialog.cc
+++ b/gtk2_ardour/add_video_dialog.cc
@@ -17,8 +17,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#ifdef WITH_VIDEOTIMELINE
-
 #include <cstdio>
 #include <cmath>
 
@@ -44,6 +42,7 @@ using namespace Gtk;
 using namespace std;
 using namespace PBD;
 using namespace ARDOUR;
+using namespace VideoUtils;
 
 #define PREVIEW_WIDTH (240)
 #define PREVIEW_HEIGHT (180)
@@ -70,7 +69,6 @@ AddVideoDialog::AddVideoDialog (Session* s)
 {
        set_session (s);
        set_name ("AddVideoDialog");
-       set_position (Gtk::WIN_POS_MOUSE);
        set_modal (true);
        set_skip_taskbar_hint (true);
        set_resizable (true);
@@ -347,6 +345,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 +366,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();
        }
 }
 
@@ -479,7 +483,7 @@ AddVideoDialog::harvid_request(std::string u)
 
        harvid_list->clear();
 
-       char *res = curl_http_get(url, &status);
+       char *res = a3_curl_http_get(url, &status);
        if (status != 200) {
                printf("request failed\n"); // XXX
                harvid_path.set_text(" - request failed -");
@@ -563,6 +567,8 @@ AddVideoDialog::request_preview(std::string u)
                pi_tcout.set_text("-");
                pi_aspect.set_text("-");
                pi_fps.set_text("-");
+
+               clear_preview_image();
                return;
        }
 
@@ -657,7 +663,7 @@ AddVideoDialog::request_preview(std::string u)
                , (long long) (video_duration * seek_slider.get_value() / 1000.0)
                , clip_width, clip_height, u.c_str());
 
-       char *data = curl_http_get(url, NULL);
+       char *data = a3_curl_http_get(url, NULL);
        if (!data) {
                printf("image preview request failed %s\n", url);
                imgbuf->fill(RGBA_TO_UINT(0,0,0,255));
@@ -676,5 +682,3 @@ AddVideoDialog::request_preview(std::string u)
        preview_image->set(imgbuf);
        preview_image->show();
 }
-
-#endif /* WITH_VIDEOTIMELINE */