diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-16 19:05:32 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-16 19:05:32 +0100 |
| commit | 0fc06bed5b8128f86f80a819fe529c9be548b1a3 (patch) | |
| tree | a831e485fd9d87786e43c2a6d3712b71a8b4c6f0 /src/lib | |
| parent | 09fcffa01669ee9f146c6c0e86be0f26b6dcd165 (diff) | |
Remove unused Film copy-constructor.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/film.cc | 21 | ||||
| -rw-r--r-- | src/lib/film.h | 5 |
2 files changed, 4 insertions, 22 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index eb86775e0..9d78c930b 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -127,27 +127,6 @@ Film::Film (string d) _log.reset (new FileLog ("log")); } -Film::Film (Film const & o) - : boost::enable_shared_from_this<Film> (o) - /* note: the copied film shares the original's log */ - , _log (o._log) - , _playlist (new Playlist (o._playlist)) - , _directory (o._directory) - , _name (o._name) - , _use_dci_name (o._use_dci_name) - , _dcp_content_type (o._dcp_content_type) - , _container (o._container) - , _scaler (o._scaler) - , _with_subtitles (o._with_subtitles) - , _j2k_bandwidth (o._j2k_bandwidth) - , _dci_metadata (o._dci_metadata) - , _dcp_video_frame_rate (o._dcp_video_frame_rate) - , _dci_date (o._dci_date) - , _dirty (o._dirty) -{ - _playlist->ContentChanged.connect (bind (&Film::playlist_content_changed, this, _1, _2)); -} - string Film::video_identifier () const { diff --git a/src/lib/film.h b/src/lib/film.h index 6e9e19548..96ba3eafd 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -53,7 +53,6 @@ class Film : public boost::enable_shared_from_this<Film> { public: Film (std::string d); - Film (Film const &); std::string info_dir () const; std::string j2c_path (int f, bool t) const; @@ -225,6 +224,10 @@ public: static int const state_version; private: + + /* No copy construction */ + Film (Film const &); + Film & operator= (Film const &); void signal_changed (Property); std::string video_identifier () const; |
