projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move locale_convert into libdcp.
[dcpomatic.git]
/
src
/
lib
/
audio_content.cc
diff --git
a/src/lib/audio_content.cc
b/src/lib/audio_content.cc
index 57f878b71b1bd53c224256d203b6da21ae9529cc..e66b8b998ded170d9ec2d56df47417c278c653b7 100644
(file)
--- a/
src/lib/audio_content.cc
+++ b/
src/lib/audio_content.cc
@@
-23,8
+23,8
@@
#include "exceptions.h"
#include "config.h"
#include "frame_rate_change.h"
#include "exceptions.h"
#include "config.h"
#include "frame_rate_change.h"
-#include "raw_convert.h"
#include "compose.hpp"
#include "compose.hpp"
+#include <dcp/raw_convert.h>
#include <libcxml/cxml.h>
#include <libxml++/libxml++.h>
#include <boost/foreach.hpp>
#include <libcxml/cxml.h>
#include <libxml++/libxml++.h>
#include <boost/foreach.hpp>
@@
-35,7
+35,6
@@
using std::string;
using std::cout;
using std::vector;
using std::string;
using std::cout;
using std::vector;
-using std::stringstream;
using std::fixed;
using std::list;
using std::pair;
using std::fixed;
using std::list;
using std::pair;
@@
-43,6
+42,7
@@
using std::setprecision;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using boost::optional;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using boost::optional;
+using dcp::raw_convert;
/** Something stream-related has changed */
int const AudioContentProperty::STREAMS = 200;
/** Something stream-related has changed */
int const AudioContentProperty::STREAMS = 200;
@@
-75,7
+75,6
@@
AudioContent::from_xml (Content* parent, cxml::ConstNodePtr node, int version)
return shared_ptr<AudioContent> ();
}
return shared_ptr<AudioContent> ();
}
- /* Can't use make_shared here as the constructor is private */
return shared_ptr<AudioContent> (new AudioContent (parent, node));
}
return shared_ptr<AudioContent> (new AudioContent (parent, node));
}
@@
-325,7
+324,7
@@
AudioContent::add_properties (list<UserProperty>& p) const
);
}
);
}
- p.push_back (UserProperty (UserProperty::AUDIO, _("DCP
fram
e rate"), resampled_frame_rate (), _("Hz")));
+ p.push_back (UserProperty (UserProperty::AUDIO, _("DCP
sampl
e rate"), resampled_frame_rate (), _("Hz")));
p.push_back (UserProperty (UserProperty::LENGTH, _("Full length in video frames at DCP rate"), c.frames_round (frc.dcp)));
if (stream) {
p.push_back (UserProperty (UserProperty::LENGTH, _("Full length in video frames at DCP rate"), c.frames_round (frc.dcp)));
if (stream) {