diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-07-06 20:42:12 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-07-06 20:42:12 +0100 |
| commit | 43877eccbedc0950ab253e76dd0cea691fd7a4b0 (patch) | |
| tree | 8b2e1b6d54a07d12b2842bd1c6a362b8e8b22c6d /src/lib/encoder.h | |
| parent | 3b970d4c3089bbf7ca2c7f59d8d18142ed49de65 (diff) | |
| parent | 52fba4ddf170de2e073d1c4736b9407bad525290 (diff) | |
Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
Diffstat (limited to 'src/lib/encoder.h')
| -rw-r--r-- | src/lib/encoder.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/encoder.h b/src/lib/encoder.h index 6bbdda4c5..85bc6ae99 100644 --- a/src/lib/encoder.h +++ b/src/lib/encoder.h @@ -83,7 +83,7 @@ private: void encoder_thread (boost::optional<ServerDescription>); void terminate_threads (); void add_worker_threads (ServerDescription); - void server_found (ServerDescription); + void servers_list_changed (); /** Film that we are encoding */ boost::shared_ptr<const Film> _film; |