projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
image_content.cc
diff --git
a/src/lib/image_content.cc
b/src/lib/image_content.cc
index db02c6059ed494f553df16c9ea658255b833569d..8909240dc334e3d793e2ff64cc7d8b4922c8a1f1 100644
(file)
--- a/
src/lib/image_content.cc
+++ b/
src/lib/image_content.cc
@@
-24,6
+24,7
@@
#include "compose.hpp"
#include "film.h"
#include "job.h"
#include "compose.hpp"
#include "film.h"
#include "job.h"
+#include "frame_rate_change.h"
#include "i18n.h"
#include "i18n.h"
@@
-44,13
+45,17
@@
ImageContent::ImageContent (shared_ptr<const Film> f, boost::filesystem::path p)
_paths.push_back (i->path ());
}
}
_paths.push_back (i->path ());
}
}
-
+
+ if (_paths.empty()) {
+ throw FileError (_("No valid image files were found in the folder."), p);
+ }
+
sort (_paths.begin(), _paths.end());
}
}
sort (_paths.begin(), _paths.end());
}
}
-ImageContent::ImageContent (shared_ptr<const Film> f,
shared_ptr<const cxml::Node>
node, int version)
+ImageContent::ImageContent (shared_ptr<const Film> f,
cxml::ConstNodePtr
node, int version)
: Content (f, node)
, VideoContent (f, node, version)
{
: Content (f, node)
, VideoContent (f, node, version)
{
@@
-125,7
+130,7
@@
ImageContent::full_length () const
{
shared_ptr<const Film> film = _film.lock ();
assert (film);
{
shared_ptr<const Film> film = _film.lock ();
assert (film);
- return DCPTime (video_length(), FrameRateChange (video_frame_rate(), film->video_frame_rate()));
+ return DCPTime (video_length
_after_3d_combine
(), FrameRateChange (video_frame_rate(), film->video_frame_rate()));
}
string
}
string
@@
-133,7
+138,7
@@
ImageContent::identifier () const
{
stringstream s;
s << VideoContent::identifier ();
{
stringstream s;
s << VideoContent::identifier ();
- s << "_" << video_length();
+ s << "_" << video_length()
.get()
;
return s.str ();
}
return s.str ();
}