psychtoolbox 3.0.19.0__tar.gz → 3.0.22.2__tar.gz

psychtoolbox-3.0.22.2/PKG-INFO

@@ -0,0 +1,18 @@
+Metadata-Version: 2.4
+Name: psychtoolbox
+Version: 3.0.22.2
+Summary: Pieces of Psychtoolbox-3 ported to CPython.
+Home-page: http://psychtoolbox.org
+Author: Mario Kleiner
+Author-email: mario.kleiner.de@gmail.com
+Description-Content-Type: text/x-rst
+Requires-Dist: numpy>=1.13.3
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: requires-dist
+Dynamic: summary
+
+Pieces of Psychtoolbox-3 ported to CPython.

psychtoolbox-3.0.22.2/PsychPython/psychtoolbox/_version.py

@@ -0,0 +1 @@
+__version__ = '3.0.22.2'

{psychtoolbox-3.0.19.0 → psychtoolbox-3.0.22.2}/PsychPython/psychtoolbox/audio.py

@@ -133,7 +133,9 @@ class Stream:
 
     def close(self):
         """Close the current stream"""
-        if getattr(self, '_closed', False): # if we're already closed don't try again
+        if not hasattr(self, 'handle') or getattr(self, '_closed', False): 
+            # if we're already closed or the `handle` attribute doesn't exist, 
+            # then we don't need to close anything
             return
         try:
             PsychPortAudio('Close', self.handle)

psychtoolbox-3.0.22.2/PsychPython/psychtoolbox.egg-info/PKG-INFO

@@ -0,0 +1,18 @@
+Metadata-Version: 2.4
+Name: psychtoolbox
+Version: 3.0.22.2
+Summary: Pieces of Psychtoolbox-3 ported to CPython.
+Home-page: http://psychtoolbox.org
+Author: Mario Kleiner
+Author-email: mario.kleiner.de@gmail.com
+Description-Content-Type: text/x-rst
+Requires-Dist: numpy>=1.13.3
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: requires-dist
+Dynamic: summary
+
+Pieces of Psychtoolbox-3 ported to CPython.

{psychtoolbox-3.0.19.0 → psychtoolbox-3.0.22.2}/PsychPython/psychtoolbox.egg-info/SOURCES.txt

@@ -11,6 +11,7 @@ setup.py
 ./PsychSourceGL/Source/Common/Base/PsychHelp.c
 ./PsychSourceGL/Source/Common/Base/PsychInit.c
 ./PsychSourceGL/Source/Common/Base/PsychInstrument.c
+./PsychSourceGL/Source/Common/Base/PsychLM.c
 ./PsychSourceGL/Source/Common/Base/PsychMemory.c
 ./PsychSourceGL/Source/Common/Base/PsychRegisterProject.c
 ./PsychSourceGL/Source/Common/Base/PsychScriptingGlue.c
@@ -149,14 +150,6 @@ PsychSourceGL/Cohorts/HID_Utilities_64Bit/build/Release/HID Utilities.framework/
 PsychSourceGL/Cohorts/HID_Utilities_64Bit/build/Release/HID Utilities.framework/Versions/Current/Headers/IOHIDLib_.h
 PsychSourceGL/Cohorts/HID_Utilities_64Bit/build/Release/HID Utilities.framework/Versions/Current/Headers/ImmrHIDUtilAddOn.h
 PsychSourceGL/Cohorts/PortAudio/libportaudio_osx_64.a
-PsychSourceGL/Cohorts/PortAudio/pa_dither.c
-PsychSourceGL/Cohorts/PortAudio/pa_dither.h
-PsychSourceGL/Cohorts/PortAudio/pa_front.c
-PsychSourceGL/Cohorts/PortAudio/pa_mac_core.c
-PsychSourceGL/Cohorts/PortAudio/pa_mac_core_internal.h
-PsychSourceGL/Cohorts/PortAudio/pa_mac_core_utilities.c
-PsychSourceGL/Cohorts/PortAudio/pa_process.c
-PsychSourceGL/Cohorts/PortAudio/pa_unix_util.c
 PsychSourceGL/Cohorts/PortAudio/portaudio_x64.lib
 PsychSourceGL/Cohorts/PsychtoolboxOSXKernelDriver/PsychGraphicsCardRegisterSpecs.h
 PsychSourceGL/Cohorts/PsychtoolboxOSXKernelDriver/PsychUserKernelShared.h
