summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/subtitle_string.cc6
-rw-r--r--src/types.cc147
-rw-r--r--src/types.h11
3 files changed, 4 insertions, 160 deletions
diff --git a/src/subtitle_string.cc b/src/subtitle_string.cc
index f5f8c8ac..0f89291e 100644
--- a/src/subtitle_string.cc
+++ b/src/subtitle_string.cc
@@ -144,11 +144,13 @@ dcp::operator<< (ostream& s, SubtitleString const & sub)
s << "underlined, ";
}
- s << "size " << sub.size() << ", aspect " << sub.aspect_adjust() << ", colour " << sub.colour()
+ s << "size " << sub.size() << ", aspect " << sub.aspect_adjust()
+ << ", colour (" << sub.colour().r << ", " << sub.colour().g << ", " << sub.colour().b << ")"
<< ", vpos " << sub.v_position() << ", valign " << ((int) sub.v_align())
<< ", hpos " << sub.h_position() << ", halign " << ((int) sub.h_align())
<< ", direction " << ((int) sub.direction())
- << ", effect " << ((int) sub.effect()) << ", effect colour " << sub.effect_colour();
+ << ", effect " << ((int) sub.effect())
+ << ", effect colour (" << sub.effect_colour().r << ", " << sub.effect_colour().g << ", " << sub.effect_colour().b << ")";
return s;
}
diff --git a/src/types.cc b/src/types.cc
index 9484939c..6058ea10 100644
--- a/src/types.cc
+++ b/src/types.cc
@@ -61,11 +61,6 @@ bool dcp::operator!= (dcp::Size const & a, dcp::Size const & b)
return !(a == b);
}
-ostream& dcp::operator<< (ostream& s, dcp::Size const & a)
-{
- s << a.width << "x" << a.height;
- return s;
-}
/** Construct a Fraction from a string of the form <numerator> <denominator>
* e.g. "1 3".
@@ -99,12 +94,6 @@ dcp::operator!= (Fraction const & a, Fraction const & b)
return (a.numerator != b.numerator || a.denominator != b.denominator);
}
-ostream&
-dcp::operator<< (ostream& s, Fraction const & f)
-{
- s << f.numerator << "/" << f.denominator;
- return s;
-}
/** Construct a Colour, initialising it to black. */
Colour::Colour ()
@@ -180,12 +169,6 @@ dcp::operator!= (Colour const & a, Colour const & b)
return !(a == b);
}
-ostream &
-dcp::operator<< (ostream& s, Colour const & c)
-{
- s << "(" << c.r << ", " << c.g << ", " << c.b << ")";
- return s;
-}
string
dcp::effect_to_string (Effect e)
@@ -217,14 +200,6 @@ dcp::string_to_effect (string s)
}
-std::ostream&
-dcp::operator<< (std::ostream& s, Effect e)
-{
- s << effect_to_string(e);
- return s;
-}
-
-
string
dcp::halign_to_string (HAlign h)
{
@@ -394,14 +369,6 @@ dcp::content_kind_from_string (string kind)
}
-ostream&
-dcp::operator<< (ostream& s, ContentKind c)
-{
- s << content_kind_to_string(c);
- return s;
-}
-
-
string
dcp::marker_to_string (dcp::Marker m)
{
@@ -479,14 +446,6 @@ dcp::operator== (Rating const & a, Rating const & b)
return a.agency == b.agency && a.label == b.label;
}
-ostream &
-dcp::operator<< (ostream& s, Rating const & r)
-{
- s << r.agency << " " << r.label;
- return s;
-}
-
-
ContentVersion::ContentVersion ()
: id ("urn:uuid:" + make_uuid())
{
@@ -702,65 +661,6 @@ dcp::string_to_status (string s)
}
-ostream&
-dcp::operator<<(ostream& s, Status t)
-{
- s << status_to_string(t);
- return s;
-}
-
-
-ostream&
-dcp::operator<<(ostream& s, dcp::Channel c)
-{
- switch (c) {
- case Channel::LEFT:
- s << "left(0)";
- break;
- case Channel::RIGHT:
- s << "right(1)";
- break;
- case Channel::CENTRE:
- s << "centre(2)";
- break;
- case Channel::LFE:
- s << "lfe(3)";
- break;
- case Channel::LS:
- s << "ls(4)";
- break;
- case Channel::RS:
- s << "rs(5)";
- break;
- case Channel::HI:
- s << "hi(6)";
- break;
- case Channel::VI:
- s << "vi(7)";
- break;
- case Channel::BSL:
- s << "bsl(10)";
- break;
- case Channel::BSR:
- s << "bsr(11)";
- break;
- case Channel::MOTION_DATA:
- s << "motion_data(12)";
- break;
- case Channel::SYNC_SIGNAL:
- s << "sync_signal(13)";
- break;
- case Channel::SIGN_LANGUAGE:
- s << "sign_language(14)";
- break;
- case Channel::CHANNEL_COUNT:
- s << "(16)";
- break;
- }
- return s;
-}
-
-
Channel
dcp::mca_id_to_channel (string id)
{
@@ -938,50 +838,3 @@ dcp::used_audio_channels ()
return c;
}
-
-ostream&
-dcp::operator<< (ostream& s, NoteType t)
-{
- switch (t) {
- case NoteType::PROGRESS:
- s << "progress";
- break;
- case NoteType::ERROR:
- s << "error";
- break;
- case NoteType::NOTE:
- s << "note";
- break;
- }
- return s;
-}
-
-
-ostream&
-dcp::operator<< (ostream& s, MCASoundField f)
-{
- switch (f) {
- case MCASoundField::FIVE_POINT_ONE:
- s << "5.1";
- break;
- case MCASoundField::SEVEN_POINT_ONE:
- s << "7.1";
- break;
- }
- return s;
-}
-
-
-ostream&
-dcp::operator<< (ostream& s, Standard t)
-{
- switch (t) {
- case Standard::INTEROP:
- s << "interop";
- break;
- case Standard::SMPTE:
- s << "smpte";
- break;
- }
- return s;
-}
diff --git a/src/types.h b/src/types.h
index 1f74f7ab..c04b2543 100644
--- a/src/types.h
+++ b/src/types.h
@@ -76,7 +76,6 @@ struct Size
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 class Channel {
@@ -99,7 +98,6 @@ enum class Channel {
};
std::vector<dcp::Channel> used_audio_channels ();
-std::ostream& operator<< (std::ostream& s, Channel c);
enum class MCASoundField
@@ -113,7 +111,6 @@ extern std::string channel_to_mca_id (Channel c, MCASoundField field);
extern Channel mca_id_to_channel (std::string);
extern std::string channel_to_mca_name (Channel c, MCASoundField field);
extern ASDCP::UL channel_to_mca_universal_label (Channel c, MCASoundField field, ASDCP::Dictionary const* dict);
-std::ostream& operator<< (std::ostream& s, MCASoundField f);
enum class ContentKind
@@ -134,7 +131,6 @@ enum class ContentKind
extern std::string content_kind_to_string (ContentKind kind);
extern ContentKind content_kind_from_string (std::string kind);
-std::ostream& operator<<(std::ostream& s, ContentKind c);
enum class Effect
{
@@ -145,7 +141,6 @@ enum class Effect
extern std::string effect_to_string (Effect e);
extern Effect string_to_effect (std::string s);
-std::ostream& operator<< (std::ostream& s, Effect e);
enum class HAlign
{
@@ -212,7 +207,6 @@ public:
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.
@@ -267,14 +261,12 @@ enum class NoteType {
NOTE
};
-std::ostream& operator<< (std::ostream& s, NoteType t);
enum class Standard {
INTEROP,
SMPTE
};
-std::ostream& operator<< (std::ostream& s, Standard t);
enum class Formulation {
MODIFIED_TRANSITIONAL_1,
@@ -305,7 +297,6 @@ public:
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;
@@ -354,7 +345,6 @@ public:
};
extern bool operator== (Rating const & a, Rating const & b);
-extern std::ostream& operator<< (std::ostream& s, Rating const & r);
enum class Status
@@ -367,7 +357,6 @@ enum class Status
extern std::string status_to_string (Status s);
extern Status string_to_status (std::string s);
-std::ostream& operator<< (std::ostream& s, Status t);
class ContentVersion
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-07 10:51:50 +0000