summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-01-20 12:15:04 +0100
committerCarl Hetherington <cth@carlh.net>2021-01-20 12:15:04 +0100
commitf3402802c7f17e883dda8da562e8fe09c6f5c5af (patch)
treeb6180b455dca2d3770f299c1edf7c7d8a4d22eb0 /src
parent101f326ee57264313f8bdc9d47f5fc9ba307c437 (diff)
Cleanup: more test naming tweaks.
Diffstat (limited to 'src')
-rw-r--r--src/cpl.h4
-rw-r--r--src/reel_closed_caption_asset.h4
-rw-r--r--src/reel_subtitle_asset.h4
-rw-r--r--src/smpte_subtitle_asset.h8
4 files changed, 10 insertions, 10 deletions
diff --git a/src/cpl.h b/src/cpl.h
index 5d087c03..28131d64 100644
--- a/src/cpl.h
+++ b/src/cpl.h
@@ -53,7 +53,7 @@
#include <vector>
-struct verify_various_invalid_languages;
+struct verify_invalid_language3;
namespace dcp {
@@ -293,7 +293,7 @@ protected:
std::string pkl_type (Standard standard) const;
private:
- friend struct ::verify_various_invalid_languages;
+ friend struct ::verify_invalid_language3;
void maybe_write_composition_metadata_asset (xmlpp::Element* node) const;
void read_composition_metadata_asset (cxml::ConstNodePtr node);
diff --git a/src/reel_closed_caption_asset.h b/src/reel_closed_caption_asset.h
index 25f1f569..31122299 100644
--- a/src/reel_closed_caption_asset.h
+++ b/src/reel_closed_caption_asset.h
@@ -44,7 +44,7 @@
#include "reel_mxf.h"
-struct verify_invalid_closed_caption_languages;
+struct verify_invalid_language2;
namespace dcp {
@@ -80,7 +80,7 @@ public:
}
private:
- friend struct ::verify_invalid_closed_caption_languages;
+ friend struct ::verify_invalid_language2;
std::string key_type () const;
std::string cpl_node_name (Standard standard) const;
diff --git a/src/reel_subtitle_asset.h b/src/reel_subtitle_asset.h
index 7d2fca06..d1fb3fef 100644
--- a/src/reel_subtitle_asset.h
+++ b/src/reel_subtitle_asset.h
@@ -43,7 +43,7 @@
#include "reel_mxf.h"
#include "subtitle_asset.h"
-struct verify_invalid_language;
+struct verify_invalid_language1;
namespace dcp {
@@ -72,7 +72,7 @@ public:
}
private:
- friend struct ::verify_invalid_language;
+ friend struct ::verify_invalid_language1;
std::string key_type () const;
std::string cpl_node_name (Standard standard) const;
diff --git a/src/smpte_subtitle_asset.h b/src/smpte_subtitle_asset.h
index be6c64fd..12eb58db 100644
--- a/src/smpte_subtitle_asset.h
+++ b/src/smpte_subtitle_asset.h
@@ -48,8 +48,8 @@ namespace ASDCP {
}
}
-struct verify_invalid_closed_caption_languages;
-struct verify_invalid_language;
+struct verify_invalid_language1;
+struct verify_invalid_language2;
namespace dcp {
@@ -175,8 +175,8 @@ protected:
private:
friend struct ::write_smpte_subtitle_test;
friend struct ::write_smpte_subtitle_test2;
- friend struct ::verify_invalid_closed_caption_languages;
- friend struct ::verify_invalid_language;
+ friend struct ::verify_invalid_language1;
+ friend struct ::verify_invalid_language2;
void read_fonts (std::shared_ptr<ASDCP::TimedText::MXFReader>);
void parse_xml (std::shared_ptr<cxml::Document> xml);