@@ -205,6 +198,7 @@ PsychSourceGL/Source/Common/Base/PsychInit.c
 PsychSourceGL/Source/Common/Base/PsychInit.h
 PsychSourceGL/Source/Common/Base/PsychInstrument.c
 PsychSourceGL/Source/Common/Base/PsychInstrument.h
+PsychSourceGL/Source/Common/Base/PsychLM.c
 PsychSourceGL/Source/Common/Base/PsychMemory.c
 PsychSourceGL/Source/Common/Base/PsychMemory.h
 PsychSourceGL/Source/Common/Base/PsychPlatformConstants.h
@@ -235,6 +229,7 @@ PsychSourceGL/Source/Common/Eyelink/EyelinkCommand.c
 PsychSourceGL/Source/Common/Eyelink/EyelinkCreateDataStructs.c
 PsychSourceGL/Source/Common/Eyelink/EyelinkCurrentMode.c
 PsychSourceGL/Source/Common/Eyelink/EyelinkDriftCorrStart.c
+PsychSourceGL/Source/Common/Eyelink/EyelinkEDKVersion.c
 PsychSourceGL/Source/Common/Eyelink/EyelinkEyeAvailable.c
 PsychSourceGL/Source/Common/Eyelink/EyelinkGetFloatData.c
 PsychSourceGL/Source/Common/Eyelink/EyelinkGetNextDataType.c
@@ -253,6 +248,7 @@ PsychSourceGL/Source/Common/Eyelink/EyelinkReadFromTracker.c
 PsychSourceGL/Source/Common/Eyelink/EyelinkReadTime.c
 PsychSourceGL/Source/Common/Eyelink/EyelinkReceiveFile.c
 PsychSourceGL/Source/Common/Eyelink/EyelinkRequestTime.c
+PsychSourceGL/Source/Common/Eyelink/EyelinkSendFile.c
 PsychSourceGL/Source/Common/Eyelink/EyelinkSendKeyButton.c
 PsychSourceGL/Source/Common/Eyelink/EyelinkSetOfflineMode.c
 PsychSourceGL/Source/Common/Eyelink/EyelinkShutdown.c
@@ -319,6 +315,8 @@ PsychSourceGL/Source/Common/PsychCV/PsychCV.c
 PsychSourceGL/Source/Common/PsychCV/PsychCV.h
 PsychSourceGL/Source/Common/PsychCV/PsychCVARToolkit.c
 PsychSourceGL/Source/Common/PsychCV/PsychCVARToolkit.h
+PsychSourceGL/Source/Common/PsychCV/PsychCVAprilTags.c
+PsychSourceGL/Source/Common/PsychCV/PsychCVAprilTags.h
 PsychSourceGL/Source/Common/PsychCV/RegisterProject.c
 PsychSourceGL/Source/Common/PsychCV/RegisterProject.h
 PsychSourceGL/Source/Common/PsychCV/OpenEyesCVEyeTracker/ransac_ellipse.h
@@ -392,6 +390,7 @@ PsychSourceGL/Source/Common/PsychPortAudio/RegisterProject.c
 PsychSourceGL/Source/Common/PsychPortAudio/RegisterProject.h
 PsychSourceGL/Source/Common/PsychPortAudio/pa_asio.h
 PsychSourceGL/Source/Common/PsychPortAudio/pa_linux_alsa.h
