Do not try to restore Route solo state after clearing all solo state

[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..bd94c370baa70bb60015abf18ca0a77ea5c79f78 100644 (file)
--- a/gtk2_ardour/add_video_dialog.cc
+++ b/gtk2_ardour/add_video_dialog.cc
@@ -34,8 +34,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 +109,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
@@ -504,7 +505,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);
        if (status != 200) {
                printf("request failed\n"); // XXX
                harvid_path.set_text(" - request failed -");
@@ -684,7 +685,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);
        if (!data) {
                printf("image preview request failed %s\n", url);
                imgbuf->fill(RGBA_TO_UINT(0,0,0,255));