Move raw_convert into libdcp.

diff --git a/src/lib/audio_analysis.cc b/src/lib/audio_analysis.cc
index 1863e38eeae85bf633c79151dc335fd4e3d9be09..1e5d089257d86c4f4aed253f2616c67af2d6b00b 100644 (file)
--- a/src/lib/audio_analysis.cc
+++ b/src/lib/audio_analysis.cc
@@ -21,9 +21,9 @@
 #include "audio_analysis.h"
 #include "cross.h"
 #include "util.h"
 #include "audio_analysis.h"
 #include "cross.h"
 #include "util.h"

-#include "raw_convert.h"

 #include "playlist.h"
 #include "audio_content.h"
 #include "playlist.h"
 #include "audio_content.h"

+#include <dcp/raw_convert.h>

 #include <libxml++/libxml++.h>
 #include <boost/filesystem.hpp>
 #include <boost/foreach.hpp>
 #include <libxml++/libxml++.h>
 #include <boost/filesystem.hpp>
 #include <boost/foreach.hpp>


@@ -42,6 +42,7 @@ using std::max;
 using std::list;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using std::list;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;

+using dcp::raw_convert;

 
 AudioAnalysis::AudioAnalysis (int channels)
 {
 
 AudioAnalysis::AudioAnalysis (int channels)
 {

diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index 4e9d5cd5cee5395b3a22058fd0cf6c08f57e1e57..e66b8b998ded170d9ec2d56df47417c278c653b7 100644 (file)
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -23,8 +23,8 @@
 #include "exceptions.h"
 #include "config.h"
 #include "frame_rate_change.h"
 #include "exceptions.h"
 #include "config.h"
 #include "frame_rate_change.h"

-#include "raw_convert.h"

 #include "compose.hpp"
 #include "compose.hpp"

+#include <dcp/raw_convert.h>

 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>


@@ -42,6 +42,7 @@ using std::setprecision;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;

+using dcp::raw_convert;

 
 /** Something stream-related has changed */
 int const AudioContentProperty::STREAMS = 200;
 
 /** Something stream-related has changed */
 int const AudioContentProperty::STREAMS = 200;

diff --git a/src/lib/audio_mapping.cc b/src/lib/audio_mapping.cc
index b436d757988a3e054657d627b6d9258fde308380..bf454b5e5e43cddbdfa48695e5e9fc01eacc863d 100644 (file)
--- a/src/lib/audio_mapping.cc
+++ b/src/lib/audio_mapping.cc
@@ -21,7 +21,7 @@
 #include "audio_mapping.h"
 #include "util.h"
 #include "digester.h"
 #include "audio_mapping.h"
 #include "util.h"
 #include "digester.h"

-#include "raw_convert.h"
+#include <dcp/raw_convert.h>

 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <iostream>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <iostream>


@@ -36,6 +36,7 @@ using std::vector;
 using std::abs;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using std::abs;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;

+using dcp::raw_convert;

 
 AudioMapping::AudioMapping ()
        : _input_channels (0)
 
 AudioMapping::AudioMapping ()
        : _input_channels (0)

diff --git a/src/lib/audio_point.cc b/src/lib/audio_point.cc
index 45df0b3a5348f6bf624992e3ef1471f105e13d1b..b5ea2c31e6b0a81616536b05a2dd8bfe3911255b 100644 (file)
--- a/src/lib/audio_point.cc
+++ b/src/lib/audio_point.cc
@@ -19,10 +19,11 @@
 */
 
 #include "audio_point.h"
 */
 
 #include "audio_point.h"

-#include "raw_convert.h"
+#include <dcp/raw_convert.h>

 #include <libxml++/libxml++.h>
 
 using std::string;
 #include <libxml++/libxml++.h>
 
 using std::string;

+using dcp::raw_convert;

 
 AudioPoint::AudioPoint ()
 {
 
 AudioPoint::AudioPoint ()
 {

diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc
index f17964ddccb0521cdcf9df31aa45832503ec2d9b..e4659a5d9231e2b15af01fbc0911a47d4a3c9c94 100644 (file)
--- a/src/lib/colour_conversion.cc
+++ b/src/lib/colour_conversion.cc
@@ -22,7 +22,7 @@
 #include "colour_conversion.h"
 #include "util.h"
 #include "digester.h"
 #include "colour_conversion.h"
 #include "util.h"
 #include "digester.h"

-#include "raw_convert.h"
+#include <dcp/raw_convert.h>

 #include <dcp/chromaticity.h>
 #include <dcp/colour_matrix.h>
 #include <dcp/gamma_transfer_function.h>
 #include <dcp/chromaticity.h>
 #include <dcp/colour_matrix.h>
 #include <dcp/gamma_transfer_function.h>


@@ -41,6 +41,7 @@ using std::vector;
 using boost::shared_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;
 using boost::shared_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;

+using dcp::raw_convert;

 
 vector<PresetColourConversion> PresetColourConversion::_presets;
 
 
 vector<PresetColourConversion> PresetColourConversion::_presets;
 

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 6f7c8ec556c369a21b5d47b96190a85902789530..7f457439d98f0f8a2b1b4c2fcf22b68cc74a8f0c 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -29,7 +29,7 @@
 #include "cinema.h"
 #include "util.h"
 #include "cross.h"
 #include "cinema.h"
 #include "util.h"
 #include "cross.h"

-#include "raw_convert.h"
+#include <dcp/raw_convert.h>

 #include <dcp/name_format.h>
 #include <dcp/colour_matrix.h>
 #include <dcp/certificate_chain.h>
 #include <dcp/name_format.h>
 #include <dcp/colour_matrix.h>
 #include <dcp/certificate_chain.h>


@@ -58,6 +58,7 @@ using std::cerr;
 using boost::shared_ptr;
 using boost::optional;
 using boost::algorithm::trim;
 using boost::shared_ptr;
 using boost::optional;
 using boost::algorithm::trim;

+using dcp::raw_convert;

 
 Config* Config::_instance = 0;
 boost::signals2::signal<void ()> Config::FailedToLoad;
 
 Config* Config::_instance = 0;
 boost::signals2::signal<void ()> Config::FailedToLoad;

diff --git a/src/lib/content.cc b/src/lib/content.cc
index 9c7e790402c157aa7ffec1ad20a7b1e79e30948d..0fd503edd5134a8a809a579801e2b23bbab1381f 100644 (file)
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -29,7 +29,7 @@
 #include "film.h"
 #include "job.h"
 #include "compose.hpp"
 #include "film.h"
 #include "job.h"
 #include "compose.hpp"

-#include "raw_convert.h"
+#include <dcp/raw_convert.h>

 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/thread/mutex.hpp>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/thread/mutex.hpp>


@@ -44,6 +44,7 @@ using std::vector;
 using std::max;
 using std::pair;
 using boost::shared_ptr;
 using std::max;
 using std::pair;
 using boost::shared_ptr;

+using dcp::raw_convert;

 
 int const ContentProperty::PATH = 400;
 int const ContentProperty::POSITION = 401;
 
 int const ContentProperty::PATH = 400;
 int const ContentProperty::POSITION = 401;

diff --git a/src/lib/content.h b/src/lib/content.h
index 6b647790f2d635b9a038b5038513f40fce96dd8e..f8b5493c0eb400d4e32c995d83ce8733e90903e4 100644 (file)
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -28,7 +28,6 @@
 #include "types.h"
 #include "signaller.h"
 #include "dcpomatic_time.h"
 #include "types.h"
 #include "signaller.h"
 #include "dcpomatic_time.h"

-#include "raw_convert.h"

 #include "user_property.h"
 #include <libcxml/cxml.h>
 #include <boost/filesystem.hpp>
 #include "user_property.h"
 #include <libcxml/cxml.h>
 #include <boost/filesystem.hpp>

diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index b41e31c0cc684a76f82e39ff90df5a478b61ac84..9e767596cf7619e34ae6673a53d21c054036496a 100644 (file)
--- a/src/lib/dcp_content.cc
+++ b/src/lib/dcp_content.cc
@@ -50,6 +50,7 @@ using boost::shared_ptr;
 using boost::scoped_ptr;
 using boost::optional;
 using boost::function;
 using boost::scoped_ptr;
 using boost::optional;
 using boost::function;

+using dcp::raw_convert;

 
 int const DCPContentProperty::CAN_BE_PLAYED      = 600;
 int const DCPContentProperty::REFERENCE_VIDEO    = 601;
 
 int const DCPContentProperty::CAN_BE_PLAYED      = 600;
 int const DCPContentProperty::REFERENCE_VIDEO    = 601;

diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc
index e7057efc4b59528585e77965d88233d52275cf7b..015aebd722c9d973196043f9aafcbb5add93ffaf 100644 (file)
--- a/src/lib/dcp_subtitle_content.cc
+++ b/src/lib/dcp_subtitle_content.cc
@@ -20,9 +20,9 @@
 
 #include "font.h"
 #include "dcp_subtitle_content.h"
 
 #include "font.h"
 #include "dcp_subtitle_content.h"

-#include "raw_convert.h"

 #include "film.h"
 #include "subtitle_content.h"
 #include "film.h"
 #include "subtitle_content.h"

+#include <dcp/raw_convert.h>

 #include <dcp/interop_subtitle_asset.h>
 #include <dcp/smpte_subtitle_asset.h>
 #include <dcp/interop_load_font_node.h>
 #include <dcp/interop_subtitle_asset.h>
 #include <dcp/smpte_subtitle_asset.h>
 #include <dcp/interop_load_font_node.h>


@@ -35,6 +35,7 @@ using std::string;
 using std::list;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using std::list;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;

+using dcp::raw_convert;

 
 DCPSubtitleContent::DCPSubtitleContent (shared_ptr<const Film> film, boost::filesystem::path path)
        : Content (film, path)
 
 DCPSubtitleContent::DCPSubtitleContent (shared_ptr<const Film> film, boost::filesystem::path path)
        : Content (film, path)

diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc
index be69f3eedc1255740f221379b53c229a8833688b..e3ba7d20fdfb3dbec68cb4a165e00b44c6aa7522 100644 (file)
--- a/src/lib/dcp_video.cc
+++ b/src/lib/dcp_video.cc
@@ -37,9 +37,9 @@
 #include "log.h"
 #include "cross.h"
 #include "player_video.h"
 #include "log.h"
 #include "cross.h"
 #include "player_video.h"

-#include "raw_convert.h"

 #include "compose.hpp"
 #include <libcxml/cxml.h>
 #include "compose.hpp"
 #include <libcxml/cxml.h>

+#include <dcp/raw_convert.h>

 #include <dcp/openjpeg_image.h>
 #include <dcp/rgb_xyz.h>
 #include <dcp/j2k.h>
 #include <dcp/openjpeg_image.h>
 #include <dcp/rgb_xyz.h>
 #include <dcp/j2k.h>


@@ -62,6 +62,7 @@ using std::cout;
 using boost::shared_ptr;
 using dcp::Size;
 using dcp::Data;
 using boost::shared_ptr;
 using dcp::Size;
 using dcp::Data;

+using dcp::raw_convert;

 
 #define DCI_COEFFICENT (48.0 / 52.37)
 
 
 #define DCI_COEFFICENT (48.0 / 52.37)
 

diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc
index abd8537c01786475c927ad1a09ac1ba9cb40a063..442ce3d6f4b41377c69874bf45a1ec44e2f90a43 100644 (file)
--- a/src/lib/encode_server.cc
+++ b/src/lib/encode_server.cc
@@ -31,10 +31,10 @@
 #include "config.h"
 #include "cross.h"
 #include "player_video.h"
 #include "config.h"
 #include "cross.h"
 #include "player_video.h"

-#include "raw_convert.h"

 #include "compose.hpp"
 #include "log.h"
 #include "encoded_log_entry.h"
 #include "compose.hpp"
 #include "log.h"
 #include "encoded_log_entry.h"

+#include <dcp/raw_convert.h>

 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/algorithm/string.hpp>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/algorithm/string.hpp>


@@ -64,6 +64,7 @@ using boost::scoped_array;
 using boost::optional;
 using dcp::Size;
 using dcp::Data;
 using boost::optional;
 using dcp::Size;
 using dcp::Data;

+using dcp::raw_convert;

 
 EncodeServer::EncodeServer (shared_ptr<Log> log, bool verbose, int num_threads)
        : Server (Config::instance()->server_port_base())
 
 EncodeServer::EncodeServer (shared_ptr<Log> log, bool verbose, int num_threads)
        : Server (Config::instance()->server_port_base())

diff --git a/src/lib/encode_server_finder.cc b/src/lib/encode_server_finder.cc
index 135a8bce8219539f676e37f18b3e05079f38b46c..e964bb8b34a76746424c5712fa84edde152b3662 100644 (file)
--- a/src/lib/encode_server_finder.cc
+++ b/src/lib/encode_server_finder.cc
@@ -25,7 +25,7 @@
 #include "cross.h"
 #include "encode_server_description.h"
 #include "dcpomatic_socket.h"
 #include "cross.h"
 #include "encode_server_description.h"
 #include "dcpomatic_socket.h"

-#include "raw_convert.h"
+#include <dcp/raw_convert.h>

 #include <libcxml/cxml.h>
 #include <boost/lambda/lambda.hpp>
 #include <iostream>
 #include <libcxml/cxml.h>
 #include <boost/lambda/lambda.hpp>
 #include <iostream>


@@ -39,6 +39,7 @@ using std::cout;
 using boost::shared_ptr;
 using boost::scoped_array;
 using boost::weak_ptr;
 using boost::shared_ptr;
 using boost::scoped_array;
 using boost::weak_ptr;

+using dcp::raw_convert;

 
 EncodeServerFinder* EncodeServerFinder::_instance = 0;
 
 
 EncodeServerFinder* EncodeServerFinder::_instance = 0;
 

diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc
index bbf9bbed9405fb602b1fd2d69f69d408daa5fc00..1f16514d7496b780b31d1ff5a4002d54c0f63923 100644 (file)
--- a/src/lib/ffmpeg.cc
+++ b/src/lib/ffmpeg.cc
@@ -23,12 +23,12 @@
 #include "film.h"
 #include "exceptions.h"
 #include "util.h"
 #include "film.h"
 #include "exceptions.h"
 #include "util.h"

-#include "raw_convert.h"

 #include "log.h"
 #include "ffmpeg_subtitle_stream.h"
 #include "ffmpeg_audio_stream.h"
 #include "digester.h"
 #include "compose.hpp"
 #include "log.h"
 #include "ffmpeg_subtitle_stream.h"
 #include "ffmpeg_audio_stream.h"
 #include "digester.h"
 #include "compose.hpp"

+#include <dcp/raw_convert.h>

 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>


@@ -46,6 +46,7 @@ using std::cerr;
 using std::vector;
 using boost::shared_ptr;
 using boost::optional;
 using std::vector;
 using boost::shared_ptr;
 using boost::optional;

+using dcp::raw_convert;

 
 boost::mutex FFmpeg::_mutex;
 boost::weak_ptr<Log> FFmpeg::_ffmpeg_log;
 
 boost::mutex FFmpeg::_mutex;
 boost::weak_ptr<Log> FFmpeg::_ffmpeg_log;

diff --git a/src/lib/ffmpeg_audio_stream.cc b/src/lib/ffmpeg_audio_stream.cc
index a81f69e65678d67ac4360b0ad435b171f6f865cb..1b0d39db27902cf6ac87459c90b5c35ecd1f9249 100644 (file)
--- a/src/lib/ffmpeg_audio_stream.cc
+++ b/src/lib/ffmpeg_audio_stream.cc
@@ -19,12 +19,13 @@
 */
 
 #include "ffmpeg_audio_stream.h"
 */
 
 #include "ffmpeg_audio_stream.h"

-#include "raw_convert.h"
+#include <dcp/raw_convert.h>

 #include <libxml++/libxml++.h>
 #include <libcxml/cxml.h>
 
 using std::string;
 using boost::optional;
 #include <libxml++/libxml++.h>
 #include <libcxml/cxml.h>
 
 using std::string;
 using boost::optional;

+using dcp::raw_convert;

 
 FFmpegAudioStream::FFmpegAudioStream (cxml::ConstNodePtr node, int version)
        : FFmpegStream (node)
 
 FFmpegAudioStream::FFmpegAudioStream (cxml::ConstNodePtr node, int version)
        : FFmpegStream (node)

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 9f8cb78a60dce3596778facad10f15b8c1642f20..d64c829711ee98729cdb6811a4a266f0b2545c82 100644 (file)
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -32,8 +32,8 @@
 #include "log.h"
 #include "exceptions.h"
 #include "frame_rate_change.h"
 #include "log.h"
 #include "exceptions.h"
 #include "frame_rate_change.h"

-#include "raw_convert.h"

 #include "subtitle_content.h"
 #include "subtitle_content.h"

+#include <dcp/raw_convert.h>

 #include <libcxml/cxml.h>
 extern "C" {
 #include <libavformat/avformat.h>
 #include <libcxml/cxml.h>
 extern "C" {
 #include <libavformat/avformat.h>


@@ -57,6 +57,7 @@ using std::max;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;

+using dcp::raw_convert;

 
 int const FFmpegContentProperty::SUBTITLE_STREAMS = 100;
 int const FFmpegContentProperty::SUBTITLE_STREAM = 101;
 
 int const FFmpegContentProperty::SUBTITLE_STREAMS = 100;
 int const FFmpegContentProperty::SUBTITLE_STREAM = 101;

diff --git a/src/lib/ffmpeg_stream.cc b/src/lib/ffmpeg_stream.cc
index 7a8748e4e3f762f9fe9ea8287b8d8cb6a09cc14f..86108ce4d1ea24ab38bf5ed29634344608376e1f 100644 (file)
--- a/src/lib/ffmpeg_stream.cc
+++ b/src/lib/ffmpeg_stream.cc
@@ -20,13 +20,14 @@
 
 #include "ffmpeg_stream.h"
 #include "dcpomatic_assert.h"
 
 #include "ffmpeg_stream.h"
 #include "dcpomatic_assert.h"

-#include "raw_convert.h"
+#include <dcp/raw_convert.h>

 #include <libxml++/libxml++.h>
 extern "C" {
 #include <libavformat/avformat.h>
 }
 
 using std::string;
 #include <libxml++/libxml++.h>
 extern "C" {
 #include <libavformat/avformat.h>
 }
 
 using std::string;

+using dcp::raw_convert;

 
 FFmpegStream::FFmpegStream (cxml::ConstNodePtr node)
        : name (node->string_child ("Name"))
 
 FFmpegStream::FFmpegStream (cxml::ConstNodePtr node)
        : name (node->string_child ("Name"))

diff --git a/src/lib/ffmpeg_subtitle_stream.cc b/src/lib/ffmpeg_subtitle_stream.cc
index eb870c24164e3bb362b8385d2ff8f6162b8c23d5..627b0fef1c8b61b6890397c97282f4d42f7700af 100644 (file)
--- a/src/lib/ffmpeg_subtitle_stream.cc
+++ b/src/lib/ffmpeg_subtitle_stream.cc
@@ -19,7 +19,7 @@
 */
 
 #include "ffmpeg_subtitle_stream.h"
 */
 
 #include "ffmpeg_subtitle_stream.h"

-#include "raw_convert.h"
+#include <dcp/raw_convert.h>

 #include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
 #include <iostream>
 #include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
 #include <iostream>


@@ -29,6 +29,7 @@ using std::map;
 using std::list;
 using std::cout;
 using std::make_pair;
 using std::list;
 using std::cout;
 using std::make_pair;

+using dcp::raw_convert;

 
 /** Construct a SubtitleStream from a value returned from to_string().
  *  @param t String returned from to_string().
 
 /** Construct a SubtitleStream from a value returned from to_string().
  *  @param t String returned from to_string().

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 28017669bd035afa2e7cb00327c23c27888e62da..58c272eb16bedb078e901e91ca38da63e400176f 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -39,7 +39,6 @@
 #include "ratio.h"
 #include "cross.h"
 #include "environment_info.h"
 #include "ratio.h"
 #include "cross.h"
 #include "environment_info.h"

-#include "raw_convert.h"

 #include "audio_processor.h"
 #include "digester.h"
 #include "compose.hpp"
 #include "audio_processor.h"
 #include "digester.h"
 #include "compose.hpp"


@@ -57,6 +56,7 @@
 #include <dcp/util.h>
 #include <dcp/local_time.h>
 #include <dcp/decrypted_kdm.h>
 #include <dcp/util.h>
 #include <dcp/local_time.h>
 #include <dcp/decrypted_kdm.h>

+#include <dcp/raw_convert.h>

 #include <libxml++/libxml++.h>
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
 #include <libxml++/libxml++.h>
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>


@@ -88,6 +88,7 @@ using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
 using boost::is_any_of;
 using boost::dynamic_pointer_cast;
 using boost::optional;
 using boost::is_any_of;

+using dcp::raw_convert;

 
 #define LOG_GENERAL(...) log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
 #define LOG_GENERAL_NC(...) log()->log (__VA_ARGS__, LogEntry::TYPE_GENERAL);
 
 #define LOG_GENERAL(...) log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
 #define LOG_GENERAL_NC(...) log()->log (__VA_ARGS__, LogEntry::TYPE_GENERAL);

diff --git a/src/lib/image_filename_sorter.cc b/src/lib/image_filename_sorter.cc
index f58abba157532701536d3e43c7291df5e8bee67a..25a8acb3da5455af942c5774af88c0876c1fe3a5 100644 (file)
--- a/src/lib/image_filename_sorter.cc
+++ b/src/lib/image_filename_sorter.cc
@@ -18,13 +18,14 @@
 
 */
 
 
 */
 

-#include "raw_convert.h"

 #include "image_filename_sorter.h"
 #include "image_filename_sorter.h"

+#include <dcp/raw_convert.h>

 #include <boost/filesystem.hpp>
 #include <boost/foreach.hpp>
 #include <iostream>
 
 using std::list;
 #include <boost/filesystem.hpp>
 #include <boost/foreach.hpp>
 #include <iostream>
 
 using std::list;

+using dcp::raw_convert;

 
 bool
 ImageFilenameSorter::operator() (boost::filesystem::path a, boost::filesystem::path b)
 
 bool
 ImageFilenameSorter::operator() (boost::filesystem::path a, boost::filesystem::path b)

diff --git a/src/lib/isdcf_metadata.cc b/src/lib/isdcf_metadata.cc
index 96cf04faa0c8f9aa9b2a97cc68b9eabcf48b1165..1b424c925d90028c11693ccf428265b028cf762f 100644 (file)
--- a/src/lib/isdcf_metadata.cc
+++ b/src/lib/isdcf_metadata.cc
@@ -19,7 +19,7 @@
 */
 
 #include "isdcf_metadata.h"
 */
 
 #include "isdcf_metadata.h"

-#include "raw_convert.h"
+#include <dcp/raw_convert.h>

 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <iostream>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <iostream>


@@ -28,6 +28,7 @@
 
 using std::string;
 using boost::shared_ptr;
 
 using std::string;
 using boost::shared_ptr;

+using dcp::raw_convert;

 
 ISDCFMetadata::ISDCFMetadata (cxml::ConstNodePtr node)
        : content_version (node->number_child<int> ("ContentVersion"))
 
 ISDCFMetadata::ISDCFMetadata (cxml::ConstNodePtr node)
        : content_version (node->number_child<int> ("ContentVersion"))

diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc
index a2685bb49251eba41bd03a7f30a9c170dde2145f..707a088e90f468bd219dfa853624cf03153a3d25 100644 (file)
--- a/src/lib/j2k_image_proxy.cc
+++ b/src/lib/j2k_image_proxy.cc
@@ -21,7 +21,7 @@
 #include "j2k_image_proxy.h"
 #include "dcpomatic_socket.h"
 #include "image.h"
 #include "j2k_image_proxy.h"
 #include "dcpomatic_socket.h"
 #include "image.h"

-#include "raw_convert.h"
+#include <dcp/raw_convert.h>

 #include <dcp/openjpeg_image.h>
 #include <dcp/mono_picture_frame.h>
 #include <dcp/stereo_picture_frame.h>
 #include <dcp/openjpeg_image.h>
 #include <dcp/mono_picture_frame.h>
 #include <dcp/stereo_picture_frame.h>


@@ -40,6 +40,7 @@ using boost::shared_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;
 using dcp::Data;
 using boost::optional;
 using boost::dynamic_pointer_cast;
 using dcp::Data;

+using dcp::raw_convert;

 
 /** Construct a J2KImageProxy from a JPEG2000 file */
 J2KImageProxy::J2KImageProxy (boost::filesystem::path path, dcp::Size size, AVPixelFormat pixel_format)
 
 /** Construct a J2KImageProxy from a JPEG2000 file */
 J2KImageProxy::J2KImageProxy (boost::filesystem::path path, dcp::Size size, AVPixelFormat pixel_format)

diff --git a/src/lib/json_server.cc b/src/lib/json_server.cc
index 490f9fc5f6b211321c93b2609acbdc8924901c0f..e171a630700252cb1377277e55ff6851c3f891df 100644 (file)
--- a/src/lib/json_server.cc
+++ b/src/lib/json_server.cc
@@ -24,7 +24,7 @@
 #include "util.h"
 #include "film.h"
 #include "transcode_job.h"
 #include "util.h"
 #include "film.h"
 #include "transcode_job.h"

-#include "raw_convert.h"
+#include <dcp/raw_convert.h>

 #include <boost/asio.hpp>
 #include <boost/bind.hpp>
 #include <boost/thread.hpp>
 #include <boost/asio.hpp>
 #include <boost/bind.hpp>
 #include <boost/thread.hpp>


@@ -38,6 +38,7 @@ using boost::thread;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::asio::ip::tcp;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::asio::ip::tcp;

+using dcp::raw_convert;

 
 #define MAX_LENGTH 512
 
 
 #define MAX_LENGTH 512
 

diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index 62dee823ff468c2121cdf05321b6cbd4e592d6ec..a86ff14516c941a745914705b473ee26bdd6db61 100644 (file)
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -23,7 +23,7 @@
 #include "image_proxy.h"
 #include "j2k_image_proxy.h"
 #include "film.h"
 #include "image_proxy.h"
 #include "j2k_image_proxy.h"
 #include "film.h"

-#include "raw_convert.h"
+#include <dcp/raw_convert.h>

 extern "C" {
 #include <libavutil/pixfmt.h>
 }
 extern "C" {
 #include <libavutil/pixfmt.h>
 }


@@ -37,6 +37,7 @@ using boost::dynamic_pointer_cast;
 using boost::optional;
 using boost::function;
 using dcp::Data;
 using boost::optional;
 using boost::function;
 using dcp::Data;

+using dcp::raw_convert;

 
 PlayerVideo::PlayerVideo (
        shared_ptr<const ImageProxy> in,
 
 PlayerVideo::PlayerVideo (
        shared_ptr<const ImageProxy> in,

diff --git a/src/lib/raw_convert.cc b/src/lib/raw_convert.cc
deleted file mode 100644 (file)
index bbfd437..0000000
--- a/src/lib/raw_convert.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-    Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
-
-    This file is part of DCP-o-matic.
-
-    DCP-o-matic is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    DCP-o-matic is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-#include "raw_convert.h"
-
-using std::string;
-
-template <>
-string
-raw_convert<string, string> (string v, int)
-{
-       return v;
-}
-
-template <>
-string
-raw_convert<string, char const *> (char const * v, int)
-{
-       return v;
-}
-
-template <>
-string
-raw_convert<string, char*> (char * v, int)
-{
-       return v;
-}

diff --git a/src/lib/raw_convert.h b/src/lib/raw_convert.h
deleted file mode 100644 (file)
index 92d8e3d..0000000
--- a/src/lib/raw_convert.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
-
-    This file is part of DCP-o-matic.
-
-    DCP-o-matic is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    DCP-o-matic is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-#ifndef DCPOMATIC_RAW_CONVERT_H
-#define DCPOMATIC_RAW_CONVERT_H
-
-#include <locked_sstream.h>
-#include <iomanip>
-
-/** A sort-of version of boost::lexical_cast that does uses the "C"
- *  locale (i.e. no thousands separators and a . for the decimal separator).
- */
-template <typename P, typename Q>
-P
-raw_convert (Q v, int precision = 16)
-{
-       locked_stringstream s;
-       s.imbue (std::locale::classic ());
-       s << std::setprecision (precision);
-       s << v;
-       /* If the s >> r below fails to convert anything, we want r to
-          be left as a defined value.  This construct (I believe) achieves
-          this by setting r to the default value of type P, even if P
-          is a POD type.
-       */
-       P r = P ();
-       s >> r;
-       return r;
-}
-
-template <>
-std::string
-raw_convert<std::string, char const *> (char const * v, int);
-
-template <>
-std::string
-raw_convert<std::string, char*> (char* v, int);
-
-template <>
-std::string
-raw_convert<std::string, std::string> (std::string v, int);
-
-#endif

diff --git a/src/lib/raw_image_proxy.cc b/src/lib/raw_image_proxy.cc
index 0da547d0aa598740eb2bdc30bc163a7d6824015f..e182c0e5d17f5048f70f1814826dbfbdf4aac88f 100644 (file)
--- a/src/lib/raw_image_proxy.cc
+++ b/src/lib/raw_image_proxy.cc
@@ -20,7 +20,7 @@
 
 #include "raw_image_proxy.h"
 #include "image.h"
 
 #include "raw_image_proxy.h"
 #include "image.h"

-#include "raw_convert.h"
+#include <dcp/raw_convert.h>

 #include <dcp/util.h>
 #include <libcxml/cxml.h>
 extern "C" {
 #include <dcp/util.h>
 #include <libcxml/cxml.h>
 extern "C" {


@@ -34,6 +34,7 @@ using std::string;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;

+using dcp::raw_convert;

 
 RawImageProxy::RawImageProxy (shared_ptr<Image> image)
        : _image (image)
 
 RawImageProxy::RawImageProxy (shared_ptr<Image> image)
        : _image (image)

diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc
index c7dc948750634545dad34868a4f03b275c2ced80..d6bf54aef5cf36a62bfe2d60a487d6ba7a0aa004 100644 (file)
--- a/src/lib/subtitle_content.cc
+++ b/src/lib/subtitle_content.cc
@@ -22,8 +22,8 @@
 #include "util.h"
 #include "exceptions.h"
 #include "font.h"
 #include "util.h"
 #include "exceptions.h"
 #include "font.h"

-#include "raw_convert.h"

 #include "content.h"
 #include "content.h"

+#include <dcp/raw_convert.h>

 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>


@@ -37,6 +37,7 @@ using std::cout;
 using std::list;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using std::list;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;

+using dcp::raw_convert;

 
 int const SubtitleContentProperty::X_OFFSET = 500;
 int const SubtitleContentProperty::Y_OFFSET = 501;
 
 int const SubtitleContentProperty::X_OFFSET = 500;
 int const SubtitleContentProperty::Y_OFFSET = 501;

diff --git a/src/lib/text_subtitle_content.cc b/src/lib/text_subtitle_content.cc
index 24a328d088e3c05001f9be31f2f1b614233010da..63144766a50cffe172a671ca24b64a9dfe9c9eb6 100644 (file)
--- a/src/lib/text_subtitle_content.cc
+++ b/src/lib/text_subtitle_content.cc
@@ -23,8 +23,8 @@
 #include "text_subtitle.h"
 #include "film.h"
 #include "font.h"
 #include "text_subtitle.h"
 #include "film.h"
 #include "font.h"

-#include "raw_convert.h"

 #include "subtitle_content.h"
 #include "subtitle_content.h"

+#include <dcp/raw_convert.h>

 #include <libxml++/libxml++.h>
 #include <iostream>
 
 #include <libxml++/libxml++.h>
 #include <iostream>
 


@@ -33,6 +33,7 @@
 using std::string;
 using std::cout;
 using boost::shared_ptr;
 using std::string;
 using std::cout;
 using boost::shared_ptr;

+using dcp::raw_convert;

 
 TextSubtitleContent::TextSubtitleContent (shared_ptr<const Film> film, boost::filesystem::path path)
        : Content (film, path)
 
 TextSubtitleContent::TextSubtitleContent (shared_ptr<const Film> film, boost::filesystem::path path)
        : Content (film, path)

diff --git a/src/lib/types.cc b/src/lib/types.cc
index f31e7a3ec3854f9c1fee5d27592897e20a52628a..e3bedd667f7a716daee156db5451e2b6b376cc9c 100644 (file)
--- a/src/lib/types.cc
+++ b/src/lib/types.cc
@@ -20,7 +20,7 @@
 
 #include "types.h"
 #include "dcpomatic_assert.h"
 
 #include "types.h"
 #include "dcpomatic_assert.h"

-#include "raw_convert.h"
+#include <dcp/raw_convert.h>

 #include <libxml++/libxml++.h>
 #include <libcxml/cxml.h>
 
 #include <libxml++/libxml++.h>
 #include <libcxml/cxml.h>
 


@@ -28,6 +28,7 @@ using std::max;
 using std::min;
 using std::string;
 using boost::shared_ptr;
 using std::min;
 using std::string;
 using boost::shared_ptr;

+using dcp::raw_convert;

 
 bool operator== (Crop const & a, Crop const & b)
 {
 
 bool operator== (Crop const & a, Crop const & b)
 {

diff --git a/src/lib/update_checker.cc b/src/lib/update_checker.cc
index 6c1217f860b318266e84beb7208e13c07375438a..8aeca030bf79f8ba4a7a599ebcce4bf1e11bda88 100644 (file)
--- a/src/lib/update_checker.cc
+++ b/src/lib/update_checker.cc
@@ -21,7 +21,7 @@
 #include "update_checker.h"
 #include "version.h"
 #include "util.h"
 #include "update_checker.h"
 #include "version.h"
 #include "util.h"

-#include "raw_convert.h"
+#include <dcp/raw_convert.h>

 #include <libcxml/cxml.h>
 #include <curl/curl.h>
 #include <boost/algorithm/string.hpp>
 #include <libcxml/cxml.h>
 #include <curl/curl.h>
 #include <boost/algorithm/string.hpp>


@@ -36,6 +36,7 @@ using std::string;
 using std::vector;
 using boost::is_any_of;
 using boost::ends_with;
 using std::vector;
 using boost::is_any_of;
 using boost::ends_with;

+using dcp::raw_convert;

 
 /** Singleton instance */
 UpdateChecker* UpdateChecker::_instance = 0;
 
 /** Singleton instance */
 UpdateChecker* UpdateChecker::_instance = 0;

diff --git a/src/lib/user_property.h b/src/lib/user_property.h
index a7a6f63da2336f6eece25b5e4dd994df669cc65f..6e147fd768ebf067776eb3130d127be85ac8e47e 100644 (file)
--- a/src/lib/user_property.h
+++ b/src/lib/user_property.h
@@ -21,7 +21,7 @@
 #ifndef DCPOMATIC_USER_PROPERTY_H
 #define DCPOMATIC_USER_PROPERTY_H
 
 #ifndef DCPOMATIC_USER_PROPERTY_H
 #define DCPOMATIC_USER_PROPERTY_H
 

-#include "raw_convert.h"
+#include <dcp/raw_convert.h>

 
 class UserProperty
 {
 
 class UserProperty
 {


@@ -37,7 +37,7 @@ public:
        UserProperty (Category category_, std::string key_, T value_, std::string unit_ = "")
                : category (category_)
                , key (key_)
        UserProperty (Category category_, std::string key_, T value_, std::string unit_ = "")
                : category (category_)
                , key (key_)

-               , value (raw_convert<std::string> (value_))
+               , value (dcp::raw_convert<std::string> (value_))

                , unit (unit_)
        {}
 
                , unit (unit_)
        {}
 

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 5e870f1e2715f349ee3309f5f530e2133da32672..da45919b426df35dd6c7943673267d5307f25ae1 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -91,6 +91,7 @@ using boost::optional;
 using boost::lexical_cast;
 using boost::bad_lexical_cast;
 using dcp::Size;
 using boost::lexical_cast;
 using boost::bad_lexical_cast;
 using dcp::Size;

+using dcp::raw_convert;

 
 /** Path to our executable, required by the stacktrace stuff and filled
  *  in during App::onInit().
 
 /** Path to our executable, required by the stacktrace stuff and filled
  *  in during App::onInit().

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 967522e3645166d8455b834060947d4b673db121..20e0866a166377f6ba90666d472ebe7052e8668c 100644 (file)
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -30,7 +30,7 @@
 #include "exceptions.h"
 #include "frame_rate_change.h"
 #include "log.h"
 #include "exceptions.h"
 #include "frame_rate_change.h"
 #include "log.h"

-#include "raw_convert.h"
+#include <dcp/raw_convert.h>

 #include <libcxml/cxml.h>
 #include <dcp/colour_matrix.h>
 #include <libxml++/libxml++.h>
 #include <libcxml/cxml.h>
 #include <dcp/colour_matrix.h>
 #include <libxml++/libxml++.h>


@@ -62,6 +62,7 @@ using std::pair;
 using boost::shared_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;
 using boost::shared_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;

+using dcp::raw_convert;

 
 VideoContent::VideoContent (Content* parent)
        : ContentPart (parent)
 
 VideoContent::VideoContent (Content* parent)
        : ContentPart (parent)

diff --git a/src/lib/wscript b/src/lib/wscript
index 9883f31d6a6636407502170b26237632340cfeeb..911ee0af43ac8c12cfe51906fc17a2f4684db09e 100644 (file)
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -118,7 +118,6 @@ sources = """
           send_problem_report_job.cc
           server.cc
           string_log_entry.cc
           send_problem_report_job.cc
           server.cc
           string_log_entry.cc

-          raw_convert.cc

           subtitle_content.cc
           subtitle_decoder.cc
           text_subtitle.cc
           subtitle_content.cc
           subtitle_decoder.cc
           text_subtitle.cc

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 7c7b39b0423616674b1439f67fe61013d9fd0ef6..a99e3298061492fe1d2c32e4f7040c8955a93bb6 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -95,6 +95,7 @@ using std::exception;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;

+using dcp::raw_convert;

 
 class FilmChangedDialog : public boost::noncopyable
 {
 
 class FilmChangedDialog : public boost::noncopyable
 {

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index 4e9d5592dcdd875882c61f9aa6b0f886372ced1c..c23d1bd895cc839cc3c726e47c0fa17694b60492 100644 (file)
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -25,7 +25,6 @@
 #include "lib/encode_server.h"
 #include "lib/config.h"
 #include "lib/log.h"
 #include "lib/encode_server.h"
 #include "lib/config.h"
 #include "lib/log.h"

-#include "lib/raw_convert.h"

 #include "lib/signaller.h"
 #include "lib/cross.h"
 #include <wx/taskbar.h>
 #include "lib/signaller.h"
 #include "lib/cross.h"
 #include <wx/taskbar.h>

diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc
index 53169ad3e2cbc4bb812b106444644a62054f90ed..1ec9dd5b2918ce556a10eb7a1583febd3de2b696 100644 (file)
--- a/src/wx/audio_mapping_view.cc
+++ b/src/wx/audio_mapping_view.cc
@@ -24,10 +24,10 @@
 
 #include "lib/audio_mapping.h"
 #include "lib/util.h"
 
 #include "lib/audio_mapping.h"
 #include "lib/util.h"

-#include "lib/raw_convert.h"

 #include "audio_mapping_view.h"
 #include "wx_util.h"
 #include "audio_gain_dialog.h"
 #include "audio_mapping_view.h"
 #include "wx_util.h"
 #include "audio_gain_dialog.h"

+#include <dcp/raw_convert.h>

 #include <dcp/types.h>
 #include <wx/wx.h>
 #include <wx/renderer.h>
 #include <dcp/types.h>
 #include <wx/wx.h>
 #include <wx/renderer.h>


@@ -45,6 +45,7 @@ using std::vector;
 using std::pair;
 using std::make_pair;
 using boost::shared_ptr;
 using std::pair;
 using std::make_pair;
 using boost::shared_ptr;

+using dcp::raw_convert;

 
 #define INDICATOR_SIZE 16
 #define LEFT_WIDTH 48
 
 #define INDICATOR_SIZE 16
 #define LEFT_WIDTH 48

diff --git a/src/wx/colour_conversion_editor.cc b/src/wx/colour_conversion_editor.cc
index 3d4363cb970e65c6e1008d7569b54c5ffafde478..0a775b4890c8aa83650f277e22e997a478d68023 100644 (file)
--- a/src/wx/colour_conversion_editor.cc
+++ b/src/wx/colour_conversion_editor.cc
@@ -19,9 +19,9 @@
 */
 
 #include "lib/colour_conversion.h"
 */
 
 #include "lib/colour_conversion.h"

-#include "lib/raw_convert.h"

 #include "wx_util.h"
 #include "colour_conversion_editor.h"
 #include "wx_util.h"
 #include "colour_conversion_editor.h"

+#include <dcp/raw_convert.h>

 #include <dcp/gamma_transfer_function.h>
 #include <dcp/modified_gamma_transfer_function.h>
 #include <wx/spinctrl.h>
 #include <dcp/gamma_transfer_function.h>
 #include <dcp/modified_gamma_transfer_function.h>
 #include <wx/spinctrl.h>


@@ -32,6 +32,7 @@ using std::string;
 using std::cout;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using std::cout;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;

+using dcp::raw_convert;

 
 ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv)
        : wxPanel (parent, wxID_ANY)
 
 ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv)
        : wxPanel (parent, wxID_ANY)

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 3aaba1793afd02e34ddae0353d3ec21fc4310f2e..0098ecb2bb9e7dfd82d8d0bbb2a5b716c7e8d305 100644 (file)
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -39,12 +39,11 @@
 #include "lib/dcp_content_type.h"
 #include "lib/log.h"
 #include "lib/util.h"
 #include "lib/dcp_content_type.h"
 #include "lib/log.h"
 #include "lib/util.h"

-#include "lib/raw_convert.h"

 #include "lib/cross.h"
 #include "lib/exceptions.h"
 #include "lib/cross.h"
 #include "lib/exceptions.h"

+#include <dcp/raw_convert.h>

 #include <dcp/exceptions.h>
 #include <dcp/certificate_chain.h>
 #include <dcp/exceptions.h>
 #include <dcp/certificate_chain.h>

-#include <dcp/raw_convert.h>

 #include <wx/stdpaths.h>
 #include <wx/preferences.h>
 #include <wx/spinctrl.h>
 #include <wx/stdpaths.h>
 #include <wx/preferences.h>
 #include <wx/spinctrl.h>


@@ -64,6 +63,7 @@ using boost::bind;
 using boost::shared_ptr;
 using boost::function;
 using boost::optional;
 using boost::shared_ptr;
 using boost::function;
 using boost::optional;

+using dcp::raw_convert;

 
 class Page
 {
 
 class Page
 {

diff --git a/src/wx/content_properties_dialog.cc b/src/wx/content_properties_dialog.cc
index 04abefc14d07656c94252eccb1c56fc02893ea3d..acc232df4cd8445c69ec5ba12f1d763d8ec1b681 100644 (file)
--- a/src/wx/content_properties_dialog.cc
+++ b/src/wx/content_properties_dialog.cc
@@ -20,10 +20,10 @@
 
 #include "content_properties_dialog.h"
 #include "wx_util.h"
 
 #include "content_properties_dialog.h"
 #include "wx_util.h"

-#include "lib/raw_convert.h"

 #include "lib/content.h"
 #include "lib/video_content.h"
 #include "lib/audio_content.h"
 #include "lib/content.h"
 #include "lib/video_content.h"
 #include "lib/audio_content.h"

+#include <dcp/raw_convert.h>

 #include <boost/algorithm/string.hpp>
 #include <boost/foreach.hpp>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/foreach.hpp>
 


@@ -33,6 +33,7 @@ using std::pair;
 using std::map;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using std::map;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;

+using dcp::raw_convert;

 
 ContentPropertiesDialog::ContentPropertiesDialog (wxWindow* parent, shared_ptr<Content> content)
        : TableDialog (parent, _("Content Properties"), 2, 1, false)
 
 ContentPropertiesDialog::ContentPropertiesDialog (wxWindow* parent, shared_ptr<Content> content)
        : TableDialog (parent, _("Content Properties"), 2, 1, false)

diff --git a/src/wx/image_sequence_dialog.cc b/src/wx/image_sequence_dialog.cc
index 3af48bda635a4ac5f9210fe34edfc497895592c6..6200018d10e2966595f62fa12b3f9f855676ce7b 100644 (file)
--- a/src/wx/image_sequence_dialog.cc
+++ b/src/wx/image_sequence_dialog.cc
@@ -20,7 +20,9 @@
 
 #include "wx_util.h"
 #include "image_sequence_dialog.h"
 
 #include "wx_util.h"
 #include "image_sequence_dialog.h"

-#include "lib/raw_convert.h"
+#include <dcp/raw_convert.h>
+
+using dcp::raw_convert;

 
 ImageSequenceDialog::ImageSequenceDialog (wxWindow* parent)
        : TableDialog (parent, _("Add image sequence"), 2, 1, true)
 
 ImageSequenceDialog::ImageSequenceDialog (wxWindow* parent)
        : TableDialog (parent, _("Add image sequence"), 2, 1, true)

diff --git a/src/wx/playhead_to_frame_dialog.cc b/src/wx/playhead_to_frame_dialog.cc
index 462e3d5e1164c579bd918497c693fb8e714ad9d4..af20c159268c352b4a60f7cae3277c7018647306 100644 (file)
--- a/src/wx/playhead_to_frame_dialog.cc
+++ b/src/wx/playhead_to_frame_dialog.cc
@@ -19,7 +19,9 @@
 */
 
 #include "playhead_to_frame_dialog.h"
 */
 
 #include "playhead_to_frame_dialog.h"

-#include "lib/raw_convert.h"
+#include <dcp/raw_convert.h>
+
+using dcp::raw_convert;

 
 PlayheadToFrameDialog::PlayheadToFrameDialog (wxWindow* parent, int fps)
        : TableDialog (parent, _("Go to frame"), 2, 1, true)
 
 PlayheadToFrameDialog::PlayheadToFrameDialog (wxWindow* parent, int fps)
        : TableDialog (parent, _("Go to frame"), 2, 1, true)

diff --git a/src/wx/time_picker.cc b/src/wx/time_picker.cc
index 4706c896b03bc0cfad3c87c151f8dd853e3bf79a..1378af967b09a95adf2361343a4d9a4ea25964f2 100644 (file)
--- a/src/wx/time_picker.cc
+++ b/src/wx/time_picker.cc
@@ -20,7 +20,7 @@
 
 #include "time_picker.h"
 #include "wx_util.h"
 
 #include "time_picker.h"
 #include "wx_util.h"

-#include "lib/raw_convert.h"
+#include <dcp/raw_convert.h>

 #include <wx/spinctrl.h>
 #include <boost/bind.hpp>
 #include <iomanip>
 #include <wx/spinctrl.h>
 #include <boost/bind.hpp>
 #include <iomanip>


@@ -32,6 +32,7 @@ using std::max;
 using std::string;
 using std::cout;
 using boost::bind;
 using std::string;
 using std::cout;
 using boost::bind;

+using dcp::raw_convert;

 
 TimePicker::TimePicker (wxWindow* parent, wxDateTime time)
        : wxPanel (parent)
 
 TimePicker::TimePicker (wxWindow* parent, wxDateTime time)
        : wxPanel (parent)

diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index 01494f17bb4465a9a8144ee394b9897b22e442bc..f4de5502838a53526e18c69da085d5d5546c5199 100644 (file)
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -26,12 +26,12 @@
 #include "move_to_dialog.h"
 #include "lib/content.h"
 #include "lib/image_content.h"
 #include "move_to_dialog.h"
 #include "lib/content.h"
 #include "lib/image_content.h"

-#include "lib/raw_convert.h"

 #include "lib/subtitle_content.h"
 #include "lib/dcp_subtitle_content.h"
 #include "lib/audio_content.h"
 #include "lib/text_subtitle_content.h"
 #include "lib/video_content.h"
 #include "lib/subtitle_content.h"
 #include "lib/dcp_subtitle_content.h"
 #include "lib/audio_content.h"
 #include "lib/text_subtitle_content.h"
 #include "lib/video_content.h"

+#include <dcp/raw_convert.h>

 #include <boost/foreach.hpp>
 #include <set>
 #include <iostream>
 #include <boost/foreach.hpp>
 #include <set>
 #include <iostream>


@@ -42,6 +42,7 @@ using std::set;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;

+using dcp::raw_convert;

 
 TimingPanel::TimingPanel (ContentPanel* p, FilmViewer* viewer)
        /* horrid hack for apparent lack of context support with wxWidgets i18n code */
 
 TimingPanel::TimingPanel (ContentPanel* p, FilmViewer* viewer)
        /* horrid hack for apparent lack of context support with wxWidgets i18n code */

diff --git a/src/wx/video_waveform_plot.cc b/src/wx/video_waveform_plot.cc
index 5afe9ee4b78fc53eaa1a6dd19c95617ba3b6f5cd..efaf76e28620aab1f4522e496bb4683fc9c259ee 100644 (file)
--- a/src/wx/video_waveform_plot.cc
+++ b/src/wx/video_waveform_plot.cc
@@ -22,9 +22,9 @@
 #include "film_viewer.h"
 #include "wx_util.h"
 #include "lib/image.h"
 #include "film_viewer.h"
 #include "wx_util.h"
 #include "lib/image.h"

-#include "lib/raw_convert.h"

 #include "lib/dcp_video.h"
 #include <dcp/openjpeg_image.h>
 #include "lib/dcp_video.h"
 #include <dcp/openjpeg_image.h>

+#include <dcp/raw_convert.h>

 #include <wx/rawbmp.h>
 #include <wx/graphics.h>
 #include <boost/bind.hpp>
 #include <wx/rawbmp.h>
 #include <wx/graphics.h>
 #include <boost/bind.hpp>


@@ -35,6 +35,7 @@ using std::min;
 using std::string;
 using boost::weak_ptr;
 using boost::shared_ptr;
 using std::string;
 using boost::weak_ptr;
 using boost::shared_ptr;

+using dcp::raw_convert;

 
 int const VideoWaveformPlot::_vertical_margin = 8;
 
 
 int const VideoWaveformPlot::_vertical_margin = 8;
 

diff --git a/test/util_test.cc b/test/util_test.cc
index 1f894d329537b0998600a8cb3b8211a8aa2a50c7..d1f6c77d54994010931daaced282108e93673c7d 100644 (file)
--- a/test/util_test.cc
+++ b/test/util_test.cc
@@ -22,10 +22,9 @@
  *  @brief Test various utility methods.
  */
 
  *  @brief Test various utility methods.
  */
 

-#include <boost/test/unit_test.hpp>

 #include "lib/util.h"
 #include "lib/util.h"

-#include "lib/raw_convert.h"

 #include "lib/exceptions.h"
 #include "lib/exceptions.h"

+#include <boost/test/unit_test.hpp>

 
 using std::string;
 using std::vector;
 
 using std::string;
 using std::vector;


@@ -87,9 +86,3 @@ BOOST_AUTO_TEST_CASE (seconds_to_approximate_hms_test)
        BOOST_CHECK_EQUAL (seconds_to_approximate_hms (3600 + 40 * 60), "1h 40m");
        BOOST_CHECK_EQUAL (seconds_to_approximate_hms (13 * 3600 + 40 * 60), "14h");
 }
        BOOST_CHECK_EQUAL (seconds_to_approximate_hms (3600 + 40 * 60), "1h 40m");
        BOOST_CHECK_EQUAL (seconds_to_approximate_hms (13 * 3600 + 40 * 60), "14h");
 }

-
-BOOST_AUTO_TEST_CASE (raw_convert_test)
-{
-       BOOST_CHECK_EQUAL (raw_convert<string> ("foo"), "foo");
-       BOOST_CHECK_EQUAL (raw_convert<string> ("foo bar"), "foo bar");
-}

diff --git a/test/video_content_scale_test.cc b/test/video_content_scale_test.cc
index b1a1e258d1482c0587251daed57d09c632a24db3..bb6694db223a0d75b4a8fbf45963f87c25f9a69f 100644 (file)
--- a/test/video_content_scale_test.cc
+++ b/test/video_content_scale_test.cc
@@ -28,6 +28,7 @@ using std::string;
 using std::cerr;
 using boost::shared_ptr;
 using boost::optional;
 using std::cerr;
 using boost::shared_ptr;
 using boost::optional;

+using dcp::raw_convert;

 
 static
 void
 
 static
 void