+PsychSourceGL/Source/Common/PsychPortAudio/pa_linux_pulseaudio.h
 PsychSourceGL/Source/Common/PsychPortAudio/pa_mac_core.h
 PsychSourceGL/Source/Common/PsychPortAudio/pa_win_wasapi.h
 PsychSourceGL/Source/Common/PsychPortAudio/pa_win_waveformat.h
@@ -565,10 +564,34 @@ PsychSourceGL/Source/Linux/Screen/PsychWindowGlueWaffle.c
 PsychSourceGL/Source/Linux/Screen/PsychWindowGlueWayland.c
 PsychSourceGL/Source/Linux/Screen/PsychWindowTextGlue.c
 PsychSourceGL/Source/Linux/Screen/PsychWindowTextGlue.h
+PsychSourceGL/Source/Linux/Screen/alpha_modifier-client-protocol.h
+PsychSourceGL/Source/Linux/Screen/commit_timing-client-protocol.h
+PsychSourceGL/Source/Linux/Screen/content_type-client-protocol.h
+PsychSourceGL/Source/Linux/Screen/cursor_shape-client-protocol.h
+PsychSourceGL/Source/Linux/Screen/fifo-client-protocol.h
+PsychSourceGL/Source/Linux/Screen/fractional_scale-client-protocol.h
+PsychSourceGL/Source/Linux/Screen/pointer_constraints_unstable-client-protocol.h
+PsychSourceGL/Source/Linux/Screen/pointer_warp-client-protocol.h
 PsychSourceGL/Source/Linux/Screen/presentation_timing-client-protocol.h
-PsychSourceGL/Source/Linux/Screen/presentation_timing-protocol.c
+PsychSourceGL/Source/Linux/Screen/relative_pointer_unstable-client-protocol.h
+PsychSourceGL/Source/Linux/Screen/tearing_control-client-protocol.h
+PsychSourceGL/Source/Linux/Screen/viewporter-client-protocol.h
+PsychSourceGL/Source/Linux/Screen/xdg_output_unstable-client-protocol.h
 PsychSourceGL/Source/Linux/Screen/xdg_shell-client-protocol.h
-PsychSourceGL/Source/Linux/Screen/xdg_shell-protocol.c
+PsychSourceGL/Source/Linux/Screen/Wayland/alpha_modifier-client-protocol.c
+PsychSourceGL/Source/Linux/Screen/Wayland/commit_timing-protocol.c
+PsychSourceGL/Source/Linux/Screen/Wayland/content_type-client-protocol.c
+PsychSourceGL/Source/Linux/Screen/Wayland/cursor_shape-client-protocol.c
+PsychSourceGL/Source/Linux/Screen/Wayland/fifo-protocol.c
+PsychSourceGL/Source/Linux/Screen/Wayland/fractional_scale-client-protocol.c
+PsychSourceGL/Source/Linux/Screen/Wayland/pointer_constraints_unstable-client-protocol.c
+PsychSourceGL/Source/Linux/Screen/Wayland/pointer_warp-client-protocol.c
+PsychSourceGL/Source/Linux/Screen/Wayland/presentation_timing-protocol.c
+PsychSourceGL/Source/Linux/Screen/Wayland/relative_pointer_unstable-client-protocol.c
+PsychSourceGL/Source/Linux/Screen/Wayland/tearing_control-client-protocol.c
+PsychSourceGL/Source/Linux/Screen/Wayland/viewporter-client-protocol.c
+PsychSourceGL/Source/Linux/Screen/Wayland/xdg_output_unstable-client-protocol.c
+PsychSourceGL/Source/Linux/Screen/Wayland/xdg_shell-protocol.c
 PsychSourceGL/Source/OSX/Base/PsychPlatform.h
 PsychSourceGL/Source/OSX/Base/PsychTimeGlue.c
 PsychSourceGL/Source/OSX/Base/PsychTimeGlue.h

{psychtoolbox-3.0.19.0 → psychtoolbox-3.0.22.2}/PsychSourceGL/License.txt

