diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-10-18 13:47:29 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-10-18 13:47:29 +0200 |
| commit | 1baae6f052775956bab33a8d9ae9f94066227225 (patch) | |
| tree | 9c634a1b2914d4bf889e171b73c770469415f799 /src/lib/encode_server_finder.h | |
| parent | 6eba9bffa2371aa71b8981b1a7bcde0448d7623e (diff) | |
| parent | b0c1482f98c7e00634c1bc3dd801e76ce69907e2 (diff) | |
Merge branch 'grok2' into v2.17.xv2.17.8
This is the DoM support for Aaron Boxer's "grok" GPU J2K encoder,
with some cleanups and other assorted/related DoM changes.
Diffstat (limited to 'src/lib/encode_server_finder.h')
| -rw-r--r-- | src/lib/encode_server_finder.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/encode_server_finder.h b/src/lib/encode_server_finder.h index f8a30af54..c478387f9 100644 --- a/src/lib/encode_server_finder.h +++ b/src/lib/encode_server_finder.h @@ -50,8 +50,6 @@ public: static EncodeServerFinder* instance (); static void drop (); - void stop (); - std::list<EncodeServerDescription> servers () const; /** Emitted whenever the list of servers changes */ @@ -62,6 +60,7 @@ private: ~EncodeServerFinder (); void start (); + void stop (); void search_thread (); void listen_thread (); |