diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-12-22 20:42:09 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-12-22 20:42:09 +0000 |
| commit | 21d3f3889ede9bd4b2c48424715e44ad2c405500 (patch) | |
| tree | 720382f460c5e6139f7aedc9f9106ef9a6cb3675 /src/lib | |
| parent | 9de1a9516f1fad4cc669cb7622b8f2828eddcbf9 (diff) | |
Add -Wextra and fix the warnings.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/combiner.cc | 4 | ||||
| -rw-r--r-- | src/lib/decoder.cc | 5 | ||||
| -rw-r--r-- | src/lib/film.cc | 3 | ||||
| -rw-r--r-- | src/lib/util.cc | 1 |
4 files changed, 7 insertions, 6 deletions
diff --git a/src/lib/combiner.cc b/src/lib/combiner.cc index d5f55026b..68aafd2a2 100644 --- a/src/lib/combiner.cc +++ b/src/lib/combiner.cc @@ -29,11 +29,11 @@ Combiner::Combiner (Log* log) } /** Process video for the left half of the frame. + * Subtitle parameter will be ignored. * @param image Frame image. - * @param sub Subtitle (which will be ignored) */ void -Combiner::process_video (shared_ptr<Image> image, bool, shared_ptr<Subtitle> sub) +Combiner::process_video (shared_ptr<Image> image, bool, shared_ptr<Subtitle>) { _image = image; } diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc index 61e63460b..7066b488e 100644 --- a/src/lib/decoder.cc +++ b/src/lib/decoder.cc @@ -57,12 +57,11 @@ Decoder::Decoder (boost::shared_ptr<Film> f, boost::shared_ptr<const DecodeOptio _film_connection = f->Changed.connect (bind (&Decoder::film_changed, this, _1)); } -/** Seek. - * @param p Position as a source timestamp in seconds. +/** Seek to a position as a source timestamp in seconds. * @return true on error. */ bool -Decoder::seek (double p) +Decoder::seek (double) { throw DecodeError ("decoder does not support seek"); } diff --git a/src/lib/film.cc b/src/lib/film.cc index e7687fe3c..1abf8e91f 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -141,7 +141,8 @@ Film::Film (string d, bool must_exist) } Film::Film (Film const & o) - : _log (0) + : boost::enable_shared_from_this<Film> (o) + , _log (0) , _directory (o._directory) , _name (o._name) , _use_dci_name (o._use_dci_name) diff --git a/src/lib/util.cc b/src/lib/util.cc index a68496e94..45965385c 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -428,6 +428,7 @@ Socket::check () void Socket::connect (asio::ip::basic_resolver_entry<asio::ip::tcp> const & endpoint, int timeout) { + _deadline.expires_from_now (posix_time::seconds (timeout)); system::error_code ec = asio::error::would_block; _socket.async_connect (endpoint, lambda::var(ec) = lambda::_1); do { |