Fix some warnings.

diff --git a/src/object.h b/src/object.h
index d44f1be2c6aa1f0280934d8660ed5de9cf8ffa0e..0132a0db12c3cec2ba38999ac8a8248135b07418 100644 (file)
--- a/src/object.h
+++ b/src/object.h
@@ -41,12 +41,12 @@
 #include <boost/noncopyable.hpp>
 #include <string>
 
-class write_interop_subtitle_test;
-class write_interop_subtitle_test2;
-class write_interop_subtitle_test3;
-class write_smpte_subtitle_test;
-class write_smpte_subtitle_test2;
-class write_smpte_subtitle_test3;
+struct write_interop_subtitle_test;
+struct write_interop_subtitle_test2;
+struct write_interop_subtitle_test3;
+struct write_smpte_subtitle_test;
+struct write_smpte_subtitle_test2;
+struct write_smpte_subtitle_test3;
 
 namespace dcp {
 

diff --git a/tools/dcpdecryptmxf.cc b/tools/dcpdecryptmxf.cc
index 6a10c6415c54ad447848fd5e1703d64711692e4a..b5cf6b9be43659983a0c2eafc97276b93aaeeac3 100644 (file)
--- a/tools/dcpdecryptmxf.cc
+++ b/tools/dcpdecryptmxf.cc
@@ -63,58 +63,6 @@ help (string n)
             << "  -p, --private-key  private key file\n";
 }
 
-/* XXX: this method is unused */
-int
-atmos (
-       ASDCP::ATMOS::MXFReader& reader,
-       boost::filesystem::path output_file,
-       dcp::DecryptedKDM kdm
-       )
-{
-       ASDCP::WriterInfo info;
-       if (ASDCP_FAILURE (reader.FillWriterInfo (info))) {
-               cerr << "Could not read ATMOS MXF information\n";
-               exit (EXIT_FAILURE);
-       }
-
-       if (!info.EncryptedEssence) {
-               cerr << "MXF is not encrypted!\n";
-               exit (EXIT_FAILURE);
-       }
-
-       char key_buffer[64];
-       Kumu::bin2UUIDhex (info.CryptographicKeyID, ASDCP::UUIDlen, key_buffer, sizeof (key_buffer));
-       string const key_id = key_buffer;
-
-       optional<dcp::Key> key;
-       BOOST_FOREACH (dcp::DecryptedKDMKey const & i, kdm.keys()) {
-               if (i.id() == key_id) {
-                       key = i.key();
-               }
-       }
-
-       if (!key) {
-               cerr << "Could not find key in KDM.\n";
-               exit (EXIT_FAILURE);
-       }
-
-       dcp::DecryptionContext dc (key.get(), dcp::SMPTE);
-
-       ASDCP::ATMOS::AtmosDescriptor desc;
-       if (ASDCP_FAILURE (reader.FillAtmosDescriptor (desc))) {
-               cerr << "could not read ATMOS descriptor.\n";
-               exit (EXIT_FAILURE);
-       }
-
-       ASDCP::DCData::FrameBuffer buffer (Kumu::Megabyte);
-
-       for (size_t i = 0; i < desc.ContainerDuration; ++i) {
-               reader.ReadFrame (i, buffer, dc.context(), 0);
-       }
-
-       return 0;
-}
-
 int
 main (int argc, char* argv[])
 {