From: Carl Hetherington <cth@carlh.net>
Date: Mon, 24 Feb 2014 13:01:01 +0000 (+0000)
Subject: Tweaks for libdcp.
X-Git-Tag: v2.0.48~911
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=a983bc3abceadae75c7fa070ae394a69e6d8bd5b

Tweaks for libdcp.
---

diff --git a/src/lib/audio_mapping.h b/src/lib/audio_mapping.h
index d3f4c74ab..f3096764c 100644
--- 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 b4a4551b0..d8e28ecfd 100644
--- 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 88c4d635a..e4a2a84bf 100644
--- 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 2b30c0d80..ad1408cff 100644
--- 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 f5e7687bb..14cd640ee 100644
--- 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 09d22b8f7..05f30af55 100644
--- 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 2842b6325..3044efd8d 100644
--- 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 44cb23e1e..0a8b5f287 100644
--- 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 db62dfbe1..2325b29c8 100644
--- 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 26b713dd5..b7006a264 100644
--- 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 901c51284..e463a0e35 100644
--- 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 0a474bab7..51e272faa 100644
--- 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 1c096be71..3220a23b4 100644
--- 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 a312e7381..01df2c570 100644
--- 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 35969a224..00d2f0537 100644
--- 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 a47b2101e..275f4ef15 100644
--- 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 f3354f1b6..cd7d0d6e4 100644
--- 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 895a6fd25..743339baf 100644
--- 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 6639cee7c..f89f40da4 100644
--- 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 2af5f66ae..25ba7592c 100644
--- 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 6a962ca47..e2bd9c9d6 100644
--- 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 a1b40f299..cc4cd9296 100644
--- 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 63b1a5395..725039a7e 100644
--- 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 76dbda190..f625b8572 100644
--- 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 80515ca4d..9d9b58328 100644
--- 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 6ee761384..68469380c 100644
--- 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 a4c10195c..adcaa0c68 100644
--- 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 a74ece149..d95b2ed99 100644
--- 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 bff4f825e..820dc6ae6 100644
--- 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 86f039900..0b28b12fb 100644
--- 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 d636b3b3d..911cb4b3f 100644
--- 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 4ca3fc91b..f94400be7 100644
--- 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 72a315062..0cd7d3c49 100644
--- 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 e8112613c..2e02fa999 100644
--- 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 96c4d08a4..0cf3a616b 100644
--- 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 f4954f517..6699d1ef7 100644
--- 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 8507f5891..88c1bd0f4 100644
--- 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 946eac164..f3784cad2 100644
--- 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 b36130395..c4e4f155d 100644
--- 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 0e0695c03..bfc225f54 100644
--- 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 09416b0cb..e2eda078c 100644
--- 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 1498cd8fe..241032099 100644
--- 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"