projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix quantization and other time-related ops.
[ardour.git]
/
gtk2_ardour
/
utils_videotl.cc
diff --git
a/gtk2_ardour/utils_videotl.cc
b/gtk2_ardour/utils_videotl.cc
index 2e250b2cee29321b140419e6f815afa2c9a2e216..24a27c1425de2573abaadb5b7672a716bd29eadf 100644
(file)
--- a/
gtk2_ardour/utils_videotl.cc
+++ b/
gtk2_ardour/utils_videotl.cc
@@
-29,6
+29,13
@@
#include "video_image_frame.h"
#include "utils_videotl.h"
#include "video_image_frame.h"
#include "utils_videotl.h"
+#ifdef WAF_BUILD
+#include "gtk2ardour-version.h"
+#endif
+
+#ifndef ARDOUR_CURL_TIMEOUT
+#define ARDOUR_CURL_TIMEOUT (60)
+#endif
#include "i18n.h"
using namespace Gtk;
#include "i18n.h"
using namespace Gtk;
@@
-151,6
+158,13
@@
VideoUtils::video_map_path (std::string server_docroot, std::string filepath)
{
std::string rv = filepath;
{
std::string rv = filepath;
+ /* strip docroot */
+ if (server_docroot.length() > 0) {
+ if (rv.compare(0, server_docroot.length(), server_docroot) == 0 ) {
+ rv = rv.substr(server_docroot.length());
+ }
+ }
+
/* replace all G_DIR_SEPARATOR with '/' */
size_t look_here = 0;
size_t found_here;
/* replace all G_DIR_SEPARATOR with '/' */
size_t look_here = 0;
size_t found_here;
@@
-159,13
+173,6
@@
VideoUtils::video_map_path (std::string server_docroot, std::string filepath)
look_here = found_here + 1;
}
look_here = found_here + 1;
}
- /* strip docroot */
- if (server_docroot.length() > 0) {
- if (rv.compare(0, server_docroot.length(), server_docroot) == 0 ) {
- rv = rv.substr(server_docroot.length());
- }
- }
-
CURL *curl;
char *ue;
curl = curl_easy_init();
CURL *curl;
char *ue;
curl = curl_easy_init();
@@
-337,7
+344,7
@@
extern "C" {
curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)&chunk);
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteMemoryCallback);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)&chunk);
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteMemoryCallback);
- curl_easy_setopt(curl, CURLOPT_USERAGENT,
ARDOUR_USER_AGENT
);
+ curl_easy_setopt(curl, CURLOPT_USERAGENT,
PROGRAM_NAME VERSIONSTRING
);
curl_easy_setopt(curl, CURLOPT_TIMEOUT, ARDOUR_CURL_TIMEOUT);
curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
#ifdef CURLERRORDEBUG
curl_easy_setopt(curl, CURLOPT_TIMEOUT, ARDOUR_CURL_TIMEOUT);
curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
#ifdef CURLERRORDEBUG