projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add back-pointer to TempoMap from points, and push dirty=true into map
[ardour.git]
/
gtk2_ardour
/
video_image_frame.cc
diff --git
a/gtk2_ardour/video_image_frame.cc
b/gtk2_ardour/video_image_frame.cc
index 861c763665b5faefe6f574cb73b6855453bafe3a..093f2351077ed32ef52222f5b28cc36020370fe0 100644
(file)
--- a/
gtk2_ardour/video_image_frame.cc
+++ b/
gtk2_ardour/video_image_frame.cc
@@
-20,17
+20,17
@@
#include <sigc++/bind.h>
#include "ardour/tempo.h"
#include <sigc++/bind.h>
#include "ardour/tempo.h"
-#include "ardour_ui.h"
-#include "video_image_frame.h"
-#include "public_editor.h"
-#include "utils.h"
-#include "canvas/layout.h"
-#include "utils_videotl.h"
-
#include <gtkmm2ext/utils.h>
#include <pthread.h>
#include <gtkmm2ext/utils.h>
#include <pthread.h>
-#include "i18n.h"
+#include "canvas/container.h"
+
+#include "ardour_http.h"
+#include "public_editor.h"
+#include "utils_videotl.h"
+#include "video_image_frame.h"
+
+#include "pbd/i18n.h"
using namespace std;
using namespace ARDOUR;
using namespace std;
using namespace ARDOUR;
@@
-43,7
+43,7
@@
static void freedata_cb (uint8_t *d, void* /*arg*/) {
free (d);
}
free (d);
}
-VideoImageFrame::VideoImageFrame (PublicEditor& ed, ArdourCanvas::
Layout
& parent, int w, int h, std::string vsurl, std::string vfn)
+VideoImageFrame::VideoImageFrame (PublicEditor& ed, ArdourCanvas::
Container
& parent, int w, int h, std::string vsurl, std::string vfn)
: editor (ed)
, _parent(&parent)
, clip_width(w)
: editor (ed)
, _parent(&parent)
, clip_width(w)
@@
-195,7
+195,7
@@
VideoImageFrame::cut_rightend ()
}
}
}
}
-void *
+
static
void *
http_get_thread (void *arg) {
VideoImageFrame *vif = static_cast<VideoImageFrame *>(arg);
char url[2048];
http_get_thread (void *arg) {
VideoImageFrame *vif = static_cast<VideoImageFrame *>(arg);
char url[2048];
@@
-210,7
+210,7
@@
http_get_thread (void *arg) {
int timeout = 1000; // * 5ms -> 5sec
char *res = NULL;
do {
int timeout = 1000; // * 5ms -> 5sec
char *res = NULL;
do {
- res
=a3_curl_http_get
(url, &status);
+ res
= ArdourCurl::http_get
(url, &status);
if (status == 503) Glib::usleep(5000); // try-again
} while (status == 503 && --timeout > 0);
if (status == 503) Glib::usleep(5000); // try-again
} while (status == 503 && --timeout > 0);