diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-09-12 23:19:19 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-09-12 23:19:19 +0200 |
| commit | 44532cd5f87df3ef10bbbd6b987492e36e4a0eb6 (patch) | |
| tree | df6553ed389fdfcd2e13ed9bc94f86709a72f011 | |
| parent | 2e6f03cbb2c5664bd338ad28bfd6c54732e64b47 (diff) | |
Remove support for Windows XP.
| -rw-r--r-- | cscript | 4 | ||||
| -rw-r--r-- | src/lib/j2k_encoder.cc | 19 |
2 files changed, 2 insertions, 21 deletions
@@ -362,9 +362,7 @@ def dependencies(target, options): else: ffmpeg_options = {} - if target.platform == 'windows' and target.version == 'xp': - deps = [('ffmpeg-cdist', '5783efa', ffmpeg_options)] - elif target.platform != 'linux' or target.distro != 'arch': + if target.platform != 'linux' or target.distro != 'arch': deps = [('ffmpeg-cdist', 'd798b45', ffmpeg_options)] else: # Use distro-provided FFmpeg on Arch diff --git a/src/lib/j2k_encoder.cc b/src/lib/j2k_encoder.cc index 4e2a30ef7..64cd38147 100644 --- a/src/lib/j2k_encoder.cc +++ b/src/lib/j2k_encoder.cc @@ -372,31 +372,14 @@ J2KEncoder::servers_list_changed () /* XXX: could re-use threads */ -#ifdef BOOST_THREAD_PLATFORM_WIN32 - OSVERSIONINFO info; - info.dwOSVersionInfoSize = sizeof (OSVERSIONINFO); - GetVersionEx (&info); - bool const windows_xp = (info.dwMajorVersion == 5 && info.dwMinorVersion == 1); - if (windows_xp) { - LOG_GENERAL_NC (N_("Setting thread affinity for Windows XP")); - } -#endif - if (!Config::instance()->only_servers_encode ()) { for (int i = 0; i < Config::instance()->master_encoding_threads (); ++i) { #ifdef DCPOMATIC_LINUX boost::thread* t = _threads->create_thread(boost::bind(&J2KEncoder::encoder_thread, this, optional<EncodeServerDescription>())); pthread_setname_np (t->native_handle(), "encode-worker"); -#endif -#ifdef DCPOMATIC_OSX +#else _threads->create_thread(boost::bind(&J2KEncoder::encoder_thread, this, optional<EncodeServerDescription>())); #endif -#ifdef DCPOMATIC_WINDOWS - boost::thread* t = _threads->create_thread(boost::bind(&J2KEncoder::encoder_thread, this, optional<EncodeServerDescription>())); - if (windows_xp) { - SetThreadAffinityMask (t->native_handle(), 1 << i); - } -#endif } } |