@@ -97,15 +97,6 @@
 % licensed PortAudio library from http://portaudio.com - The specific license text is
 % included below in the licenses section.
 %
-% Older versions of Psychtoolbox (v3.0.14 and earlier) used a modified version
-% of PortAudio and DLL's, static and dynamic libraries built from it. For documentation
-% purposes and until further notice, the source code of this MIT licensed library and of
-% all modifications we made can be found in a Psychtoolbox C-Sourcecode download in
-% the subfolder PsychSourceGL/Cohorts/PortAudio/. Building from this source code would
-% yield the old libraries for older < v3.0.15 Psychtoolbox versions. We may delete this
-% source code soon, as it mostly does not serve any use anymore in Psychtoolbox 3.0.15
-% and later.
-%
 %
 % Psychtoolbox/PsychContributed: See individual licenses and output of
 %                                "help PsychContributed" in that folder.
@@ -134,6 +125,21 @@
 %
 % The Daq toolbox         - MIT : Denis Pelli, Mickey P. Rowe, Mario Kleiner.
 %
+% The PsychVulkanCore driver mex file for our Vulkan display backend, which is
+% itself licensed under the MIT license, builds against the Khronos Vulkan SDK C
+% header files, which are licensed under MIT and Apache 2.0 license. See
+% https://github.com/KhronosGroup/Vulkan-Headers
+% It dynamically links against the Khronos Vulkan loader libraries on Linux and
+% MS-Windows, which are licensed under the Apache 2.0 license. The loader libraries
+% are part of the operating system on Linux, and part of / bundled with the
+% graphics drivers on MS-Windows. The Vulkan loader then runtime loads and links
+% and interfaces with graphics hardware specific system installed Vulkan ICDs.
+% See https://github.com/KhronosGroup/Vulkan-Loader
+% On macOS our driver is statically linked against the Khronos MoltenVK Vulkan
+% ICD libMoltenVK.a, which implements Vulkan on top of macOS Metal frameworks.
+% MoltenVK is also licensed under the Apache 2.0 license. See
+% https://github.com/KhronosGroup/MoltenVK
+%
 % The PsychVRToolbox   - MIT : Mario Kleiner. The following terms and licenses
 % apply for the Oculus VR platform drivers contained in the PsychVRToolbox:
 % [Note: Oculus VR's trademarks, e.g., Oculus, Oculus Rift, etc. are registered trademarks
@@ -203,6 +209,14 @@
 % These statically included files can be found in the nanopb subfolder of the PsychOpenXRCore
 % source folder, with detailed copyright and license information included.
 %
+% Our Virtual Reality (VR) drivers for OpenHMD and OpenXR supported HTC VR headsets
+% with eye gaze tracking hardware also support more advanced eye gaze tracking by
+% use of our SRAnipalMex mex file for 64-Bit Windows 10 and later. This is only
+% supported on MS-Windows. The mex file uses the HTC SRAnipal SDK for interfacing
+% with the HTC eye trackers SRAnipal runtime. The license text for the SRAnipal SDK
+% can be found below in the section of individual licenses under the subsection
+% "The HTC SRAnipal SDK license".
+%
 % Support for NVidia NVision stereo emitter/stereo goggles under Linux is
 % implemented by use of libnvstusb from http://sourceforge.net/projects/libnvstusb/
 % This library is licensed under LGPLv2 license. The source code for our
@@ -234,6 +248,8 @@
 %
 % The PsychtoolboxKernelDriver.kext - MIT license : Mario Kleiner.
 %
+% Screen MEX file:
+%
 % Screen statically includes the "tinyexr" library for reading some common OpenEXR
 % HDR image file formats via the Screen('ReadHDRImage') subfunction. tinyexr is
 % licensed under the MIT compatible BSD-3 license - see below for exact licensing
@@ -268,11 +284,25 @@
 % That code is Copyright (c) 2013 Ryan Hileman and provided to us and others under the MIT
 % license. Thanks!
 %
-% PsychCV MEX file        - Individual source files BSD-3 or GPL v2+
-%                           license, see their source code for details.
-%                           Compiled MEX file GPL v2+ license. Various
-%                           authors - See individual licenses in source
-%                           code.
+% PsychCV MEX file:
+%
+% Individual source files are under MIT (core code), BSD-3 (svd used by OpenEyes),
+% or GPL v2+ (OpeEyes derived code) license. Various authors - See individual licenses in
+% source code.
+%
+% For the compiled PsychCV MEX file, the license depends on the specific build configuration:
+%
+% - The default configuration, with only libapriltag support enabled for AprilTag marker
+%   tracking, uses MIT code written by us, and dynamically links against a system installed
+%   libapriltag library, which itself is BSD-2 licensed. See license text below.
+%
+% - If compiled with a non-default configuration, which would use statically included
+%   derived code from OpenEyes, and/or a statically linked version of libARToolkit v1
+%   (code included in the PsychSourceGL/Cohorts/ARToolkit subfolder), would be GPL v2+
+%   licensed, and could be only used with GNU/Octave (GPL v3+) as host runtime, not with
+%   Matlab. We do not ship this configuration with Psychtoolbox to avoid all the GPL v2+
+%   license complexity, and most likely will remove all that code completely in the future.
+%
 %
 % All other MEX files     - All compiled binaries and most source code under
 %                           MIT license. Some bits of source code include X11
@@ -1761,3 +1791,74 @@
 %
 % =========================================================================
 %
+% The HTC SRAnipal SDK license:
+%
+%                           License Agreement
+%                     For Vive Super Reality Library
+%
+% Copyright (c) 2017, HTC Corporation
+%
+% All rights reserved. Third party copyrights are property of their respective owners.
+%
+% Redistribution and use in source and binary forms, with or without modification,
+% are permitted provided that the following conditions are met:
+%
+%   * Redistribution's of source code must retain the above copyright notice,
+%     this list of conditions and the following disclaimer.
+%
+%   * Redistribution's in binary form must reproduce the above copyright notice,
+%     this list of conditions and the following disclaimer in the documentation
+%     and/or other materials provided with the distribution.
+%
+%   * The name of the copyright holders may not be used to endorse or promote products
+%     derived from this software without specific prior written permission.
+%
+% This software is provided by the copyright holders and contributors "as is" and
+% any express or implied warranties, including, but not limited to, the implied
+% warranties of merchantability and fitness for a particular purpose are disclaimed.
+% In no event shall the Intel Corporation or contributors be liable for any direct,
+% indirect, incidental, special, exemplary, or consequential damages
+% (including, but not limited to, procurement of substitute goods or services;
+% loss of use, data, or profits; or business interruption) however caused
+% and on any theory of liability, whether in contract, strict liability,
+% or tort (including negligence or otherwise) arising in any way out of
+% the use of this software, even if advised of the possibility of such damage.
+%
+% End of the HTC SRAnipal SDK license text.
+%
+% =========================================================================
+%
+% The license of the apriltag library:
+%
+% BSD 2-Clause License
+%
+% Copyright (C) 2013-2016, The Regents of The University of Michigan. All rights reserved.
+%
+% Redistribution and use in source and binary forms, with or without modification, are
+% permitted provided that the following conditions are met:
+%
+%   Redistributions of source code must retain the above copyright notice, this list of
+%   conditions and the following disclaimer.
+%
+%   Redistributions in binary form must reproduce the above copyright notice, this list
+%   of conditions and the following disclaimer in the documentation and/or other materials
+%   provided with the distribution.
+%
+% THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+% EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+% OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+% SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+% INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+% PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+% INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+% LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+% OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+%
+% The views and conclusions contained in the software and documentation are those of the
+% authors and should not be interpreted as representing official policies, either expressed
+% or implied, of the Regents of The University of Michigan.
+%
+% End of the apriltag library license text.
+%
+% =========================================================================
+