summaryrefslogtreecommitdiff
path: root/src/subtitle_image.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-01-21 01:57:06 +0100
committerCarl Hetherington <cth@carlh.net>2021-01-21 01:57:06 +0100
commit76e3325a16cdf6d7220a61e2b5cfdb9c804cc32c (patch)
tree8c1b5e5dc2cec265469a0d8018b6d7396b089432 /src/subtitle_image.cc
parent6c3db78c3d20ef064fa2a0ef38e65ca1ae69adb3 (diff)
Use enum class for the things in types.h
Diffstat (limited to 'src/subtitle_image.cc')
-rw-r--r--src/subtitle_image.cc22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/subtitle_image.cc b/src/subtitle_image.cc
index 99d63d27..7bfc4b86 100644
--- a/src/subtitle_image.cc
+++ b/src/subtitle_image.cc
@@ -117,16 +117,16 @@ bool
SubtitleImage::equals (shared_ptr<SubtitleImage> other, EqualityOptions options, NoteHandler note)
{
if (png_image() != other->png_image()) {
- note (DCP_ERROR, "subtitle image PNG data differs");
+ note (NoteType::ERROR, "subtitle image PNG data differs");
if (options.export_differing_subtitles) {
string const base = "dcpdiff_subtitle_";
if (boost::filesystem::exists(base + "A.png")) {
- note (DCP_ERROR, "could not export subtitle as " + base + "A.png already exists");
+ note (NoteType::ERROR, "could not export subtitle as " + base + "A.png already exists");
} else {
png_image().write(base + "A.png");
}
if (boost::filesystem::exists(base + "B.png")) {
- note (DCP_ERROR, "could not export subtitle as " + base + "B.png already exists");
+ note (NoteType::ERROR, "could not export subtitle as " + base + "B.png already exists");
} else {
other->png_image().write(base + "B.png");
}
@@ -136,42 +136,42 @@ SubtitleImage::equals (shared_ptr<SubtitleImage> other, EqualityOptions options,
}
if (in() != other->in()) {
- note (DCP_ERROR, "subtitle in times differ");
+ note (NoteType::ERROR, "subtitle in times differ");
return false;
}
if (out() != other->out()) {
- note (DCP_ERROR, "subtitle out times differ");
+ note (NoteType::ERROR, "subtitle out times differ");
return false;
}
if (h_position() != other->h_position()) {
- note (DCP_ERROR, "subtitle horizontal positions differ");
+ note (NoteType::ERROR, "subtitle horizontal positions differ");
return false;
}
if (h_align() != other->h_align()) {
- note (DCP_ERROR, "subtitle horizontal alignments differ");
+ note (NoteType::ERROR, "subtitle horizontal alignments differ");
return false;
}
if (v_position() != other->v_position()) {
- note (DCP_ERROR, "subtitle vertical positions differ");
+ note (NoteType::ERROR, "subtitle vertical positions differ");
return false;
}
if (v_align() != other->v_align()) {
- note (DCP_ERROR, "subtitle vertical alignments differ");
+ note (NoteType::ERROR, "subtitle vertical alignments differ");
return false;
}
if (fade_up_time() != other->fade_up_time()) {
- note (DCP_ERROR, "subtitle fade-up times differ");
+ note (NoteType::ERROR, "subtitle fade-up times differ");
return false;
}
if (fade_down_time() != other->fade_down_time()) {
- note (DCP_ERROR, "subtitle fade-down times differ");
+ note (NoteType::ERROR, "subtitle fade-down times differ");
return false;
}