Tweaks for libdcp.

diff --git a/src/lib/audio_mapping.h b/src/lib/audio_mapping.h
index d3f4c74abfeaedce26605fe9c8ed436b6a781df0..f3096764c79c248ddb3bb0a0519efbd6caaa9f8f 100644 (file)
--- a/src/lib/audio_mapping.h
+++ b/src/lib/audio_mapping.h
@@ -21,7 +21,7 @@
 #define DCPOMATIC_AUDIO_MAPPING_H
 
 #include <vector>
-#include <libdcp/types.h>
+#include <dcp/types.h>
 #include <boost/shared_ptr.hpp>
 
 namespace xmlpp {

diff --git a/src/lib/cinema.h b/src/lib/cinema.h
index b4a4551b0e611102d6f58e1bfffa1bb7ecf17916..d8e28ecfdecfecc569d68396cf5742a063a19d4a 100644 (file)
--- a/src/lib/cinema.h
+++ b/src/lib/cinema.h
@@ -18,7 +18,7 @@
 */
 
 #include <boost/enable_shared_from_this.hpp>
-#include <libdcp/certificates.h>
+#include <dcp/certificates.h>
 
 class Cinema;
 

diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc
index 88c4d635ae58a38d237072f3f157c658fd22841e..e4a2a84bff4bc826355d0d20c60bbba4eb9b49e0 100644 (file)
--- a/src/lib/colour_conversion.cc
+++ b/src/lib/colour_conversion.cc
@@ -19,7 +19,7 @@
 
 #include <boost/lexical_cast.hpp>
 #include <libxml++/libxml++.h>
-#include <libdcp/colour_matrix.h>
+#include <dcp/colour_matrix.h>
 #include <libcxml/cxml.h>
 #include "config.h"
 #include "colour_conversion.h"

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 2b30c0d80d9acbb87e13dcb4893826505114289a..ad1408cff89d4f07553ff2056175a3f44f18f780 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -23,7 +23,7 @@
 #include <glib.h>
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
-#include <libdcp/colour_matrix.h>
+#include <dcp/colour_matrix.h>
 #include <libcxml/cxml.h>
 #include "config.h"
 #include "server.h"

diff --git a/src/lib/config.h b/src/lib/config.h
index f5e7687bb5c9a408dfdd0c3f87470a4cfe4fb790..14cd640eeeefb2a042086dd600b447626103f044 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -28,7 +28,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
 #include <boost/filesystem.hpp>
-#include <libdcp/metadata.h>
+#include <dcp/metadata.h>
 #include "dci_metadata.h"
 #include "colour_conversion.h"
 #include "server.h"

diff --git a/src/lib/dcp_content_type.h b/src/lib/dcp_content_type.h
index 09d22b8f75eb6eb18b76954f99607c2ae9b98cc4..05f30af5515d5c4ad1cd5713fb59d6200164a562 100644 (file)
--- a/src/lib/dcp_content_type.h
+++ b/src/lib/dcp_content_type.h
@@ -26,7 +26,7 @@
 
 #include <string>
 #include <vector>
-#include <libdcp/dcp.h>
+#include <dcp/dcp.h>
 
 /** @class DCPContentType
  *  @brief A description of the type of content for a DCP (e.g. feature, trailer etc.)

diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index 2842b6325d7017d964000bb637cab40b9905e274..3044efd8d504a28d3fa517b121c1c1edea0f56a2 100644 (file)
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -43,10 +43,10 @@
 #include <boost/asio.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/lexical_cast.hpp>
-#include <libdcp/gamma_lut.h>
-#include <libdcp/xyz_frame.h>
-#include <libdcp/rgb_xyz.h>
-#include <libdcp/colour_matrix.h>
+#include <dcp/gamma_lut.h>
+#include <dcp/xyz_frame.h>
+#include <dcp/rgb_xyz.h>
+#include <dcp/colour_matrix.h>
 #include <libcxml/cxml.h>
 #include "film.h"
 #include "dcp_video_frame.h"

diff --git a/src/lib/dcp_video_frame.h b/src/lib/dcp_video_frame.h
index 44cb23e1e2f8998ffc04213f3290312787706ba6..0a8b5f287f6860a7d172bbdb483430565895506f 100644 (file)
--- a/src/lib/dcp_video_frame.h
+++ b/src/lib/dcp_video_frame.h
@@ -18,7 +18,7 @@
 
 */
 
-#include <libdcp/picture_mxf_writer.h>
+#include <dcp/picture_mxf_writer.h>
 #include "util.h"
 
 /** @file  src/dcp_video_frame.h

diff --git a/src/lib/decoded.h b/src/lib/decoded.h
index db62dfbe121050c3da67189b84de7ec5bf2464d5..2325b29c830819314f79e4d2ff29924ca2a0112f 100644 (file)
--- a/src/lib/decoded.h
+++ b/src/lib/decoded.h
@@ -20,7 +20,7 @@
 #ifndef DCPOMATIC_LIB_DECODED_H
 #define DCPOMATIC_LIB_DECODED_H
 
-#include <libdcp/subtitle_string.h>
+#include <dcp/subtitle_string.h>
 #include "types.h"
 #include "rect.h"
 #include "util.h"

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 26b713dd56b0f0be8234c5b125c4bd86128b51f0..b7006a264627ed0f0d62c790a31fabd8f00f071e 100644 (file)
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -323,7 +323,7 @@ FFmpegDecoder::minimal_run (boost::function<bool (optional<ContentTime>, optiona
                                        );
                        }
 
-               } else if (_ffmpeg_content->audio_stream() && _packet.stream_index == _ffmpeg_content->audio_stream()->index (_format_context)) {
+               } else if (_ffmpeg_content->audio_stream() && _ffmpeg_content->audio_stream()->uses_index (_format_context, _packet.stream_index)) {
                        AVPacket copy_packet = _packet;
                        while (copy_packet.size > 0) {
 

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 901c512844c9da3585c74fe5149c3a2e1df2b702..e463a0e356c950c2886fab844bdadb30a54f3015 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -31,11 +31,11 @@
 #include <boost/date_time.hpp>
 #include <libxml++/libxml++.h>
 #include <libcxml/cxml.h>
-#include <libdcp/signer_chain.h>
-#include <libdcp/cpl.h>
-#include <libdcp/signer.h>
-#include <libdcp/util.h>
-#include <libdcp/kdm.h>
+#include <dcp/signer_chain.h>
+#include <dcp/cpl.h>
+#include <dcp/signer.h>
+#include <dcp/util.h>
+#include <dcp/kdm.h>
 #include "film.h"
 #include "job.h"
 #include "util.h"

diff --git a/src/lib/film.h b/src/lib/film.h
index 0a474bab7f91b52b530cf12cb261da437e22f545..51e272faa2379c778736a3cb984c862415f7c62e 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -31,8 +31,8 @@
 #include <boost/signals2.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/filesystem.hpp>
-#include <libdcp/key.h>
-#include <libdcp/kdm.h>
+#include <dcp/key.h>
+#include <dcp/kdm.h>
 #include "util.h"
 #include "types.h"
 #include "dci_metadata.h"

diff --git a/src/lib/image.h b/src/lib/image.h
index 1c096be718f8e33cc4b156530cb9ba470950b787..3220a23b4adba6b42632edc4df3355898516d180 100644 (file)
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -31,7 +31,7 @@ extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavfilter/avfilter.h>
 }
-#include <libdcp/image.h>
+#include <dcp/image.h>
 #include "util.h"
 #include "position.h"
 

diff --git a/src/lib/job.cc b/src/lib/job.cc
index a312e738124d93b2e6aa518df0ce0db790f68a17..01df2c570611cf90c2fa38a7aee41f142391725d 100644 (file)
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -23,7 +23,7 @@
 
 #include <boost/thread.hpp>
 #include <boost/filesystem.hpp>
-#include <libdcp/exceptions.h>
+#include <dcp/exceptions.h>
 #include "job.h"
 #include "util.h"
 #include "cross.h"

diff --git a/src/lib/kdm.cc b/src/lib/kdm.cc
index 35969a22470a731cf5a9f0a5f3bcc0875a816194..00d2f053781246e9631d7785ba3739e56de46a9c 100644 (file)
--- a/src/lib/kdm.cc
+++ b/src/lib/kdm.cc
@@ -21,7 +21,7 @@
 #include <boost/shared_ptr.hpp>
 #include <quickmail.h>
 #include <zip.h>
-#include <libdcp/kdm.h>
+#include <dcp/kdm.h>
 #include "kdm.h"
 #include "cinema.h"
 #include "exceptions.h"

diff --git a/src/lib/ratio.cc b/src/lib/ratio.cc
index a47b2101e54a175ae983025852f9d16a7c81ca9a..275f4ef15ab5215a14b6679b6e52ed58b01b77dd 100644 (file)
--- a/src/lib/ratio.cc
+++ b/src/lib/ratio.cc
@@ -17,7 +17,7 @@
 
 */
 
-#include <libdcp/types.h>
+#include <dcp/types.h>
 #include "ratio.h"
 #include "util.h"
 

diff --git a/src/lib/ratio.h b/src/lib/ratio.h
index f3354f1b631c06bad6eda7073c1d75a57dc64866..cd7d0d6e4de276b138f92733b3bbcee99ad5d10a 100644 (file)
--- a/src/lib/ratio.h
+++ b/src/lib/ratio.h
@@ -22,7 +22,7 @@
 
 #include <vector>
 #include <boost/utility.hpp>
-#include <libdcp/util.h>
+#include <dcp/util.h>
 
 class Ratio : public boost::noncopyable
 {

diff --git a/src/lib/render_subtitles.h b/src/lib/render_subtitles.h
index 895a6fd258d72578dde34c7cc0560ba679cc83b7..743339bafc80b109be05e25d5c04549176ea509f 100644 (file)
--- a/src/lib/render_subtitles.h
+++ b/src/lib/render_subtitles.h
@@ -17,8 +17,8 @@
 
 */
 
-#include <libdcp/subtitle_string.h>
-#include <libdcp/util.h>
+#include <dcp/subtitle_string.h>
+#include <dcp/util.h>
 #include "position.h"
 
 class Image;

diff --git a/src/lib/subrip_decoder.cc b/src/lib/subrip_decoder.cc
index 6639cee7cb971a7fabd5f04f36fbbe8c3b67234f..f89f40da4ba706bfd399428a25b040f74519a4a4 100644 (file)
--- a/src/lib/subrip_decoder.cc
+++ b/src/lib/subrip_decoder.cc
@@ -17,7 +17,7 @@
 
 */
 
-#include <libdcp/subtitle_string.h>
+#include <dcp/subtitle_string.h>
 #include "subrip_decoder.h"
 
 using std::list;

diff --git a/src/lib/subrip_subtitle.h b/src/lib/subrip_subtitle.h
index 2af5f66aebb5c37150a7d94466ff206c040a6126..25ba7592c5a8492a104c1f8e433a23246ae46510 100644 (file)
--- a/src/lib/subrip_subtitle.h
+++ b/src/lib/subrip_subtitle.h
@@ -21,7 +21,7 @@
 #define DCPOMATIC_SUBRIP_SUBTITLE_H
 
 #include <boost/optional.hpp>
-#include <libdcp/types.h>
+#include <dcp/types.h>
 #include "types.h"
 
 struct SubRipSubtitlePiece

diff --git a/src/lib/subtitle_decoder.h b/src/lib/subtitle_decoder.h
index 6a962ca4772d879723e79aa69aceedac653fdc26..e2bd9c9d6ee6575ed5a56849eccc83ca6a09bd2d 100644 (file)
--- a/src/lib/subtitle_decoder.h
+++ b/src/lib/subtitle_decoder.h
@@ -21,7 +21,7 @@
 #define DCPOMATIC_SUBTITLE_DECODER_H
 
 #include <boost/signals2.hpp>
-#include <libdcp/subtitle_string.h>
+#include <dcp/subtitle_string.h>
 #include "decoder.h"
 #include "rect.h"
 #include "types.h"

diff --git a/src/lib/types.h b/src/lib/types.h
index a1b40f29939c87a050dd9f4a04cd85f591de8c0b..cc4cd9296b077edc53f04e11e1a0cc3d3871d668 100644 (file)
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -23,7 +23,7 @@
 #include <vector>
 #include <stdint.h>
 #include <boost/shared_ptr.hpp>
-#include <libdcp/util.h>
+#include <dcp/util.h>
 
 class Content;
 class VideoContent;

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 63b1a5395f23ac6036cc35a93b55ce0849451f2f..725039a7eb7a379cb487b9e51d15e013dba07049 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -49,10 +49,10 @@
 #include <magick/MagickCore.h>
 #include <magick/version.h>
 #include <pangomm/init.h>
-#include <libdcp/version.h>
-#include <libdcp/util.h>
-#include <libdcp/signer_chain.h>
-#include <libdcp/signer.h>
+#include <dcp/version.h>
+#include <dcp/util.h>
+#include <dcp/signer_chain.h>
+#include <dcp/signer.h>
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
@@ -992,8 +992,8 @@ split_get_request (string url)
        return r;
 }
 
-libdcp::Size
-fit_ratio_within (float ratio, libdcp::Size full_frame)
+dcp::Size
+fit_ratio_within (float ratio, dcp::Size full_frame)
 {
        if (ratio < full_frame.ratio ()) {
                return dcp::Size (rint (full_frame.height * ratio), full_frame.height);

diff --git a/src/lib/util.h b/src/lib/util.h
index 76dbda190d7b2960c335014cc56626085c816f15..f625b85729ab37e151ee40b4ac537bb8e5d29d5f 100644 (file)
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -31,8 +31,8 @@
 #include <boost/asio.hpp>
 #include <boost/optional.hpp>
 #include <boost/filesystem.hpp>
-#include <libdcp/util.h>
-#include <libdcp/signer.h>
+#include <dcp/util.h>
+#include <dcp/signer.h>
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavfilter/avfilter.h>

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 80515ca4d8ed87ff99f5e154ce2f68717f240ddb..9d9b583286dd29471763dc7007c3ab90b8f8a831 100644 (file)
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -19,7 +19,7 @@
 
 #include <iomanip>
 #include <libcxml/cxml.h>
-#include <libdcp/colour_matrix.h>
+#include <dcp/colour_matrix.h>
 #include "video_content.h"
 #include "video_examiner.h"
 #include "ratio.h"

diff --git a/src/lib/video_examiner.h b/src/lib/video_examiner.h
index 6ee761384a9064159e7f423dc4640d511ab724e3..68469380ce4d5f261f81c85bc787b0b3fd06a358 100644 (file)
--- a/src/lib/video_examiner.h
+++ b/src/lib/video_examiner.h
@@ -17,7 +17,7 @@
 
 */
 
-#include <libdcp/types.h>
+#include <dcp/types.h>
 #include "types.h"
 #include "video_content.h"
 

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index a4c10195c5b156aba190b0ccb4d90560109f58a0..adcaa0c689031f3afe2ae6c969701fa9c0e1afbc 100644 (file)
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -19,16 +19,16 @@
 
 #include <fstream>
 #include <cerrno>
-#include <libdcp/mono_picture_mxf.h>
-#include <libdcp/stereo_picture_mxf.h>
-#include <libdcp/sound_mxf.h>
-#include <libdcp/sound_mxf_writer.h>
-#include <libdcp/reel.h>
-#include <libdcp/reel_mono_picture_asset.h>
-#include <libdcp/reel_stereo_picture_asset.h>
-#include <libdcp/reel_sound_asset.h>
-#include <libdcp/dcp.h>
-#include <libdcp/cpl.h>
+#include <dcp/mono_picture_mxf.h>
+#include <dcp/stereo_picture_mxf.h>
+#include <dcp/sound_mxf.h>
+#include <dcp/sound_mxf_writer.h>
+#include <dcp/reel.h>
+#include <dcp/reel_mono_picture_asset.h>
+#include <dcp/reel_stereo_picture_asset.h>
+#include <dcp/reel_sound_asset.h>
+#include <dcp/dcp.h>
+#include <dcp/cpl.h>
 #include "writer.h"
 #include "compose.hpp"
 #include "film.h"

diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index a74ece149af2b9e96e7cd46103917dec5bfe98f1..d95b2ed99f63fac0a2c0e923c4272bedf1fa69ae 100644 (file)
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -20,7 +20,7 @@
 #include <iostream>
 #include <iomanip>
 #include <getopt.h>
-#include <libdcp/version.h>
+#include <dcp/version.h>
 #include "lib/film.h"
 #include "lib/filter.h"
 #include "lib/transcode_job.h"

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index bff4f825e873d56d1df0192b685d6b6d924cd0c5..820dc6ae64e5ef58f6ee273419258f00635cce80 100644 (file)
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -18,7 +18,7 @@
 */
 
 #include <getopt.h>
-#include <libdcp/certificates.h>
+#include <dcp/certificates.h>
 #include "lib/film.h"
 #include "lib/cinema.h"
 #include "lib/kdm.h"

diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc
index 86f0399003787643955d7f66cf5df7ec9acb1f9c..0b28b12fb641201ca438c71fff61330951666f15 100644 (file)
--- a/src/wx/audio_mapping_view.cc
+++ b/src/wx/audio_mapping_view.cc
@@ -20,7 +20,7 @@
 #include <wx/wx.h>
 #include <wx/renderer.h>
 #include <wx/grid.h>
-#include <libdcp/types.h>
+#include <dcp/types.h>
 #include "lib/audio_mapping.h"
 #include "lib/util.h"
 #include "audio_mapping_view.h"

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index d636b3b3d131f022f53523264f96f90f58d9fd10..911cb4b3f3cf07efb19d28aa8deeb948d2107926 100644 (file)
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -26,7 +26,7 @@
 #include <boost/filesystem.hpp>
 #include <wx/stdpaths.h>
 #include <wx/notebook.h>
-#include <libdcp/colour_matrix.h>
+#include <dcp/colour_matrix.h>
 #include "lib/config.h"
 #include "lib/ratio.h"
 #include "lib/scaler.h"

diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index 4ca3fc91baa42e47a1eac95f908f7d9dacefd65e..f94400be7fed94ff873601d5f7740a714fe41089 100644 (file)
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -19,7 +19,7 @@
 
 #include <wx/filepicker.h>
 #include <wx/validate.h>
-#include <libdcp/exceptions.h>
+#include <dcp/exceptions.h>
 #include "lib/compose.hpp"
 #include "screen_dialog.h"
 #include "wx_util.h"

diff --git a/src/wx/screen_dialog.h b/src/wx/screen_dialog.h
index 72a315062fbfdfaadcc59423f147704a6b94a61f..0cd7d3c4963f77da9ab7eb0f0bcb7b1cc073d1f2 100644 (file)
--- a/src/wx/screen_dialog.h
+++ b/src/wx/screen_dialog.h
@@ -19,7 +19,7 @@
 
 #include <wx/wx.h>
 #include <boost/shared_ptr.hpp>
-#include <libdcp/certificates.h>
+#include <dcp/certificates.h>
 
 class ScreenDialog : public wxDialog
 {

diff --git a/test/audio_delay_test.cc b/test/audio_delay_test.cc
index e8112613c8b2f563bd209b91681af2b07741e9c1..2e02fa999e9b1e5d617bf2c0bc5b9f064dec60b3 100644 (file)
--- a/test/audio_delay_test.cc
+++ b/test/audio_delay_test.cc
@@ -18,11 +18,11 @@
 */
 
 #include <boost/test/unit_test.hpp>
-#include <libdcp/sound_frame.h>
-#include <libdcp/cpl.h>
-#include <libdcp/reel.h>
-#include <libdcp/sound_mxf.h>
-#include <libdcp/reel_sound_asset.h>
+#include <dcp/sound_frame.h>
+#include <dcp/cpl.h>
+#include <dcp/reel.h>
+#include <dcp/sound_mxf.h>
+#include <dcp/reel_sound_asset.h>
 #include "lib/sndfile_content.h"
 #include "lib/dcp_content_type.h"
 #include "lib/ratio.h"

diff --git a/test/colour_conversion_test.cc b/test/colour_conversion_test.cc
index 96c4d08a4fc19528d7d763b427b0b86ee23df5df..0cf3a616b20992373e6a9ca777331b0aa1149723 100644 (file)
--- a/test/colour_conversion_test.cc
+++ b/test/colour_conversion_test.cc
@@ -18,7 +18,7 @@
 */
 
 #include <boost/test/unit_test.hpp>
-#include <libdcp/colour_matrix.h>
+#include <dcp/colour_matrix.h>
 #include "lib/colour_conversion.h"
 
 using std::cout;

diff --git a/test/ffmpeg_audio_test.cc b/test/ffmpeg_audio_test.cc
index f4954f517daa9db38a38edc167fede450caf710c..6699d1ef7ca6247a645d9eb902d40098ae882038 100644 (file)
--- a/test/ffmpeg_audio_test.cc
+++ b/test/ffmpeg_audio_test.cc
@@ -22,12 +22,12 @@
  */
 
 #include <boost/test/unit_test.hpp>
-#include <libdcp/cpl.h>
-#include <libdcp/dcp.h>
-#include <libdcp/sound_mxf.h>
-#include <libdcp/sound_frame.h>
-#include <libdcp/reel_sound_asset.h>
-#include <libdcp/reel.h>
+#include <dcp/cpl.h>
+#include <dcp/dcp.h>
+#include <dcp/sound_mxf.h>
+#include <dcp/sound_frame.h>
+#include <dcp/reel_sound_asset.h>
+#include <dcp/reel.h>
 #include "lib/sndfile_content.h"
 #include "lib/film.h"
 #include "lib/dcp_content_type.h"

diff --git a/test/make_black_test.cc b/test/make_black_test.cc
index 8507f58916c3deb0131c260b88bc7b4919be4f05..88c1bd0f46d7f60c293b7a20d911e46ea1b8aa3f 100644 (file)
--- a/test/make_black_test.cc
+++ b/test/make_black_test.cc
@@ -18,7 +18,7 @@
 */
 
 #include <boost/test/unit_test.hpp>
-#include <libdcp/util.h>
+#include <dcp/util.h>
 extern "C" {
 #include <libavutil/pixfmt.h>
 }

diff --git a/test/ratio_test.cc b/test/ratio_test.cc
index 946eac1640063ca8a0465ee083af9d840b29c0a3..f3784cad292d4ac5b2076d00e0a2174ae8075107 100644 (file)
--- a/test/ratio_test.cc
+++ b/test/ratio_test.cc
@@ -19,7 +19,7 @@
 
 #include <iostream>
 #include <boost/test/unit_test.hpp>
-#include <libdcp/util.h>
+#include <dcp/util.h>
 #include "lib/ratio.h"
 #include "lib/util.h"
 

diff --git a/test/recover_test.cc b/test/recover_test.cc
index b36130395e5b5efd8eb60846f2e59ccc399a1c46..c4e4f155daaf96736b0cd073b3f33616ed679da4 100644 (file)
--- a/test/recover_test.cc
+++ b/test/recover_test.cc
@@ -18,7 +18,7 @@
 */
 
 #include <boost/test/unit_test.hpp>
-#include <libdcp/stereo_picture_mxf.h>
+#include <dcp/stereo_picture_mxf.h>
 #include "lib/film.h"
 #include "lib/dcp_content_type.h"
 #include "lib/image_content.h"

diff --git a/test/silence_padding_test.cc b/test/silence_padding_test.cc
index 0e0695c033b0b90af3f9d8ca92c12b5350c20883..bfc225f546be88e6a84bcd39ebe44d0fe96a6515 100644 (file)
--- a/test/silence_padding_test.cc
+++ b/test/silence_padding_test.cc
@@ -18,12 +18,12 @@
 */
 
 #include <boost/test/unit_test.hpp>
-#include <libdcp/cpl.h>
-#include <libdcp/dcp.h>
-#include <libdcp/sound_mxf.h>
-#include <libdcp/sound_frame.h>
-#include <libdcp/reel.h>
-#include <libdcp/reel_sound_asset.h>
+#include <dcp/cpl.h>
+#include <dcp/dcp.h>
+#include <dcp/sound_mxf.h>
+#include <dcp/sound_frame.h>
+#include <dcp/reel.h>
+#include <dcp/reel_sound_asset.h>
 #include "lib/sndfile_content.h"
 #include "lib/film.h"
 #include "lib/dcp_content_type.h"

diff --git a/test/subrip_test.cc b/test/subrip_test.cc
index 09416b0cb0c4fb7ff9ad368911c6890982ae002c..e2eda078c3feb87be588ee19bd7eb4ee7912699e 100644 (file)
--- a/test/subrip_test.cc
+++ b/test/subrip_test.cc
@@ -18,7 +18,7 @@
 */
 
 #include <boost/test/unit_test.hpp>
-#include <libdcp/subtitle_content.h>
+#include <dcp/subtitle_content.h>
 #include "lib/subrip.h"
 #include "lib/subrip_content.h"
 #include "lib/subrip_decoder.h"

diff --git a/test/test.cc b/test/test.cc
index 1498cd8feb671e06256881132ee3645b3313a6af..241032099b8922ebf7935c971978dcba6ac898f0 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -21,7 +21,7 @@
 #include <list>
 #include <Magick++.h>
 #include <libxml++/libxml++.h>
-#include <libdcp/dcp.h>
+#include <dcp/dcp.h>
 #include "lib/config.h"
 #include "lib/util.h"
 #include "lib/ui_signaller.h"