#include <libcxml/cxml.h>
#include <asdcp/KLV.h>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <boost/function.hpp>
#include <string>
+
+/* MinGW seems to define this, but we want to use it */
+#undef ERROR
+
+
namespace xmlpp {
class Element;
}
extern bool operator== (Size const & a, Size const & b);
extern bool operator!= (Size const & a, Size const & b);
-extern std::ostream& operator<< (std::ostream& s, Size const & a);
/** Identifier for a sound channel */
-enum Channel {
+enum class Channel {
LEFT = 0, ///< left
RIGHT = 1, ///< right
CENTRE = 2, ///< centre
std::vector<dcp::Channel> used_audio_channels ();
-enum MCASoundField
+enum class MCASoundField
{
FIVE_POINT_ONE,
SEVEN_POINT_ONE
extern ASDCP::UL channel_to_mca_universal_label (Channel c, MCASoundField field, ASDCP::Dictionary const* dict);
-enum ContentKind
+enum class ContentKind
{
FEATURE,
SHORT,
extern std::string content_kind_to_string (ContentKind kind);
extern ContentKind content_kind_from_string (std::string kind);
-enum Effect
+enum class Effect
{
NONE,
BORDER,
extern std::string effect_to_string (Effect e);
extern Effect string_to_effect (std::string s);
-enum HAlign
+enum class HAlign
{
- HALIGN_LEFT, ///< horizontal position is distance from left of screen to left of subtitle
- HALIGN_CENTER, ///< horizontal position is distance from centre of screen to centre of subtitle
- HALIGN_RIGHT, ///< horizontal position is distance from right of screen to right of subtitle
+ LEFT, ///< horizontal position is distance from left of screen to left of subtitle
+ CENTER, ///< horizontal position is distance from centre of screen to centre of subtitle
+ RIGHT, ///< horizontal position is distance from right of screen to right of subtitle
};
extern std::string halign_to_string (HAlign a);
extern HAlign string_to_halign (std::string s);
-enum VAlign
+enum class VAlign
{
- VALIGN_TOP, ///< vertical position is distance from top of screen to top of subtitle
- VALIGN_CENTER, ///< vertical position is distance from centre of screen to centre of subtitle
- VALIGN_BOTTOM ///< vertical position is distance from bottom of screen to bottom of subtitle
+ TOP, ///< vertical position is distance from top of screen to top of subtitle
+ CENTER, ///< vertical position is distance from centre of screen to centre of subtitle
+ BOTTOM ///< vertical position is distance from bottom of screen to bottom of subtitle
};
extern std::string valign_to_string (VAlign a);
extern VAlign string_to_valign (std::string s);
/** Direction for subtitle test */
-enum Direction
+enum class Direction
{
- DIRECTION_LTR, ///< left-to-right
- DIRECTION_RTL, ///< right-to-left
- DIRECTION_TTB, ///< top-to-bottom
- DIRECTION_BTT ///< bottom-to-top
+ LTR, ///< left-to-right
+ RTL, ///< right-to-left
+ TTB, ///< top-to-bottom
+ BTT ///< bottom-to-top
};
extern std::string direction_to_string (Direction a);
extern Direction string_to_direction (std::string s);
-enum Eye
+enum class Eye
{
- EYE_LEFT,
- EYE_RIGHT
+ LEFT,
+ RIGHT
};
/** @class Fraction
extern bool operator== (Fraction const & a, Fraction const & b);
extern bool operator!= (Fraction const & a, Fraction const & b);
-extern std::ostream& operator<< (std::ostream& s, Fraction const & f);
/** @struct EqualityOptions
* @brief A class to describe what "equality" means for a particular test.
*
* When comparing things, we want to be able to ignore some differences;
* this class expresses those differences.
+ *
+ * It also contains some settings for how the comparison should be done.
*/
struct EqualityOptions
{
, issue_dates_can_differ (false)
, load_font_nodes_can_differ (false)
, keep_going (false)
+ , export_differing_subtitles (false)
{}
/** The maximum allowable mean difference in pixel value between two images */
bool issue_dates_can_differ;
bool load_font_nodes_can_differ;
bool keep_going;
+ /** true to save the first pair of differeng image subtitles to the current working directory */
+ bool export_differing_subtitles;
};
-/* I've been unable to make mingw happy with ERROR as a symbol, so
- I'm using a DCP_ prefix here.
-*/
-enum NoteType {
- DCP_PROGRESS,
- DCP_ERROR,
- DCP_NOTE
+
+enum class NoteType {
+ PROGRESS,
+ ERROR,
+ NOTE
};
-enum Standard {
+
+enum class Standard {
INTEROP,
SMPTE
};
-enum Formulation {
+
+enum class Formulation {
MODIFIED_TRANSITIONAL_1,
MULTIPLE_MODIFIED_TRANSITIONAL_1,
DCI_ANY,
extern bool operator== (Colour const & a, Colour const & b);
extern bool operator!= (Colour const & a, Colour const & b);
-extern std::ostream & operator<< (std::ostream & s, Colour const & c);
typedef boost::function<void (NoteType, std::string)> NoteHandler;
*/
const float ALIGN_EPSILON = 1e-3;
-enum Marker {
+enum class Marker {
FFOC, ///< first frame of composition
LFOC, ///< last frame of composition
FFTC, ///< first frame of title credits
};
extern bool operator== (Rating const & a, Rating const & b);
-extern std::ostream& operator<< (std::ostream& s, Rating const & r);
-enum Status
+enum class Status
{
FINAL, ///< final version
TEMP, ///< temporary version (picture/sound unfinished)
class Luminance
{
public:
- enum Unit {
+ enum class Unit {
CANDELA_PER_SQUARE_METRE,
FOOT_LAMBERT
};