Merge master.

diff --cc ChangeLog
index 78954c82da4b1fe42918bf5e7af6ddcc255d87ee,8ad710af238db6fc673ac89c1c0e442ed7f2406d..126730e27f8e232e481b470e7fda00549606f49e
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,55 +1,59 @@@
 +2014-03-07  Carl Hetherington  <cth@carlh.net>
 +
 +      * Add subtitle view.
 +
+ 2014-06-12  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 1.69.26 released.
+ 
+ 2014-06-12  Carl Hetherington  <cth@carlh.net>
+ 
+       * Fix bug where DCP-o-matic does not recreate video after
+       subtitles are turned on or off.
+ 
+ 2014-06-10  Carl Hetherington  <cth@carlh.net>
+ 
+       * Support ISDCF naming convention version 9 (#257).
+ 
+       * Rename DCI to ISDCF when talking about the digital cinema
+       naming convention (#362).
+ 
+       * Fix crash when opening the timeline with no content (#369).
+ 
+ 2014-06-09  Carl Hetherington  <cth@carlh.net>
+ 
+       * Fix server/client with non-RGB24 sources.
+ 
+       * Version 1.69.25 released.
+ 
+ 2014-06-09  Carl Hetherington  <cth@carlh.net>
+ 
+       * Make audio gain a floating-point value in the UI (#367).
+ 
+       * Work-around out-of-memory crashes with large start trims (#252).
+ 
+       * Version 1.69.24 released.
+ 
+ 2014-06-06  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 1.69.23 released.
+ 
+ 2014-06-05  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 1.69.22 released.
+ 
+ 2014-06-05  Carl Hetherington  <cth@carlh.net>
+ 
+       * Large speed-up to multi-image source file decoding.
+ 
+       * Back-port changes from v2 which work out how separate
+       audio files should be resampled by looking at the video
+       files which are present at the same time.
+ 
+ 2014-06-03  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 1.69.21 released.
+ 
  2014-06-03  Carl Hetherington  <cth@carlh.net>
  
        * Fix bad resampling of separate sound file sources that

diff --cc cscript
Simple merge

diff --cc src/lib/audio_content.cc
Simple merge

diff --cc src/lib/audio_content.h
index 1ceb01f780edd20cb91fc4849527e9d27df64d5a,2c324a3a4966e0dad899c10f24f3f99115317420..336a98629bae47b103cdb0d3d88e15ced581cfaa
--- 1/src/lib/audio_content.h
--- 2/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@@ -58,24 -51,21 +58,24 @@@ public
        void as_xml (xmlpp::Node *) const;
        std::string technical_summary () const;
  
 +      /** @return number of audio channels in the content */
        virtual int audio_channels () const = 0;
 -      virtual AudioContent::Frame audio_length () const = 0;
 -      virtual int content_audio_frame_rate () const = 0;
 +      /** @return the length of the audio in the content */
 +      virtual ContentTime audio_length () const = 0;
 +      /** @return the frame rate of the content */
 +      virtual int audio_frame_rate () const = 0;
        virtual AudioMapping audio_mapping () const = 0;
 -      virtual void set_audio_mapping (AudioMapping) = 0;
 +      virtual void set_audio_mapping (AudioMapping);
        virtual boost::filesystem::path audio_analysis_path () const;
  
 -      int output_audio_frame_rate () const;
 -      
 +      int resampled_audio_frame_rate () const;
 +
        boost::signals2::connection analyse_audio (boost::function<void()>);
  
-       void set_audio_gain (float);
+       void set_audio_gain (double);
        void set_audio_delay (int);
        
-       float audio_gain () const {
+       double audio_gain () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _audio_gain;
        }

diff --cc src/lib/config.cc
Simple merge

diff --cc src/lib/config.h
index ccd37ec1e22a2bc2d133b82138bf0a6268428196,671f53ef32dbcaf955f8109e6d46de6444ab8158..f0d2630d0c893b22edf39c7a041d52e5d30ba2f4
--- 1/src/lib/config.h
--- 2/src/lib/config.h
+++ b/src/lib/config.h
@@@ -28,8 -28,8 +28,8 @@@
  #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 "isdcf_metadata.h"
  #include "colour_conversion.h"
  #include "server.h"
  

diff --cc src/lib/content.cc
index b6678cb4d9e7e9555773beb8746754755f0673e9,7966219ff60a4bf186a3af6ce58a6b52aa0a97e5..bbbe9b6ce4bdd4dd5ff6b8dcf231c8d08126e253
--- 1/src/lib/content.cc
--- 2/src/lib/content.cc
+++ b/src/lib/content.cc
@@@ -40,8 -36,9 +40,9 @@@ using std::set
  using std::list;
  using std::cout;
  using std::vector;
+ using std::max;
  using boost::shared_ptr;
 -using libdcp::raw_convert;
 +using dcp::raw_convert;
  
  int const ContentProperty::PATH = 400;
  int const ContentProperty::POSITION = 401;
@@@ -209,13 -206,22 +210,13 @@@ Content::clone () cons
  string
  Content::technical_summary () const
  {
 -      return String::compose ("%1 %2 %3", path_summary(), digest(), position());
 +      return String::compose ("%1 %2 %3", path_summary(), digest(), position().seconds());
  }
  
 -Time
 +DCPTime
  Content::length_after_trim () const
  {
-       return full_length() - trim_start() - trim_end();
 -      return max (int64_t (0), full_length() - trim_start() - trim_end());
 -}
 -
 -/** @param t A time relative to the start of this content (not the position).
 - *  @return true if this time is trimmed by our trim settings.
 - */
 -bool
 -Content::trimmed (Time t) const
 -{
 -      return (t < trim_start() || t > (full_length() - trim_end ()));
++      return max (DCPTime (), full_length() - trim_start() - trim_end());
  }
  
  /** @return string which includes everything about how this content affects

diff --cc src/lib/dcp_content_type.cc
index b3a45e40e410e156d5e4b94ff6032ee2e0011d77,f24ed95ea24de85c74dd4d6b646fe744cc526f36..e5466e1398936c1e4917efe11e95fa1cf5b12472
--- 1/src/lib/dcp_content_type.cc
--- 2/src/lib/dcp_content_type.cc
+++ b/src/lib/dcp_content_type.cc
@@@ -30,10 -30,10 +30,10 @@@ using namespace std
  
  vector<DCPContentType const *> DCPContentType::_dcp_content_types;
  
 -DCPContentType::DCPContentType (string p, libdcp::ContentKind k, string d)
 +DCPContentType::DCPContentType (string p, dcp::ContentKind k, string d)
        : _pretty_name (p)
        , _libdcp_kind (k)
-       , _dci_name (d)
+       , _isdcf_name (d)
  {
  
  }

diff --cc src/lib/dcp_content_type.h
index 05f30af5515d5c4ad1cd5713fb59d6200164a562,88f3c4a857e18d8e1574846906118ec1921c344f..ebfe09518a5577189e745d05d0a37bfd6d1ce04c
--- 1/src/lib/dcp_content_type.h
--- 2/src/lib/dcp_content_type.h
+++ b/src/lib/dcp_content_type.h
@@@ -58,8 -58,8 +58,8 @@@ public
  
  private:
        std::string _pretty_name;
 -      libdcp::ContentKind _libdcp_kind;
 +      dcp::ContentKind _libdcp_kind;
-       std::string _dci_name;
+       std::string _isdcf_name;
  
        /** All available DCP content types */
        static std::vector<DCPContentType const *> _dcp_content_types;

diff --cc src/lib/ffmpeg_content.cc
index 9889d511cd45016c97b08746bce15856a953e265,4d886a6ddf224ceabc38d15369d9da1bb4261806..d3e0fa7b25687010a18cc2797db9aa9a76df3483
--- 1/src/lib/ffmpeg_content.cc
--- 2/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@@ -394,18 -482,3 +395,21 @@@ FFmpegContent::audio_analysis_path () c
        p /= name;
        return p;
  }
 +
 +bool
 +FFmpegContent::has_subtitle_during (ContentTimePeriod period) const
 +{
 +      shared_ptr<FFmpegSubtitleStream> stream = subtitle_stream ();
++      if (!stream) {
++              return false;
++      }
 +
 +      /* XXX: inefficient */
 +      for (vector<ContentTimePeriod>::const_iterator i = stream->periods.begin(); i != stream->periods.end(); ++i) {
 +              if (i->from <= period.to && i->to >= period.from) {
 +                      return true;
 +              }
 +      }
 +
 +      return false;
 +}

diff --cc src/lib/film.cc
index 25730ae1cbe8bff7e07da16c6eced81e099c7c79,609003bbae7f2f632c1d190da567b70ce6133e18..14735d1b1048be4fa5c507e1fcf2f968eb4f6800
--- 1/src/lib/film.cc
--- 2/src/lib/film.cc
+++ b/src/lib/film.cc
@@@ -90,11 -90,10 +90,13 @@@ using dcp::raw_convert
   * Subtitle offset changed to subtitle y offset, and subtitle x offset added.
   * 7 -> 8
   * Use <Scale> tag in <VideoContent> rather than <Ratio>.
+  * 8 -> 9
+  * DCI -> ISDCF
 + *
 + * Bumped to 32 for 2.0 branch; some times are expressed in Times rather
 + * than frames now.
   */
 -int const Film::current_state_version = 9;
 +int const Film::current_state_version = 32;
  
  /** Construct a Film object in a given directory.
   *
@@@ -511,12 -552,30 +555,30 @@@ Film::isdcf_name (bool if_created_now) 
        if (video_frame_rate() != 24) {
                d << "-" << video_frame_rate();
        }
- 
+       
        if (container()) {
-               d << "_" << container()->dci_name();
+               d << "_" << container()->isdcf_name();
        }
  
-       DCIMetadata const dm = dci_metadata ();
+       /* XXX: this only works for content which has been scaled to a given ratio,
+          and uses the first bit of content only.
+       */
+ 
+       /* The standard says we don't do this for trailers, for some strange reason */
 -      if (dcp_content_type() && dcp_content_type()->libdcp_kind() != libdcp::TRAILER) {
++      if (dcp_content_type() && dcp_content_type()->libdcp_kind() != dcp::TRAILER) {
+               ContentList cl = content ();
+               Ratio const * content_ratio = 0;
+               for (ContentList::const_iterator i = cl.begin(); i != cl.end(); ++i) {
+                       shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (*i);
+                       if (vc && (content_ratio == 0 || vc->scale().ratio() != content_ratio)) {
+                               content_ratio = vc->scale().ratio();
+                       }
+               }
+               
+               if (content_ratio && content_ratio != container()) {
+                       d << "-" << content_ratio->isdcf_name();
+               }
+       }
  
        if (!dm.audio_language.empty ()) {
                d << "_" << dm.audio_language;

diff --cc src/lib/film.h
index d9d7e82fd2140a4cbf9fae20c69ea9e6badd4db6,96ea930ccd10a493e7c24099ebc487a77cdb8991..067588fa3f42a52d7988aa930840f6d0a7b31863
--- 1/src/lib/film.h
--- 2/src/lib/film.h
+++ b/src/lib/film.h
@@@ -31,12 -31,12 +31,13 @@@
  #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/decrypted_kdm.h>
 +#include <dcp/encrypted_kdm.h>
  #include "util.h"
  #include "types.h"
- #include "dci_metadata.h"
+ #include "isdcf_metadata.h"
+ #include "frame_rate_change.h"
  
  class DCPContentType;
  class Log;

diff --cc src/lib/frame_rate_change.h
Simple merge

diff --cc src/lib/image_content.cc
Simple merge

diff --cc src/lib/image_proxy.cc
index 16bd92f6ece1ea0f933cc0b09ec8a168533c0ece,4e2f8a1354f9d8ccbc8b6f9cf1de5905935758cd..1eb9c169c5c3b375d4677b61f6b19bdc58af71db
--- 1/src/lib/image_proxy.cc
--- 2/src/lib/image_proxy.cc
+++ b/src/lib/image_proxy.cc
@@@ -69,8 -69,9 +69,9 @@@ voi
  RawImageProxy::add_metadata (xmlpp::Node* node) const
  {
        node->add_child("Type")->add_child_text (N_("Raw"));
 -      node->add_child("Width")->add_child_text (libdcp::raw_convert<string> (_image->size().width));
 -      node->add_child("Height")->add_child_text (libdcp::raw_convert<string> (_image->size().height));
 -      node->add_child("PixelFormat")->add_child_text (libdcp::raw_convert<string> (_image->pixel_format ()));
 +      node->add_child("Width")->add_child_text (dcp::raw_convert<string> (_image->size().width));
 +      node->add_child("Height")->add_child_text (dcp::raw_convert<string> (_image->size().height));
++      node->add_child("PixelFormat")->add_child_text (dcp::raw_convert<string> (_image->pixel_format ()));
  }
  
  void
@@@ -127,22 -128,17 +128,16 @@@ MagickImageProxy::image () cons
                throw DecodeError (_("Could not decode image file"));
        }
  
 +      dcp::Size size (magick_image->columns(), magick_image->rows());
        LOG_TIMING ("[%1] MagickImageProxy decode finished", boost::this_thread::get_id ());
  
 -      libdcp::Size size (magick_image->columns(), magick_image->rows());
 -
        _image.reset (new Image (PIX_FMT_RGB24, size, true));
  
-       using namespace MagickCore;
-       
+       /* Write line-by-line here as _image must be aligned, and write() cannot be told about strides */
        uint8_t* p = _image->data()[0];
-       for (int y = 0; y < size.height; ++y) {
-               uint8_t* q = p;
-               for (int x = 0; x < size.width; ++x) {
-                       Magick::Color c = magick_image->pixelColor (x, y);
-                       *q++ = c.redQuantum() * 255 / QuantumRange;
-                       *q++ = c.greenQuantum() * 255 / QuantumRange;
-                       *q++ = c.blueQuantum() * 255 / QuantumRange;
-               }
+       for (int i = 0; i < size.height; ++i) {
+               using namespace MagickCore;
+               magick_image->write (0, i, size.width, 1, "RGB", CharPixel, p);
                p += _image->stride()[0];
        }
  

diff --cc src/lib/isdcf_metadata.cc
index 0000000000000000000000000000000000000000,dfba50a9a2262ecf02c9e95a026cc9d2abab77a7..7d960b6ac758538d0728b68501a803e0368dcc7d
mode 000000,100644..100644
--- /dev/null
--- 2/src/lib/isdcf_metadata.cc
+++ b/src/lib/isdcf_metadata.cc
@@@ -1,0 -1,88 +1,88 @@@
 -#include <libdcp/raw_convert.h>
+ /*
+     Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+ 
+     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
+     the Free Software Foundation; either version 2 of the License, or
+     (at your option) any later version.
+ 
+     This program 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 this program; if not, write to the Free Software
+     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+ */
+ 
+ #include <iostream>
+ #include <libcxml/cxml.h>
 -using libdcp::raw_convert;
++#include <dcp/raw_convert.h>
+ #include "isdcf_metadata.h"
+ 
+ #include "i18n.h"
+ 
+ using std::string;
+ using boost::shared_ptr;
 -ISDCFMetadata::ISDCFMetadata (shared_ptr<const cxml::Node> node)
++using dcp::raw_convert;
+ 
++ISDCFMetadata::ISDCFMetadata (cxml::ConstNodePtr node)
+ {
+       content_version = node->number_child<int> ("ContentVersion");
+       audio_language = node->string_child ("AudioLanguage");
+       subtitle_language = node->string_child ("SubtitleLanguage");
+       territory = node->string_child ("Territory");
+       rating = node->string_child ("Rating");
+       studio = node->string_child ("Studio");
+       facility = node->string_child ("Facility");
+       package_type = node->string_child ("PackageType");
+ 
+       /* This stuff was added later */
+       temp_version = node->optional_bool_child ("TempVersion").get_value_or (false);
+       pre_release = node->optional_bool_child ("PreRelease").get_value_or (false);
+       red_band = node->optional_bool_child ("RedBand").get_value_or (false);
+       chain = node->optional_string_child ("Chain").get_value_or ("");
+       two_d_version_of_three_d = node->optional_bool_child ("TwoDVersionOfThreeD").get_value_or (false);
+       mastered_luminance = node->optional_string_child ("MasteredLuminance").get_value_or ("");
+ }
+ 
+ void
+ ISDCFMetadata::as_xml (xmlpp::Node* root) const
+ {
+       root->add_child("ContentVersion")->add_child_text (raw_convert<string> (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);
+       root->add_child("Rating")->add_child_text (rating);
+       root->add_child("Studio")->add_child_text (studio);
+       root->add_child("Facility")->add_child_text (facility);
+       root->add_child("PackageType")->add_child_text (package_type);
+       root->add_child("TempVersion")->add_child_text (temp_version ? "1" : "0");
+       root->add_child("PreRelease")->add_child_text (pre_release ? "1" : "0");
+       root->add_child("RedBand")->add_child_text (red_band ? "1" : "0");
+       root->add_child("Chain")->add_child_text (chain);
+       root->add_child("TwoDVersionOfThreeD")->add_child_text (two_d_version_of_three_d ? "1" : "0");
+       root->add_child("MasteredLuminance")->add_child_text (mastered_luminance);
+ }
+ 
+ void
+ ISDCFMetadata::read_old_metadata (string k, string v)
+ {
+       if (k == N_("audio_language")) {
+               audio_language = v;
+       } else if (k == N_("subtitle_language")) {
+               subtitle_language = v;
+       } else if (k == N_("territory")) {
+               territory = v;
+       } else if (k == N_("rating")) {
+               rating = v;
+       } else if (k == N_("studio")) {
+               studio = v;
+       } else if (k == N_("facility")) {
+               facility = v;
+       } else if (k == N_("package_type")) {
+               package_type = v;
+       }
+ }     

diff --cc src/lib/isdcf_metadata.h
index 0000000000000000000000000000000000000000,0fb7e7baa0e1292468e0573d5d7424e7e7c165b2..e63f290e47de854ed9347433739eafc57564015d
mode 000000,100644..100644
--- /dev/null
--- 2/src/lib/isdcf_metadata.h
+++ b/src/lib/isdcf_metadata.h
@@@ -1,0 -1,68 +1,65 @@@
 -
 -namespace cxml {
 -      class Node;
 -}
+ /*
+     Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ 
+     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
+     the Free Software Foundation; either version 2 of the License, or
+     (at your option) any later version.
+ 
+     This program 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 this program; if not, write to the Free Software
+     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+ */
+ 
+ #ifndef DCPOMATIC_ISDCF_METADATA_H
+ #define DCPOMATIC_ISDCF_METADATA_H
+ 
+ #include <string>
+ #include <libxml++/libxml++.h>
 -      ISDCFMetadata (boost::shared_ptr<const cxml::Node>);
++#include <libcxml/cxml.h>
+ 
+ class ISDCFMetadata
+ {
+ public:
+       ISDCFMetadata ()
+               : content_version (1)
+               , temp_version (false)
+               , pre_release (false)
+               , red_band (false)
+               , two_d_version_of_three_d (false)
+       {}
+       
++      ISDCFMetadata (cxml::ConstNodePtr);
+ 
+       void as_xml (xmlpp::Node *) const;
+       void read_old_metadata (std::string, std::string);
+ 
+       int content_version;
+       std::string audio_language;
+       std::string subtitle_language;
+       std::string territory;
+       std::string rating;
+       std::string studio;
+       std::string facility;
+       std::string package_type;
+       /** true if this is a temporary version (without final picture or sound) */
+       bool temp_version;
+       /** true if this is a pre-release version (final picture and sound, but without accessibility features) */
+       bool pre_release;
+       /** true if this has adult content */
+       bool red_band;
+       /** specific theatre chain or event */
+       std::string chain;
+       /** true if this is a 2D version of content that also exists in 3D */
+       bool two_d_version_of_three_d;
+       /** mastered luminance if there are multiple versions distributed (e.g. 35, 4fl, 6fl etc.) */
+       std::string mastered_luminance;
+ };
+ 
+ #endif

diff --cc src/lib/player.cc
index c3489b7e1f227d3c6645cce9ab65fcf06348f51c,7bf78c905248487e2e9d3723c38d267827e4a11b..d0eb27aa31cc4ab0eb404deec5ac47157dbf330f
--- 1/src/lib/player.cc
--- 2/src/lib/player.cc
+++ b/src/lib/player.cc
@@@ -36,12 -32,11 +36,13 @@@
  #include "image.h"
  #include "image_proxy.h"
  #include "ratio.h"
 -#include "resampler.h"
  #include "log.h"
  #include "scaler.h"
 +#include "render_subtitles.h"
 +#include "config.h"
 +#include "content_video.h"
  #include "player_video_frame.h"
+ #include "frame_rate_change.h"
  
  #define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
  

diff --cc src/lib/playlist.h
index 6280b1219057d0e2b00e2200ca8a9e08b7692946,effc521012dfbc70779f5bfd9f4befe2a79d4616..7c29b85887c82e55791fdc85209125adc198ac53
--- 1/src/lib/playlist.h
--- 2/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@@ -25,7 -25,7 +25,8 @@@
  #include <boost/enable_shared_from_this.hpp>
  #include "ffmpeg_content.h"
  #include "audio_mapping.h"
 +#include "util.h"
+ #include "frame_rate_change.h"
  
  class Content;
  class FFmpegContent;

diff --cc src/lib/ratio.cc
Simple merge

diff --cc src/lib/ratio.h
Simple merge

diff --cc src/lib/server.cc
Simple merge

diff --cc src/lib/sndfile_content.cc
index ed4f8ffd527ebde2358319d8344456829d25448c,3efba6fd5db219c38e6f93249d28155786020934..37f2055359aa8a9d39dcced316a5476cd57bcec8
--- 1/src/lib/sndfile_content.cc
--- 2/src/lib/sndfile_content.cc
+++ b/src/lib/sndfile_content.cc
@@@ -155,6 -166,5 +155,5 @@@ SndfileContent::set_audio_mapping (Audi
                _audio_mapping = m;
        }
  
 -      signal_changed (AudioContentProperty::AUDIO_MAPPING);
 +      AudioContent::set_audio_mapping (m);
  }
- 

diff --cc src/lib/util.cc
Simple merge

diff --cc src/lib/video_content.cc
Simple merge

diff --cc src/lib/wscript
index 51aadb83f40718a549eac9e222bce49395bd69bb,9333687769fe1acd1ade6bbffd4e3adf4318092d..407d9cde41551abab31aa43179de352b1ea26561
--- 1/src/lib/wscript
--- 2/src/lib/wscript
+++ b/src/lib/wscript
@@@ -13,12 -13,10 +13,11 @@@ sources = ""
            config.cc
            content.cc
            content_factory.cc
 +          content_subtitle.cc
            cross.cc
-           dci_metadata.cc
            dcp_content_type.cc
            dcp_video_frame.cc
 -          decoder.cc
 +          dcpomatic_time.cc
            dolby_cp750.cc
            encoder.cc
            examine_content_job.cc

diff --cc src/tools/dcpomatic_create.cc
Simple merge

diff --cc src/wx/about_dialog.cc
Simple merge

diff --cc src/wx/audio_panel.cc
Simple merge

diff --cc src/wx/config_dialog.cc
Simple merge

diff --cc src/wx/content_widget.h
Simple merge

diff --cc src/wx/film_editor.cc
Simple merge

diff --cc src/wx/timeline.cc
index d5643b556db5747c7e80099165217886435f0b87,d4df6d8b2be2b246005b6c543d3ec8d5eeab3f60..4b56168a1d0636be5d56642d212b8050e19b61ce
--- 1/src/wx/timeline.cc
--- 2/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@@ -66,9 -64,9 +66,9 @@@ public
  protected:
        virtual void do_paint (wxGraphicsContext *) = 0;
        
 -      int time_x (Time t) const
 +      int time_x (DCPTime t) const
        {
-               return _timeline.tracks_position().x + t.seconds() * _timeline.pixels_per_second ();
 -              return _timeline.tracks_position().x + t * _timeline.pixels_per_time_unit().get_value_or (0);
++              return _timeline.tracks_position().x + t.seconds() * _timeline.pixels_per_second().get_value_or (0);
        }
        
        Timeline& _timeline;
@@@ -105,7 -101,7 +105,7 @@@ public
                return dcpomatic::Rect<int> (
                        time_x (content->position ()) - 8,
                        y_pos (_track.get()) - 8,
-                       content->length_after_trim().seconds() * _timeline.pixels_per_second() + 16,
 -                      content->length_after_trim () * _timeline.pixels_per_time_unit().get_value_or(0) + 16,
++                      content->length_after_trim().seconds() * _timeline.pixels_per_second().get_value_or(0) + 16,
                        _timeline.track_height() + 16
                        );
        }
@@@ -176,7 -172,7 +176,7 @@@ private
                wxDouble name_leading;
                gc->GetTextExtent (name, &name_width, &name_height, &name_descent, &name_leading);
                
-               gc->Clip (wxRegion (time_x (position), y_pos (_track.get()), len.seconds() * _timeline.pixels_per_second(), _timeline.track_height()));
 -              gc->Clip (wxRegion (time_x (position), y_pos (_track.get()), len * _timeline.pixels_per_time_unit().get_value_or(0), _timeline.track_height()));
++              gc->Clip (wxRegion (time_x (position), y_pos (_track.get()), len.seconds() * _timeline.pixels_per_second().get_value_or(0), _timeline.track_height()));
                gc->DrawText (name, time_x (position) + 12, y_pos (_track.get() + 1) - name_height - 4);
                gc->ResetClip ();
        }
@@@ -292,20 -269,26 +292,26 @@@ private
  
        void do_paint (wxGraphicsContext* gc)
        {
 -              if (!_timeline.pixels_per_time_unit()) {
++              if (!_timeline.pixels_per_second()) {
+                       return;
+               }
+ 
 -              double const pptu = _timeline.pixels_per_time_unit().get ();
++              double const pps = _timeline.pixels_per_second().get ();
+               
                gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (0, 0, 0), 1, wxPENSTYLE_SOLID));
                
-               double mark_interval = rint (128 / _timeline.pixels_per_second ());
 -              int mark_interval = rint (128 / (TIME_HZ * pptu));
++              double mark_interval = rint (128 / pps);
                if (mark_interval > 5) {
 -                      mark_interval -= mark_interval % 5;
 +                      mark_interval -= int (rint (mark_interval)) % 5;
                }
                if (mark_interval > 10) {
 -                      mark_interval -= mark_interval % 10;
 +                      mark_interval -= int (rint (mark_interval)) % 10;
                }
                if (mark_interval > 60) {
 -                      mark_interval -= mark_interval % 60;
 +                      mark_interval -= int (rint (mark_interval)) % 60;
                }
                if (mark_interval > 3600) {
 -                      mark_interval -= mark_interval % 3600;
 +                      mark_interval -= int (rint (mark_interval)) % 3600;
                }
                
                if (mark_interval < 1) {
@@@ -317,9 -300,8 +323,9 @@@
                path.AddLineToPoint (_timeline.width(), _y);
                gc->StrokePath (path);
  
 -              Time t = 0;
 -              while ((t * pptu) < _timeline.width()) {
 +              /* Time in seconds */
 +              DCPTime t;
-               while ((t.seconds() * _timeline.pixels_per_second()) < _timeline.width()) {
++              while ((t.seconds() * pps) < _timeline.width()) {
                        wxGraphicsPath path = gc->CreatePath ();
                        path.MoveToPoint (time_x (t), _y - 4);
                        path.AddLineToPoint (time_x (t), _y + 4);
@@@ -339,7 -321,7 +345,7 @@@
                        wxDouble str_leading;
                        gc->GetTextExtent (str, &str_width, &str_height, &str_descent, &str_leading);
                        
-                       int const tx = _timeline.x_offset() + t.seconds() * _timeline.pixels_per_second();
 -                      int const tx = _timeline.x_offset() + t * pptu;
++                      int const tx = _timeline.x_offset() + t.seconds() * pps;
                        if ((tx + str_width) < _timeline.width()) {
                                gc->DrawText (str, time_x (t), _y + 16);
                        }
@@@ -602,6 -580,12 +607,12 @@@ Timeline::right_down (wxMouseEvent& ev
  void
  Timeline::set_position_from_event (wxMouseEvent& ev)
  {
 -      if (!_pixels_per_time_unit) {
++      if (!_pixels_per_second) {
+               return;
+       }
+ 
 -      double const pptu = _pixels_per_time_unit.get ();
++      double const pps = _pixels_per_second.get ();
+ 
        wxPoint const p = ev.GetPosition();
  
        if (!_first_move) {
@@@ -619,7 -603,7 +630,7 @@@
                return;
        }
        
-       DCPTime new_position = _down_view_position + DCPTime::from_seconds ((p.x - _down_point.x) / _pixels_per_second);
 -      Time new_position = _down_view_position + (p.x - _down_point.x) / pptu;
++      DCPTime new_position = _down_view_position + DCPTime::from_seconds ((p.x - _down_point.x) / pps);
        
        if (_snap) {
                
@@@ -660,7 -641,7 +671,7 @@@
                
                if (!first) {
                        /* Snap if it's close; `close' means within a proportion of the time on the timeline */
-                       if (nearest_distance < DCPTime::from_seconds ((width() / pixels_per_second()) / 32)) {
 -                      if (nearest_distance < (width() / pptu) / 32) {
++                      if (nearest_distance < DCPTime::from_seconds ((width() / pps) / 32)) {
                                new_position = nearest_new_position;
                        }
                }

diff --cc src/wx/timeline.h
index 35153dd175d4c13aa4f510656c3810a2a1bd38fc,7b4d75d091d7397e37be13476264977133402206..4ba1cc425f022b6fe11d634052f7915a5c012ee8
--- 1/src/wx/timeline.h
--- 2/src/wx/timeline.h
+++ b/src/wx/timeline.h
@@@ -52,8 -52,8 +52,8 @@@ public
                return 48;
        }
  
-       double pixels_per_second () const {
 -      boost::optional<double> pixels_per_time_unit () const {
 -              return _pixels_per_time_unit;
++      boost::optional<double> pixels_per_second () const {
 +              return _pixels_per_second;
        }
  
        Position<int> tracks_position () const {
@@@ -96,7 -96,7 +96,7 @@@ private
        ViewList _views;
        boost::shared_ptr<TimeAxisView> _time_axis_view;
        int _tracks;
-       double _pixels_per_second;
 -      boost::optional<double> _pixels_per_time_unit;
++      boost::optional<double> _pixels_per_second;
        bool _left_down;
        wxPoint _down_point;
        boost::shared_ptr<ContentView> _down_view;

diff --cc src/wx/timing_panel.cc
Simple merge

diff --cc src/wx/video_panel.cc
Simple merge

diff --cc src/wx/wscript
Simple merge

diff --cc src/wx/wx_util.cc
Simple merge

diff --cc test/4k_test.cc
Simple merge

diff --cc test/audio_delay_test.cc
Simple merge

diff --cc test/black_fill_test.cc
Simple merge

diff --cc test/client_server_test.cc
index c0eddd8f6a7f8eee16dcbbef3d27119a2cf45898,07af1255c486ea42380f570ba6a643d566aedde0..1816de8e693df8a1a4fac0bf29e324a12efede53
--- 1/test/client_server_test.cc
--- 2/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@@ -47,12 -39,12 +47,12 @@@ do_remote_encode (shared_ptr<DCPVideoFr
        BOOST_CHECK (remotely_encoded);
        
        BOOST_CHECK_EQUAL (locally_encoded->size(), remotely_encoded->size());
 -      BOOST_CHECK (memcmp (locally_encoded->data(), remotely_encoded->data(), locally_encoded->size()) == 0);
 +      BOOST_CHECK_EQUAL (memcmp (locally_encoded->data(), remotely_encoded->data(), locally_encoded->size()), 0);
  }
  
- BOOST_AUTO_TEST_CASE (client_server_test)
+ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
  {
 -      shared_ptr<Image> image (new Image (PIX_FMT_RGB24, libdcp::Size (1998, 1080), true));
 +      shared_ptr<Image> image (new Image (PIX_FMT_RGB24, dcp::Size (1998, 1080), true));
        uint8_t* p = image->data()[0];
        
        for (int y = 0; y < 1080; ++y) {
@@@ -78,7 -70,86 +78,86 @@@
                p += sub_image->stride()[0];
        }
  
-       shared_ptr<FileLog> log (new FileLog ("build/test/client_server_test.log"));
+       shared_ptr<FileLog> log (new FileLog ("build/test/client_server_test_rgb.log"));
+ 
+       shared_ptr<PlayerVideoFrame> pvf (
+               new PlayerVideoFrame (
+                       shared_ptr<ImageProxy> (new RawImageProxy (image, log)),
+                       Crop (),
 -                      libdcp::Size (1998, 1080),
 -                      libdcp::Size (1998, 1080),
++                      dcp::Size (1998, 1080),
++                      dcp::Size (1998, 1080),
+                       Scaler::from_id ("bicubic"),
+                       EYES_BOTH,
+                       PART_WHOLE,
+                       ColourConversion ()
+                       )
+               );
+ 
 -      pvf->set_subtitle (sub_image, Position<int> (50, 60));
++      pvf->set_subtitle (PositionImage (sub_image, Position<int> (50, 60)));
+ 
+       shared_ptr<DCPVideoFrame> frame (
+               new DCPVideoFrame (
+                       pvf,
+                       0,
+                       24,
+                       200000000,
+                       RESOLUTION_2K,
+                       log
+                       )
+               );
+ 
+       shared_ptr<EncodedData> locally_encoded = frame->encode_locally ();
+       BOOST_ASSERT (locally_encoded);
+       
+       Server* server = new Server (log, true);
+ 
+       new thread (boost::bind (&Server::run, server, 2));
+ 
+       /* Let the server get itself ready */
+       dcpomatic_sleep (1);
+ 
+       ServerDescription description ("localhost", 2);
+ 
+       list<thread*> threads;
+       for (int i = 0; i < 8; ++i) {
+               threads.push_back (new thread (boost::bind (do_remote_encode, frame, description, locally_encoded)));
+       }
+ 
+       for (list<thread*>::iterator i = threads.begin(); i != threads.end(); ++i) {
+               (*i)->join ();
+       }
+ 
+       for (list<thread*>::iterator i = threads.begin(); i != threads.end(); ++i) {
+               delete *i;
+       }
+ }
+ 
+ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
+ {
 -      shared_ptr<Image> image (new Image (PIX_FMT_YUV420P, libdcp::Size (1998, 1080), true));
++      shared_ptr<Image> image (new Image (PIX_FMT_YUV420P, dcp::Size (1998, 1080), true));
+       uint8_t* p = image->data()[0];
+ 
+       for (int i = 0; i < image->components(); ++i) {
+               uint8_t* p = image->data()[i];
+               for (int j = 0; j < image->line_size()[i]; ++j) {
+                       *p++ = j % 256;
+               }
+       }
+ 
 -      shared_ptr<Image> sub_image (new Image (PIX_FMT_RGBA, libdcp::Size (100, 200), true));
++      shared_ptr<Image> sub_image (new Image (PIX_FMT_RGBA, dcp::Size (100, 200), true));
+       p = sub_image->data()[0];
+       for (int y = 0; y < 200; ++y) {
+               uint8_t* q = p;
+               for (int x = 0; x < 100; ++x) {
+                       *q++ = y % 256;
+                       *q++ = x % 256;
+                       *q++ = (x + y) % 256;
+                       *q++ = 1;
+               }
+               p += sub_image->stride()[0];
+       }
+ 
+       shared_ptr<FileLog> log (new FileLog ("build/test/client_server_test_yuv.log"));
  
        shared_ptr<PlayerVideoFrame> pvf (
                new PlayerVideoFrame (

diff --cc test/colour_conversion_test.cc
index 6dba4b71cf43531a0a9a4be690f34d1508b0da7d,f850847b837164264ad81bdb28284c43dbdf4c6a..7de169dd3e305ad23d76dbaf12b756ef80ccaebb
--- 1/test/colour_conversion_test.cc
--- 2/test/colour_conversion_test.cc
+++ b/test/colour_conversion_test.cc
@@@ -27,11 -23,12 +27,11 @@@
  
  using std::cout;
  
 -/* Basic test of identifier() for ColourConversion (i.e. a hash of the numbers) */
  BOOST_AUTO_TEST_CASE (colour_conversion_test)
  {
 -      ColourConversion A (2.4, true, libdcp::colour_matrix::srgb_to_xyz, 2.6);
 -      ColourConversion B (2.4, false, libdcp::colour_matrix::srgb_to_xyz, 2.6);
 +      ColourConversion A (2.4, true, dcp::colour_matrix::srgb_to_xyz, 2.6);
 +      ColourConversion B (2.4, false, dcp::colour_matrix::srgb_to_xyz, 2.6);
  
-       BOOST_CHECK_EQUAL (A.identifier(), "246ff9b7dc32c0488948a32a713924b3");
-       BOOST_CHECK_EQUAL (B.identifier(), "a8d1da30f96a121d8db06a03409758b3");
+       BOOST_CHECK_EQUAL (A.identifier(), "1e720d2d99add654d7816f3b72da815e");
+       BOOST_CHECK_EQUAL (B.identifier(), "18751a247b22682b725bf9c4caf71522");
  }

diff --cc test/film_metadata_test.cc
index cc29f4472193255f0e5acc2020b5bf7df802975b,7440e43381e27dcb82530391f470607c13939332..70f29b998933d355df2b793797ad36d38c9a0205
--- 1/test/film_metadata_test.cc
--- 2/test/film_metadata_test.cc
+++ b/test/film_metadata_test.cc
@@@ -37,10 -33,14 +37,10 @@@ using boost::shared_ptr
  
  BOOST_AUTO_TEST_CASE (film_metadata_test)
  {
 -      string const test_film = "build/test/film_metadata_test";
 -      
 -      if (boost::filesystem::exists (test_film)) {
 -              boost::filesystem::remove_all (test_film);
 -      }
 +      shared_ptr<Film> f = new_test_film ("film_metadata_test");
 +      boost::filesystem::path dir = test_film_dir ("film_metadata_test");
  
-       f->_dci_date = boost::gregorian::from_undelimited_string ("20130211");
 -      shared_ptr<Film> f (new Film (test_film));
+       f->_isdcf_date = boost::gregorian::from_undelimited_string ("20130211");
        BOOST_CHECK (f->container() == 0);
        BOOST_CHECK (f->dcp_content_type() == 0);
  

diff --cc test/frame_rate_test.cc
index e1d4e43701270b8aeb99b8ec57e4d1fe5993e4db,7e197dc03bf12472c848579306d0be8d45360ea8..e8ebcea3b959833ccb1009c561c7b99f4394bbf5
--- 1/test/frame_rate_test.cc
--- 2/test/frame_rate_test.cc
+++ b/test/frame_rate_test.cc
@@@ -27,7 -22,7 +27,8 @@@
  #include "lib/config.h"
  #include "lib/ffmpeg_content.h"
  #include "lib/playlist.h"
 +#include "lib/ffmpeg_audio_stream.h"
+ #include "lib/frame_rate_change.h"
  #include "test.h"
  
  using boost::shared_ptr;

diff --cc test/recover_test.cc
Simple merge

diff --cc test/scaling_test.cc
Simple merge

diff --cc test/silence_padding_test.cc
Simple merge

diff --cc test/test.cc
index f57023836bcf5d38a2dbc4b23b8f635a26d76b5c,0b87b8062a67adc503bf076ba32624cf7678a2ff..1d8041656cf05e2acaf76081e327c00f7621661b
--- 1/test/test.cc
--- 2/test/test.cc
+++ b/test/test.cc
@@@ -67,10 -59,9 +67,10 @@@ struct TestConfi
  
                Config::instance()->set_num_local_encoding_threads (1);
                Config::instance()->set_server_port_base (61920);
-               Config::instance()->set_default_dci_metadata (DCIMetadata ());
+               Config::instance()->set_default_isdcf_metadata (ISDCFMetadata ());
                Config::instance()->set_default_container (static_cast<Ratio*> (0));
                Config::instance()->set_default_dcp_content_type (static_cast<DCPContentType*> (0));
 +              Config::instance()->set_default_audio_delay (0);
  
                ServerFinder::instance()->disable ();
  

diff --cc test/wscript
index c825506fb601999b1c1995247fdbe2027e3346a9,09df146737a95c3cff4b1e28e5eef0d655f84218..380d40d84e265d47a1fd7afc09c0903628c8178d
--- 1/test/wscript
--- 2/test/wscript
+++ b/test/wscript
@@@ -34,12 -31,12 +34,13 @@@ def build(bld)
                   film_metadata_test.cc
                   frame_rate_test.cc
                   image_test.cc
+                  isdcf_name_test.cc
                   job_test.cc
                   make_black_test.cc
 +                 player_test.cc
                   pixel_formats_test.cc
 -                 play_test.cc
                   ratio_test.cc
 +                 repeat_frame_test.cc
                   recover_test.cc
                   resampler_test.cc
                   scaling_test.cc