projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix assertion failure when content has more than one audio stream.
[dcpomatic.git]
/
src
/
lib
/
screen_kdm.cc
diff --git
a/src/lib/screen_kdm.cc
b/src/lib/screen_kdm.cc
index a95a579485ac559e4e97289778b9114a66097687..3515af8a6644f1b6ed70377e1474652577b0fc88 100644
(file)
--- a/
src/lib/screen_kdm.cc
+++ b/
src/lib/screen_kdm.cc
@@
-25,6
+25,7
@@
#include <boost/foreach.hpp>
using std::string;
#include <boost/foreach.hpp>
using std::string;
+using std::cout;
using std::list;
using boost::shared_ptr;
using std::list;
using boost::shared_ptr;
@@
-45,6
+46,16
@@
ScreenKDM::write_files (
{
int written = 0;
{
int written = 0;
+ if (directory == "-") {
+ /* Write KDMs to the stdout */
+ BOOST_FOREACH (ScreenKDM const & i, screen_kdms) {
+ cout << i.kdm.as_xml ();
+ ++written;
+ }
+
+ return written;
+ }
+
if (!boost::filesystem::exists (directory)) {
boost::filesystem::create_directories (directory);
}
if (!boost::filesystem::exists (directory)) {
boost::filesystem::create_directories (directory);
}
@@
-53,6
+64,7
@@
ScreenKDM::write_files (
BOOST_FOREACH (ScreenKDM const & i, screen_kdms) {
name_values['c'] = i.screen->cinema->name;
name_values['s'] = i.screen->name;
BOOST_FOREACH (ScreenKDM const & i, screen_kdms) {
name_values['c'] = i.screen->cinema->name;
name_values['s'] = i.screen->name;
+ name_values['i'] = i.kdm.id ();
boost::filesystem::path out = directory / (name_format.get(name_values, ".xml"));
if (!boost::filesystem::exists (out) || confirm_overwrite (out)) {
i.kdm.as_xml (out);
boost::filesystem::path out = directory / (name_format.get(name_values, ".xml"));
if (!boost::filesystem::exists (out) || confirm_overwrite (out)) {
i.kdm.as_xml (out);