projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add LEQ(m) when analysing audio (#1382).
[dcpomatic.git]
/
src
/
lib
/
curl_uploader.cc
diff --git
a/src/lib/curl_uploader.cc
b/src/lib/curl_uploader.cc
index b88898544392a44bf7bc8802f3edd3d41f33b4f4..1fd8ced017f285504532432e99cb56108a21fcaf 100644
(file)
--- a/
src/lib/curl_uploader.cc
+++ b/
src/lib/curl_uploader.cc
@@
-1,19
+1,20
@@
/*
Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-22,6
+23,7
@@
#include "config.h"
#include "cross.h"
#include "compose.hpp"
#include "config.h"
#include "cross.h"
#include "compose.hpp"
+#include <iostream>
#include "i18n.h"
#include "i18n.h"
@@
-75,11
+77,10
@@
CurlUploader::upload_file (boost::filesystem::path from, boost::filesystem::path
{
curl_easy_setopt (
_curl, CURLOPT_URL,
{
curl_easy_setopt (
_curl, CURLOPT_URL,
- String::compose ("ftp://%1/%2/%3", Config::instance()->tms_ip(), Config::instance()->tms_path(), to.string ()).c_str ()
+ /* Use generic_string so that we get forward-slashes in the path, even on Windows */
+ String::compose ("ftp://%1/%2/%3", Config::instance()->tms_ip(), Config::instance()->tms_path(), to.generic_string ()).c_str ()
);
);
- cout << String::compose ("ftp://%1/%2/%3", Config::instance()->tms_ip(), Config::instance()->tms_path(), to.string ()) << "\n";
-
_file = fopen_boost (from, "rb");
if (!_file) {
throw NetworkError (String::compose (_("Could not open %1 to send"), from));
_file = fopen_boost (from, "rb");
if (!_file) {
throw NetworkError (String::compose (_("Could not open %1 to send"), from));
@@
-93,6
+94,7
@@
CurlUploader::upload_file (boost::filesystem::path from, boost::filesystem::path
}
fclose (_file);
}
fclose (_file);
+ _file = 0;
}
size_t
}
size_t