projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix DCP playback when an incorrect KDM is added, followed by
[dcpomatic.git]
/
src
/
lib
/
uploader.cc
diff --git
a/src/lib/uploader.cc
b/src/lib/uploader.cc
index b6b23ed8e5794445594714cf5e055e418ad3d8d1..bfee5ecbbcd92ab161e88f9e0e5b415fbb1cb0f1 100644
(file)
--- a/
src/lib/uploader.cc
+++ b/
src/lib/uploader.cc
@@
-1,34
+1,38
@@
/*
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/>.
*/
#include "uploader.h"
#include "dcpomatic_assert.h"
*/
#include "uploader.h"
#include "dcpomatic_assert.h"
+#include "compose.hpp"
+
+#include "i18n.h"
using std::string;
using boost::shared_ptr;
using boost::function;
Uploader::Uploader (function<void (string)> set_status, function<void (float)> set_progress)
using std::string;
using boost::shared_ptr;
using boost::function;
Uploader::Uploader (function<void (string)> set_status, function<void (float)> set_progress)
- : _set_
status (set_statu
s)
- , _set_
progress (set_progres
s)
+ : _set_
progress (set_progres
s)
+ , _set_
status (set_statu
s)
{
{
-
+ _set_status (_("connecting"));
}
boost::uintmax_t
}
boost::uintmax_t
@@
-66,6
+70,7
@@
Uploader::upload_directory (boost::filesystem::path base, boost::filesystem::pat
if (is_directory (i->path ())) {
upload_directory (base, i->path (), transferred, total_size);
} else {
if (is_directory (i->path ())) {
upload_directory (base, i->path (), transferred, total_size);
} else {
+ _set_status (String::compose (_("copying %1"), i->path().leaf ()));
upload_file (i->path (), remove_prefix (base, i->path ()), transferred, total_size);
}
}
upload_file (i->path (), remove_prefix (base, i->path ()), transferred, total_size);
}
}