From df085fc0ea4f1a3f009de5a7a5bf9f241173bcba Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 12 May 2014 00:57:51 +0100 Subject: [PATCH] Remove LocaleGuard and lexical_cast<> in favour of libdcp::raw_convert, which should get things right with both decimal and thousands separators; LocaleGuard fixed decimal separators ok but not, it appears, thousands ones. --- src/lib/audio_content.cc | 11 ++++------- src/lib/audio_mapping.cc | 14 +++++++------- src/lib/colour_conversion.cc | 20 ++++++++------------ src/lib/config.cc | 19 ++++++++----------- src/lib/content.cc | 9 +++++---- src/lib/dci_metadata.cc | 7 ++++--- src/lib/dcp_video_frame.cc | 20 ++++++++++---------- src/lib/ffmpeg.cc | 7 ++++--- src/lib/ffmpeg_content.cc | 13 +++++++------ src/lib/ffmpeg_decoder.cc | 1 - src/lib/film.cc | 19 ++++++++----------- src/lib/image_examiner.cc | 5 +---- src/lib/playlist.cc | 2 -- src/lib/server.cc | 6 +++--- src/lib/server_finder.cc | 5 +++-- src/lib/sndfile_content.cc | 11 ++++++----- src/lib/subtitle_content.cc | 15 ++++++--------- src/lib/update.cc | 7 ++++--- src/lib/util.cc | 31 ++++++------------------------- src/lib/util.h | 10 ---------- src/lib/video_content.cc | 21 +++++++++++---------- src/wx/audio_mapping_view.cc | 4 ---- 22 files changed, 105 insertions(+), 152 deletions(-) diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc index b96300e15..1896c4d5c 100644 --- a/src/lib/audio_content.cc +++ b/src/lib/audio_content.cc @@ -18,6 +18,7 @@ */ #include +#include #include "audio_content.h" #include "analyse_audio_job.h" #include "job_manager.h" @@ -30,8 +31,8 @@ using std::string; using std::vector; using boost::shared_ptr; -using boost::lexical_cast; using boost::dynamic_pointer_cast; +using libdcp::raw_convert; int const AudioContentProperty::AUDIO_CHANNELS = 200; int const AudioContentProperty::AUDIO_LENGTH = 201; @@ -59,8 +60,6 @@ AudioContent::AudioContent (shared_ptr f, boost::filesystem::path p) AudioContent::AudioContent (shared_ptr f, shared_ptr node) : Content (f, node) { - LocaleGuard lg; - _audio_gain = node->number_child ("AudioGain"); _audio_delay = node->number_child ("AudioDelay"); } @@ -90,11 +89,9 @@ AudioContent::AudioContent (shared_ptr f, vector void AudioContent::as_xml (xmlpp::Node* node) const { - LocaleGuard lg; - boost::mutex::scoped_lock lm (_mutex); - node->add_child("AudioGain")->add_child_text (lexical_cast (_audio_gain)); - node->add_child("AudioDelay")->add_child_text (lexical_cast (_audio_delay)); + node->add_child("AudioGain")->add_child_text (raw_convert (_audio_gain)); + node->add_child("AudioDelay")->add_child_text (raw_convert (_audio_delay)); } diff --git a/src/lib/audio_mapping.cc b/src/lib/audio_mapping.cc index 301d44fa6..b1810c973 100644 --- a/src/lib/audio_mapping.cc +++ b/src/lib/audio_mapping.cc @@ -17,9 +17,9 @@ */ -#include #include #include +#include #include "audio_mapping.h" #include "util.h" @@ -30,8 +30,8 @@ using std::pair; using std::string; using std::min; using boost::shared_ptr; -using boost::lexical_cast; using boost::dynamic_pointer_cast; +using libdcp::raw_convert; AudioMapping::AudioMapping () : _content_channels (0) @@ -94,7 +94,7 @@ AudioMapping::AudioMapping (shared_ptr node, int state_version set ( (*i)->number_attribute ("Content"), static_cast ((*i)->number_attribute ("DCP")), - lexical_cast ((*i)->content ()) + raw_convert ((*i)->content ()) ); } } @@ -115,14 +115,14 @@ AudioMapping::get (int c, libdcp::Channel d) const void AudioMapping::as_xml (xmlpp::Node* node) const { - node->add_child ("ContentChannels")->add_child_text (lexical_cast (_content_channels)); + node->add_child ("ContentChannels")->add_child_text (raw_convert (_content_channels)); for (int c = 0; c < _content_channels; ++c) { for (int d = 0; d < MAX_DCP_AUDIO_CHANNELS; ++d) { xmlpp::Element* t = node->add_child ("Gain"); - t->set_attribute ("Content", lexical_cast (c)); - t->set_attribute ("DCP", lexical_cast (d)); - t->add_child_text (lexical_cast (get (c, static_cast (d)))); + t->set_attribute ("Content", raw_convert (c)); + t->set_attribute ("DCP", raw_convert (d)); + t->add_child_text (raw_convert (get (c, static_cast (d)))); } } } diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc index c3fa05426..cd1a81b25 100644 --- a/src/lib/colour_conversion.cc +++ b/src/lib/colour_conversion.cc @@ -17,9 +17,9 @@ */ -#include #include #include +#include #include #include "config.h" #include "colour_conversion.h" @@ -32,8 +32,8 @@ using std::string; using std::cout; using std::vector; using boost::shared_ptr; -using boost::lexical_cast; using boost::optional; +using libdcp::raw_convert; ColourConversion::ColourConversion () : input_gamma (2.4) @@ -64,8 +64,6 @@ ColourConversion::ColourConversion (double i, bool il, double const m[3][3], dou ColourConversion::ColourConversion (cxml::NodePtr node) : matrix (3, 3) { - LocaleGuard lg; - input_gamma = node->number_child ("InputGamma"); input_gamma_linearised = node->bool_child ("InputGammaLinearised"); @@ -79,7 +77,7 @@ ColourConversion::ColourConversion (cxml::NodePtr node) for (list::iterator i = m.begin(); i != m.end(); ++i) { int const ti = (*i)->number_attribute ("i"); int const tj = (*i)->number_attribute ("j"); - matrix(ti, tj) = lexical_cast ((*i)->content ()); + matrix(ti, tj) = raw_convert ((*i)->content ()); } output_gamma = node->number_child ("OutputGamma"); @@ -88,21 +86,19 @@ ColourConversion::ColourConversion (cxml::NodePtr node) void ColourConversion::as_xml (xmlpp::Node* node) const { - LocaleGuard lg; - - node->add_child("InputGamma")->add_child_text (lexical_cast (input_gamma)); + node->add_child("InputGamma")->add_child_text (raw_convert (input_gamma)); node->add_child("InputGammaLinearised")->add_child_text (input_gamma_linearised ? "1" : "0"); for (int i = 0; i < 3; ++i) { for (int j = 0; j < 3; ++j) { xmlpp::Element* m = node->add_child("Matrix"); - m->set_attribute ("i", lexical_cast (i)); - m->set_attribute ("j", lexical_cast (j)); - m->add_child_text (lexical_cast (matrix (i, j))); + m->set_attribute ("i", raw_convert (i)); + m->set_attribute ("j", raw_convert (j)); + m->add_child_text (raw_convert (matrix (i, j))); } } - node->add_child("OutputGamma")->add_child_text (lexical_cast (output_gamma)); + node->add_child("OutputGamma")->add_child_text (raw_convert (output_gamma)); } optional diff --git a/src/lib/config.cc b/src/lib/config.cc index eda56416d..d7503b848 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -24,6 +24,7 @@ #include #include #include +#include #include #include "config.h" #include "server.h" @@ -46,10 +47,10 @@ using std::max; using std::exception; using std::cerr; using boost::shared_ptr; -using boost::lexical_cast; using boost::optional; using boost::algorithm::is_any_of; using boost::algorithm::split; +using libdcp::raw_convert; Config* Config::_instance = 0; @@ -87,8 +88,6 @@ Config::Config () void Config::read () { - LocaleGuard lg; - if (!boost::filesystem::exists (file (false))) { read_old_metadata (); return; @@ -308,15 +307,13 @@ Config::instance () void Config::write () const { - LocaleGuard lg; - xmlpp::Document doc; xmlpp::Element* root = doc.create_root_node ("Config"); root->add_child("Version")->add_child_text ("1"); - root->add_child("NumLocalEncodingThreads")->add_child_text (lexical_cast (_num_local_encoding_threads)); + root->add_child("NumLocalEncodingThreads")->add_child_text (raw_convert (_num_local_encoding_threads)); root->add_child("DefaultDirectory")->add_child_text (_default_directory.string ()); - root->add_child("ServerPortBase")->add_child_text (lexical_cast (_server_port_base)); + root->add_child("ServerPortBase")->add_child_text (raw_convert (_server_port_base)); root->add_child("UseAnyServers")->add_child_text (_use_any_servers ? "1" : "0"); for (vector::const_iterator i = _servers.begin(); i != _servers.end(); ++i) { @@ -344,9 +341,9 @@ Config::write () const _default_dci_metadata.as_xml (root->add_child ("DCIMetadata")); - root->add_child("DefaultStillLength")->add_child_text (lexical_cast (_default_still_length)); - root->add_child("DefaultJ2KBandwidth")->add_child_text (lexical_cast (_default_j2k_bandwidth)); - root->add_child("DefaultAudioDelay")->add_child_text (lexical_cast (_default_audio_delay)); + root->add_child("DefaultStillLength")->add_child_text (raw_convert (_default_still_length)); + root->add_child("DefaultJ2KBandwidth")->add_child_text (raw_convert (_default_j2k_bandwidth)); + root->add_child("DefaultAudioDelay")->add_child_text (raw_convert (_default_audio_delay)); for (vector::const_iterator i = _colour_conversions.begin(); i != _colour_conversions.end(); ++i) { i->as_xml (root->add_child ("ColourConversion")); @@ -365,7 +362,7 @@ Config::write () const root->add_child("CheckForUpdates")->add_child_text (_check_for_updates ? "1" : "0"); root->add_child("CheckForTestUpdates")->add_child_text (_check_for_test_updates ? "1" : "0"); - root->add_child("MaximumJ2KBandwidth")->add_child_text (lexical_cast (_maximum_j2k_bandwidth)); + root->add_child("MaximumJ2KBandwidth")->add_child_text (raw_convert (_maximum_j2k_bandwidth)); doc.write_to_file_formatted (file(false).string ()); } diff --git a/src/lib/content.cc b/src/lib/content.cc index 829468247..1ec607d39 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -20,6 +20,7 @@ #include #include #include +#include #include "content.h" #include "util.h" #include "content_factory.h" @@ -36,7 +37,7 @@ using std::list; using std::cout; using std::vector; using boost::shared_ptr; -using boost::lexical_cast; +using libdcp::raw_convert; int const ContentProperty::PATH = 400; int const ContentProperty::POSITION = 401; @@ -119,9 +120,9 @@ Content::as_xml (xmlpp::Node* node) const node->add_child("Path")->add_child_text (i->string ()); } node->add_child("Digest")->add_child_text (_digest); - node->add_child("Position")->add_child_text (lexical_cast (_position)); - node->add_child("TrimStart")->add_child_text (lexical_cast (_trim_start)); - node->add_child("TrimEnd")->add_child_text (lexical_cast (_trim_end)); + node->add_child("Position")->add_child_text (raw_convert (_position)); + node->add_child("TrimStart")->add_child_text (raw_convert (_trim_start)); + node->add_child("TrimEnd")->add_child_text (raw_convert (_trim_end)); } void diff --git a/src/lib/dci_metadata.cc b/src/lib/dci_metadata.cc index 27306a15e..ccdc1ee1c 100644 --- a/src/lib/dci_metadata.cc +++ b/src/lib/dci_metadata.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2014 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,13 +19,14 @@ #include #include +#include #include "dci_metadata.h" #include "i18n.h" using std::string; -using boost::lexical_cast; using boost::shared_ptr; +using libdcp::raw_convert; DCIMetadata::DCIMetadata (shared_ptr node) { @@ -42,7 +43,7 @@ DCIMetadata::DCIMetadata (shared_ptr node) void DCIMetadata::as_xml (xmlpp::Node* root) const { - root->add_child("ContentVersion")->add_child_text (lexical_cast (content_version)); + root->add_child("ContentVersion")->add_child_text (raw_convert (content_version)); root->add_child("AudioLanguage")->add_child_text (audio_language); root->add_child("SubtitleLanguage")->add_child_text (subtitle_language); root->add_child("Territory")->add_child_text (territory); diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc index 54531a0f9..1c12eb7fd 100644 --- a/src/lib/dcp_video_frame.cc +++ b/src/lib/dcp_video_frame.cc @@ -42,13 +42,13 @@ #include #include #include -#include #include #include #include #include #include #include +#include #include #include "film.h" #include "dcp_video_frame.h" @@ -67,8 +67,8 @@ using std::string; using std::stringstream; using std::cout; using boost::shared_ptr; -using boost::lexical_cast; using libdcp::Size; +using libdcp::raw_convert; #define DCI_COEFFICENT (48.0 / 52.37) @@ -276,7 +276,7 @@ DCPVideoFrame::encode_remotely (ServerDescription serv) { boost::asio::io_service io_service; boost::asio::ip::tcp::resolver resolver (io_service); - boost::asio::ip::tcp::resolver::query query (serv.host_name(), boost::lexical_cast (Config::instance()->server_port_base ())); + boost::asio::ip::tcp::resolver::query query (serv.host_name(), raw_convert (Config::instance()->server_port_base ())); boost::asio::ip::tcp::resolver::iterator endpoint_iterator = resolver.resolve (query); shared_ptr socket (new Socket); @@ -286,9 +286,9 @@ DCPVideoFrame::encode_remotely (ServerDescription serv) xmlpp::Document doc; xmlpp::Element* root = doc.create_root_node ("EncodingRequest"); - root->add_child("Version")->add_child_text (lexical_cast (SERVER_LINK_VERSION)); - root->add_child("Width")->add_child_text (lexical_cast (_image->size().width)); - root->add_child("Height")->add_child_text (lexical_cast (_image->size().height)); + root->add_child("Version")->add_child_text (raw_convert (SERVER_LINK_VERSION)); + root->add_child("Width")->add_child_text (raw_convert (_image->size().width)); + root->add_child("Height")->add_child_text (raw_convert (_image->size().height)); add_metadata (root); stringstream xml; @@ -312,7 +312,7 @@ DCPVideoFrame::encode_remotely (ServerDescription serv) void DCPVideoFrame::add_metadata (xmlpp::Element* el) const { - el->add_child("Frame")->add_child_text (lexical_cast (_frame)); + el->add_child("Frame")->add_child_text (raw_convert (_frame)); switch (_eyes) { case EYES_BOTH: @@ -330,9 +330,9 @@ DCPVideoFrame::add_metadata (xmlpp::Element* el) const _conversion.as_xml (el->add_child("ColourConversion")); - el->add_child("FramesPerSecond")->add_child_text (lexical_cast (_frames_per_second)); - el->add_child("J2KBandwidth")->add_child_text (lexical_cast (_j2k_bandwidth)); - el->add_child("Resolution")->add_child_text (lexical_cast (int (_resolution))); + el->add_child("FramesPerSecond")->add_child_text (raw_convert (_frames_per_second)); + el->add_child("J2KBandwidth")->add_child_text (raw_convert (_j2k_bandwidth)); + el->add_child("Resolution")->add_child_text (raw_convert (int (_resolution))); } EncodedData::EncodedData (int s) diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc index 60eea6ec7..ed3e0721f 100644 --- a/src/lib/ffmpeg.cc +++ b/src/lib/ffmpeg.cc @@ -22,6 +22,7 @@ extern "C" { #include #include } +#include #include "ffmpeg.h" #include "ffmpeg_content.h" #include "exceptions.h" @@ -33,7 +34,7 @@ using std::string; using std::cout; using std::stringstream; using boost::shared_ptr; -using boost::lexical_cast; +using libdcp::raw_convert; boost::mutex FFmpeg::_mutex; @@ -94,8 +95,8 @@ FFmpeg::setup_general () /* These durations are in microseconds, and represent how far into the content file we will look for streams. */ - av_dict_set (&options, "analyzeduration", lexical_cast (5 * 60 * 1e6).c_str(), 0); - av_dict_set (&options, "probesize", lexical_cast (5 * 60 * 1e6).c_str(), 0); + av_dict_set (&options, "analyzeduration", raw_convert (5 * 60 * 1e6).c_str(), 0); + av_dict_set (&options, "probesize", raw_convert (5 * 60 * 1e6).c_str(), 0); if (avformat_open_input (&_format_context, 0, 0, &options) < 0) { throw OpenFileError (_ffmpeg_content->path(0).string ()); diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index b39113fd1..f810d53be 100644 --- a/src/lib/ffmpeg_content.cc +++ b/src/lib/ffmpeg_content.cc @@ -21,6 +21,7 @@ extern "C" { #include } #include +#include #include "ffmpeg_content.h" #include "ffmpeg_examiner.h" #include "compose.hpp" @@ -40,8 +41,8 @@ using std::list; using std::cout; using std::pair; using boost::shared_ptr; -using boost::lexical_cast; using boost::dynamic_pointer_cast; +using libdcp::raw_convert; int const FFmpegContentProperty::SUBTITLE_STREAMS = 100; int const FFmpegContentProperty::SUBTITLE_STREAM = 101; @@ -152,7 +153,7 @@ FFmpegContent::as_xml (xmlpp::Node* node) const } if (_first_video) { - node->add_child("FirstVideo")->add_child_text (lexical_cast (_first_video.get ())); + node->add_child("FirstVideo")->add_child_text (raw_convert (_first_video.get ())); } } @@ -353,7 +354,7 @@ void FFmpegStream::as_xml (xmlpp::Node* root) const { root->add_child("Name")->add_child_text (name); - root->add_child("Id")->add_child_text (lexical_cast (_id)); + root->add_child("Id")->add_child_text (raw_convert (_id)); } FFmpegAudioStream::FFmpegAudioStream (shared_ptr node, int version) @@ -369,10 +370,10 @@ void FFmpegAudioStream::as_xml (xmlpp::Node* root) const { FFmpegStream::as_xml (root); - root->add_child("FrameRate")->add_child_text (lexical_cast (frame_rate)); - root->add_child("Channels")->add_child_text (lexical_cast (channels)); + root->add_child("FrameRate")->add_child_text (raw_convert (frame_rate)); + root->add_child("Channels")->add_child_text (raw_convert (channels)); if (first_audio) { - root->add_child("FirstAudio")->add_child_text (lexical_cast (first_audio.get ())); + root->add_child("FirstAudio")->add_child_text (raw_convert (first_audio.get ())); } mapping.as_xml (root->add_child("Mapping")); } diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index 1920f9275..c93012608 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -27,7 +27,6 @@ #include #include #include -#include #include extern "C" { #include diff --git a/src/lib/film.cc b/src/lib/film.cc index 7b72126f9..09d939957 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -36,6 +35,7 @@ #include #include #include +#include #include "film.h" #include "job.h" #include "util.h" @@ -72,7 +72,6 @@ using std::cout; using std::list; using boost::shared_ptr; using boost::weak_ptr; -using boost::lexical_cast; using boost::dynamic_pointer_cast; using boost::to_upper_copy; using boost::ends_with; @@ -80,6 +79,7 @@ using boost::starts_with; using boost::optional; using libdcp::Size; using libdcp::Signer; +using libdcp::raw_convert; /* 5 -> 6 * AudioMapping XML changed. @@ -152,9 +152,10 @@ string Film::video_identifier () const { assert (container ()); - LocaleGuard lg; stringstream s; + s.imbue (std::locale::classic ()); + s << container()->id() << "_" << resolution_to_string (_resolution) << "_" << _playlist->video_identifier() @@ -340,12 +341,10 @@ Film::encoded_frames () const shared_ptr Film::metadata () const { - LocaleGuard lg; - shared_ptr doc (new xmlpp::Document); xmlpp::Element* root = doc->create_root_node ("Metadata"); - root->add_child("Version")->add_child_text (lexical_cast (current_state_version)); + root->add_child("Version")->add_child_text (raw_convert (current_state_version)); root->add_child("Name")->add_child_text (_name); root->add_child("UseDCIName")->add_child_text (_use_dci_name ? "1" : "0"); @@ -360,11 +359,11 @@ Film::metadata () const root->add_child("Resolution")->add_child_text (resolution_to_string (_resolution)); root->add_child("Scaler")->add_child_text (_scaler->id ()); root->add_child("WithSubtitles")->add_child_text (_with_subtitles ? "1" : "0"); - root->add_child("J2KBandwidth")->add_child_text (lexical_cast (_j2k_bandwidth)); + root->add_child("J2KBandwidth")->add_child_text (raw_convert (_j2k_bandwidth)); _dci_metadata.as_xml (root->add_child ("DCIMetadata")); - root->add_child("VideoFrameRate")->add_child_text (lexical_cast (_video_frame_rate)); + root->add_child("VideoFrameRate")->add_child_text (raw_convert (_video_frame_rate)); root->add_child("DCIDate")->add_child_text (boost::gregorian::to_iso_string (_dci_date)); - root->add_child("AudioChannels")->add_child_text (lexical_cast (_audio_channels)); + root->add_child("AudioChannels")->add_child_text (raw_convert (_audio_channels)); root->add_child("ThreeD")->add_child_text (_three_d ? "1" : "0"); root->add_child("SequenceVideo")->add_child_text (_sequence_video ? "1" : "0"); root->add_child("Interop")->add_child_text (_interop ? "1" : "0"); @@ -392,8 +391,6 @@ Film::write_metadata () const list Film::read_metadata () { - LocaleGuard lg; - if (boost::filesystem::exists (file ("metadata")) && !boost::filesystem::exists (file ("metadata.xml"))) { throw StringError (_("This film was created with an older version of DCP-o-matic, and unfortunately it cannot be loaded into this version. You will need to create a new Film, re-add your content and set it up again. Sorry!")); } diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc index 12fe2b8a6..4ff324f68 100644 --- a/src/lib/image_examiner.cc +++ b/src/lib/image_examiner.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2014 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,7 +18,6 @@ */ #include -#include #include #include "image_content.h" #include "image_examiner.h" @@ -33,8 +32,6 @@ using std::cout; using std::list; using std::sort; using boost::shared_ptr; -using boost::lexical_cast; -using boost::bad_lexical_cast; ImageExaminer::ImageExaminer (shared_ptr film, shared_ptr content, shared_ptr) : _film (film) diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index a2bec83bb..eb9a49d30 100644 --- a/src/lib/playlist.cc +++ b/src/lib/playlist.cc @@ -19,7 +19,6 @@ #include #include -#include #include "playlist.h" #include "sndfile_content.h" #include "sndfile_decoder.h" @@ -46,7 +45,6 @@ using boost::optional; using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; -using boost::lexical_cast; Playlist::Playlist () : _sequence_video (true) diff --git a/src/lib/server.cc b/src/lib/server.cc index 1f3f61e42..0c5792ae0 100644 --- a/src/lib/server.cc +++ b/src/lib/server.cc @@ -27,9 +27,9 @@ #include #include #include -#include #include #include +#include #include "server.h" #include "util.h" #include "scaler.h" @@ -56,8 +56,8 @@ using boost::thread; using boost::bind; using boost::scoped_array; using boost::optional; -using boost::lexical_cast; using libdcp::Size; +using libdcp::raw_convert; Server::Server (shared_ptr log, bool verbose) : _log (log) @@ -246,7 +246,7 @@ Server::broadcast_received () /* Reply to the client saying what we can do */ xmlpp::Document doc; xmlpp::Element* root = doc.create_root_node ("ServerAvailable"); - root->add_child("Threads")->add_child_text (lexical_cast (_worker_threads.size ())); + root->add_child("Threads")->add_child_text (raw_convert (_worker_threads.size ())); stringstream xml; doc.write_to_stream (xml, "UTF-8"); diff --git a/src/lib/server_finder.cc b/src/lib/server_finder.cc index 1080d24c4..ed6016c67 100644 --- a/src/lib/server_finder.cc +++ b/src/lib/server_finder.cc @@ -18,6 +18,7 @@ */ #include +#include #include "server_finder.h" #include "exceptions.h" #include "util.h" @@ -32,7 +33,7 @@ using std::vector; using std::cout; using boost::shared_ptr; using boost::scoped_array; -using boost::lexical_cast; +using libdcp::raw_convert; ServerFinder* ServerFinder::_instance = 0; @@ -82,7 +83,7 @@ try } try { boost::asio::ip::udp::resolver resolver (io_service); - boost::asio::ip::udp::resolver::query query (*i, lexical_cast (Config::instance()->server_port_base() + 1)); + boost::asio::ip::udp::resolver::query query (*i, raw_convert (Config::instance()->server_port_base() + 1)); boost::asio::ip::udp::endpoint end_point (*resolver.resolve (query)); socket.send_to (boost::asio::buffer (data.c_str(), data.size() + 1), end_point); } catch (...) { diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc index a8388ab77..fcdf88778 100644 --- a/src/lib/sndfile_content.cc +++ b/src/lib/sndfile_content.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2014 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,6 +18,7 @@ */ #include +#include #include "sndfile_content.h" #include "sndfile_decoder.h" #include "film.h" @@ -31,7 +32,7 @@ using std::string; using std::stringstream; using std::cout; using boost::shared_ptr; -using boost::lexical_cast; +using libdcp::raw_convert; int const SndfileContentProperty::VIDEO_FRAME_RATE = 600; @@ -137,9 +138,9 @@ SndfileContent::as_xml (xmlpp::Node* node) const Content::as_xml (node); AudioContent::as_xml (node); - node->add_child("AudioChannels")->add_child_text (lexical_cast (audio_channels ())); - node->add_child("AudioLength")->add_child_text (lexical_cast (audio_length ())); - node->add_child("AudioFrameRate")->add_child_text (lexical_cast (content_audio_frame_rate ())); + node->add_child("AudioChannels")->add_child_text (raw_convert (audio_channels ())); + node->add_child("AudioLength")->add_child_text (raw_convert (audio_length ())); + node->add_child("AudioFrameRate")->add_child_text (raw_convert (content_audio_frame_rate ())); _audio_mapping.as_xml (node->add_child("AudioMapping")); } diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc index 8f88574e5..0abb7d491 100644 --- a/src/lib/subtitle_content.cc +++ b/src/lib/subtitle_content.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2014 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,6 +18,7 @@ */ #include +#include #include "subtitle_content.h" #include "util.h" #include "exceptions.h" @@ -27,8 +28,8 @@ using std::string; using std::vector; using boost::shared_ptr; -using boost::lexical_cast; using boost::dynamic_pointer_cast; +using libdcp::raw_convert; int const SubtitleContentProperty::SUBTITLE_X_OFFSET = 500; int const SubtitleContentProperty::SUBTITLE_Y_OFFSET = 501; @@ -49,8 +50,6 @@ SubtitleContent::SubtitleContent (shared_ptr f, shared_ptr= 7) { _subtitle_x_offset = node->number_child ("SubtitleXOffset"); _subtitle_y_offset = node->number_child ("SubtitleYOffset"); @@ -91,11 +90,9 @@ SubtitleContent::SubtitleContent (shared_ptr f, vectoradd_child("SubtitleXOffset")->add_child_text (lexical_cast (_subtitle_x_offset)); - root->add_child("SubtitleYOffset")->add_child_text (lexical_cast (_subtitle_y_offset)); - root->add_child("SubtitleScale")->add_child_text (lexical_cast (_subtitle_scale)); + root->add_child("SubtitleXOffset")->add_child_text (raw_convert (_subtitle_x_offset)); + root->add_child("SubtitleYOffset")->add_child_text (raw_convert (_subtitle_y_offset)); + root->add_child("SubtitleScale")->add_child_text (raw_convert (_subtitle_scale)); } void diff --git a/src/lib/update.cc b/src/lib/update.cc index a98ee5b5d..34eaf385c 100644 --- a/src/lib/update.cc +++ b/src/lib/update.cc @@ -22,6 +22,7 @@ #include #include #include +#include #include "update.h" #include "version.h" #include "ui_signaller.h" @@ -32,7 +33,7 @@ using std::cout; using std::min; using std::string; using std::stringstream; -using boost::lexical_cast; +using libdcp::raw_convert; UpdateChecker* UpdateChecker::_instance = 0; @@ -120,12 +121,12 @@ UpdateChecker::thread () current_pre = true; } - float current_float = lexical_cast (current); + float current_float = raw_convert (current); if (current_pre) { current_float -= 0.005; } - if (current_float < lexical_cast (_stable)) { + if (current_float < raw_convert (_stable)) { set_state (YES); } else { set_state (NO); diff --git a/src/lib/util.cc b/src/lib/util.cc index 62416163b..a5111b7dc 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2014 Carl Hetherington Copyright (C) 2000-2007 Paul Davis This program is free software; you can redistribute it and/or modify @@ -37,7 +37,6 @@ #include #include #include -#include #include #include #ifdef DCPOMATIC_WINDOWS @@ -52,6 +51,7 @@ #include #include #include +#include extern "C" { #include #include @@ -99,9 +99,9 @@ using std::streampos; using std::set_terminate; using boost::shared_ptr; using boost::thread; -using boost::lexical_cast; using boost::optional; using libdcp::Size; +using libdcp::raw_convert; static boost::thread::id ui_thread; static boost::filesystem::path backtrace_file; @@ -729,14 +729,14 @@ int get_required_int (multimap const & kv, string k) { string const v = get_required_string (kv, k); - return lexical_cast (v); + return raw_convert (v); } float get_required_float (multimap const & kv, string k) { string const v = get_required_string (kv, k); - return lexical_cast (v); + return raw_convert (v); } string @@ -766,7 +766,7 @@ get_optional_int (multimap const & kv, string k) return 0; } - return lexical_cast (i->second); + return raw_convert (i->second); } /** Trip an assert if the caller is not in the UI thread */ @@ -852,25 +852,6 @@ FrameRateConversion::FrameRateConversion (float source, int dcp) } } -LocaleGuard::LocaleGuard () - : _old (0) -{ - char const * old = setlocale (LC_NUMERIC, 0); - - if (old) { - _old = strdup (old); - if (strcmp (_old, "C")) { - setlocale (LC_NUMERIC, "C"); - } - } -} - -LocaleGuard::~LocaleGuard () -{ - setlocale (LC_NUMERIC, _old); - free (_old); -} - bool valid_image_file (boost::filesystem::path f) { diff --git a/src/lib/util.h b/src/lib/util.h index 473c90239..e85abf402 100644 --- a/src/lib/util.h +++ b/src/lib/util.h @@ -166,16 +166,6 @@ private: extern int64_t video_frames_to_audio_frames (VideoContent::Frame v, float audio_sample_rate, float frames_per_second); -class LocaleGuard -{ -public: - LocaleGuard (); - ~LocaleGuard (); - -private: - char* _old; -}; - class ScopedTemporary { public: diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index b704b6447..783cddafa 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -20,6 +20,7 @@ #include #include #include +#include #include "video_content.h" #include "video_examiner.h" #include "compose.hpp" @@ -45,9 +46,9 @@ using std::setprecision; using std::cout; using std::vector; using boost::shared_ptr; -using boost::lexical_cast; using boost::optional; using boost::dynamic_pointer_cast; +using libdcp::raw_convert; vector VideoContentScale::_scales; @@ -155,15 +156,15 @@ void VideoContent::as_xml (xmlpp::Node* node) const { boost::mutex::scoped_lock lm (_mutex); - node->add_child("VideoLength")->add_child_text (lexical_cast (_video_length)); - node->add_child("VideoWidth")->add_child_text (lexical_cast (_video_size.width)); - node->add_child("VideoHeight")->add_child_text (lexical_cast (_video_size.height)); - node->add_child("VideoFrameRate")->add_child_text (lexical_cast (_video_frame_rate)); - node->add_child("VideoFrameType")->add_child_text (lexical_cast (static_cast (_video_frame_type))); - node->add_child("LeftCrop")->add_child_text (boost::lexical_cast (_crop.left)); - node->add_child("RightCrop")->add_child_text (boost::lexical_cast (_crop.right)); - node->add_child("TopCrop")->add_child_text (boost::lexical_cast (_crop.top)); - node->add_child("BottomCrop")->add_child_text (boost::lexical_cast (_crop.bottom)); + node->add_child("VideoLength")->add_child_text (raw_convert (_video_length)); + node->add_child("VideoWidth")->add_child_text (raw_convert (_video_size.width)); + node->add_child("VideoHeight")->add_child_text (raw_convert (_video_size.height)); + node->add_child("VideoFrameRate")->add_child_text (raw_convert (_video_frame_rate)); + node->add_child("VideoFrameType")->add_child_text (raw_convert (static_cast (_video_frame_type))); + node->add_child("LeftCrop")->add_child_text (raw_convert (_crop.left)); + node->add_child("RightCrop")->add_child_text (raw_convert (_crop.right)); + node->add_child("TopCrop")->add_child_text (raw_convert (_crop.top)); + node->add_child("BottomCrop")->add_child_text (raw_convert (_crop.bottom)); _scale.as_xml (node->add_child("Scale")); _colour_conversion.as_xml (node->add_child("ColourConversion")); } diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc index 39bc0825b..c1f3e2067 100644 --- a/src/wx/audio_mapping_view.cc +++ b/src/wx/audio_mapping_view.cc @@ -58,8 +58,6 @@ public: void Draw (wxGrid& grid, wxGridCellAttr &, wxDC& dc, const wxRect& rect, int row, int col, bool) { - LocaleGuard lg; - dc.SetPen (*wxThePenList->FindOrCreatePen (wxColour (255, 255, 255), 1, wxPENSTYLE_SOLID)); dc.SetBrush (*wxTheBrushList->FindOrCreateBrush (wxColour (255, 255, 255), wxBRUSHSTYLE_SOLID)); dc.DrawRectangle (rect); @@ -224,8 +222,6 @@ AudioMappingView::set (AudioMapping map) void AudioMappingView::update_cells () { - LocaleGuard lg; - if (_grid->GetNumberRows ()) { _grid->DeleteRows (0, _grid->GetNumberRows ()); } -- 2.30.2