Only show user-presets in favorite sidebar

[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 5fc53c7de2f1bd0a12f55a8431e79d4f7a76235c..5c0db1ff2631b5d6c9f46b41200f2e65c3f74e85 100644 (file)
--- a/gtk2_ardour/add_video_dialog.cc
+++ b/gtk2_ardour/add_video_dialog.cc
@@ -23,6 +23,11 @@
 #include <sigc++/bind.h>
 #include <curl/curl.h>
 
+#include <gtkmm/box.h>
+#include <gtkmm/filechooserdialog.h>
+#include <gtkmm/scrolledwindow.h>
+#include <gtkmm/stock.h>
+
 #include "pbd/error.h"
 #include "pbd/convert.h"
 #include "gtkmm2ext/utils.h"
@@ -34,8 +39,9 @@
 #include "ardour_ui.h"
 
 #include "add_video_dialog.h"
+#include "ardour_http.h"
 #include "utils_videotl.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Gtk;
 using namespace std;
@@ -108,7 +114,7 @@ AddVideoDialog::AddVideoDialog (Session* s)
 
        /* file chooser */
        chooser.set_border_width (4);
-#ifdef GTKOSX
+#ifdef __APPLE__
        /* some broken redraw behaviour - this is a bandaid */
        chooser.signal_selection_changed().connect (mem_fun (chooser, &Widget::queue_draw));
 #endif
@@ -192,8 +198,11 @@ AddVideoDialog::AddVideoDialog (Session* s)
 
        /* xjadeo checkbox */
        if (ARDOUR_UI::instance()->video_timeline->found_xjadeo()
+#ifndef PLATFORM_WINDOWS
                        /* TODO xjadeo setup w/ xjremote */
-                       && video_get_docroot(Config).size() > 0) {
+                       && video_get_docroot(Config).size() > 0
+#endif
+                ) {
                xjadeo_checkbox.set_active(true);  /* set in ardour_ui.cpp ?! */
        } else {
                printf("xjadeo was not found or video-server docroot is unset (remote video-server)\n");
@@ -322,8 +331,14 @@ AddVideoDialog::file_name (bool &local_file)
                std::string video_server_url = video_get_server_url(Config);
 
                /* check if video server is running locally */
-               if (video_get_docroot(Config).size() > 0 &&
-                       (0 == video_server_url.compare (0, 16, "http://127.0.0.1") || 0 == video_server_url.compare (0, 16, "http://localhost"))
+               if (
+#ifdef PLATFORM_WINDOWS
+                               (video_get_docroot(Config).size() > 0 || !show_advanced)
+#else
+                               video_get_docroot(Config).size() > 0
+#endif
+                               &&
+                               (0 == video_server_url.compare (0, 16, "http://127.0.0.1") || 0 == video_server_url.compare (0, 16, "http://localhost"))
                   )
                {
                        /* check if the file can be accessed */
@@ -504,7 +519,7 @@ AddVideoDialog::harvid_request(std::string u)
 
        harvid_list->clear();
 
-       char *res = a3_curl_http_get(url, &status);
+       char* res = ArdourCurl::http_get (url, &status, false);
        if (status != 200) {
                printf("request failed\n"); // XXX
                harvid_path.set_text(" - request failed -");
@@ -684,7 +699,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 = a3_curl_http_get(url, NULL);
+       char* data = ArdourCurl::http_get (url, NULL, false);
        if (!data) {
                printf("image preview request failed %s\n", url);
                imgbuf->fill(RGBA_TO_UINT(0,0,0,255));