Remove support for Windows XP.

diff --git a/cscript b/cscript
index 6eec02cc03aa49d072c20b44b897adb4ed773bb5..241a9580ac97ee20ec05cb6503e9ed1a7a5d0a25 100644 (file)
--- a/cscript
+++ b/cscript
@@ -362,9 +362,7 @@ def dependencies(target, options):
     else:
         ffmpeg_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
         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 4e2a30ef722cd7a45bcf42dc27c84b90da497a1d..64cd3814784306877628794326fdcec462cd88af 100644 (file)
--- a/src/lib/j2k_encoder.cc
+++ b/src/lib/j2k_encoder.cc
@@ -372,30 +372,13 @@ J2KEncoder::servers_list_changed ()
 
        /* XXX: could re-use threads */
 
 
        /* 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");
        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>()));
                        _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
                }
        }
 #endif
                }
        }