corrscope 0.8.0__tar.gz → 0.9.0__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {corrscope-0.8.0 → corrscope-0.9.0}/PKG-INFO +20 -15
- {corrscope-0.8.0 → corrscope-0.9.0}/README.md +11 -10
- {corrscope-0.8.0 → corrscope-0.9.0}/corrscope/__main__.py +2 -0
- {corrscope-0.8.0 → corrscope-0.9.0}/corrscope/cli.py +11 -1
- corrscope-0.9.0/corrscope/corrscope.py +709 -0
- {corrscope-0.8.0 → corrscope-0.9.0}/corrscope/gui/__init__.py +26 -17
- {corrscope-0.8.0 → corrscope-0.9.0}/corrscope/gui/model_bind.py +20 -0
- {corrscope-0.8.0 → corrscope-0.9.0}/corrscope/gui/view_mainwindow.py +20 -9
- {corrscope-0.8.0 → corrscope-0.9.0}/corrscope/layout.py +14 -12
- {corrscope-0.8.0 → corrscope-0.9.0}/corrscope/renderer.py +100 -26
- {corrscope-0.8.0 → corrscope-0.9.0}/corrscope/settings/global_prefs.py +18 -1
- {corrscope-0.8.0 → corrscope-0.9.0}/corrscope/spectrum.py +4 -3
- {corrscope-0.8.0 → corrscope-0.9.0}/corrscope/utils/scipy/wavfile.py +1 -2
- {corrscope-0.8.0 → corrscope-0.9.0}/corrscope/version.py +1 -1
- {corrscope-0.8.0 → corrscope-0.9.0}/pyproject.toml +8 -8
- corrscope-0.8.0/corrscope/corrscope.py +0 -353
- corrscope-0.8.0/setup.py +0 -51
- {corrscope-0.8.0 → corrscope-0.9.0}/LICENSE +0 -0
- {corrscope-0.8.0 → corrscope-0.9.0}/corrscope/__init__.py +0 -0
- {corrscope-0.8.0 → corrscope-0.9.0}/corrscope/channel.py +0 -0
- {corrscope-0.8.0 → corrscope-0.9.0}/corrscope/config.py +1 -1
- {corrscope-0.8.0 → corrscope-0.9.0}/corrscope/designNotes.md +0 -0
- {corrscope-0.8.0 → corrscope-0.9.0}/corrscope/generate/__init__.py +0 -0
- {corrscope-0.8.0 → corrscope-0.9.0}/corrscope/gui/.gitignore +0 -0
- {corrscope-0.8.0 → corrscope-0.9.0}/corrscope/gui/history_file_dlg.py +0 -0
- {corrscope-0.8.0 → corrscope-0.9.0}/corrscope/gui/translate.pro +0 -0
- {corrscope-0.8.0 → corrscope-0.9.0}/corrscope/gui/util.py +0 -0
- {corrscope-0.8.0 → corrscope-0.9.0}/corrscope/gui/version_common.py +0 -0
- {corrscope-0.8.0 → corrscope-0.9.0}/corrscope/gui/view_stack.py +0 -0
- {corrscope-0.8.0 → corrscope-0.9.0}/corrscope/gui/widgets.py +0 -0
- {corrscope-0.8.0 → corrscope-0.9.0}/corrscope/outputs.py +0 -0
- {corrscope-0.8.0 → corrscope-0.9.0}/corrscope/settings/__init__.py +0 -0
- {corrscope-0.8.0 → corrscope-0.9.0}/corrscope/settings/paths.py +0 -0
- {corrscope-0.8.0 → corrscope-0.9.0}/corrscope/triggers.py +0 -0
- {corrscope-0.8.0 → corrscope-0.9.0}/corrscope/util.py +0 -0
- {corrscope-0.8.0 → corrscope-0.9.0}/corrscope/utils/__init__.py +0 -0
- {corrscope-0.8.0 → corrscope-0.9.0}/corrscope/utils/profile_wrapper.py +0 -0
- {corrscope-0.8.0 → corrscope-0.9.0}/corrscope/utils/scipy/__init__.py +0 -0
- {corrscope-0.8.0 → corrscope-0.9.0}/corrscope/utils/scipy/signal.py +0 -0
- {corrscope-0.8.0 → corrscope-0.9.0}/corrscope/utils/scipy/windows.py +0 -0
- {corrscope-0.8.0 → corrscope-0.9.0}/corrscope/utils/trigger_util.py +0 -0
- {corrscope-0.8.0 → corrscope-0.9.0}/corrscope/utils/windows.py +0 -0
- {corrscope-0.8.0 → corrscope-0.9.0}/corrscope/wave.py +0 -0
- {corrscope-0.8.0 → corrscope-0.9.0}/corrscope/wave_common.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: corrscope
|
|
3
|
-
Version: 0.
|
|
3
|
+
Version: 0.9.0
|
|
4
4
|
Summary: Python program to render wave files into oscilloscope views, featuring advanced correlation-based triggering algorithm
|
|
5
5
|
Home-page: https://github.com/corrscope/corrscope/
|
|
6
6
|
License: BSD-2-Clause
|
|
@@ -9,20 +9,24 @@ Author-email: nyanpasu64@tuta.io
|
|
|
9
9
|
Requires-Python: >=3.8,<4.0
|
|
10
10
|
Classifier: License :: OSI Approved :: BSD License
|
|
11
11
|
Classifier: Programming Language :: Python :: 3
|
|
12
|
-
Classifier: Programming Language :: Python :: 3.10
|
|
13
12
|
Classifier: Programming Language :: Python :: 3.8
|
|
14
13
|
Classifier: Programming Language :: Python :: 3.9
|
|
14
|
+
Classifier: Programming Language :: Python :: 3.10
|
|
15
|
+
Classifier: Programming Language :: Python :: 3.11
|
|
16
|
+
Classifier: Programming Language :: Python :: 3.12
|
|
15
17
|
Provides-Extra: qt5
|
|
16
18
|
Provides-Extra: qt6
|
|
17
|
-
Requires-Dist: PyQt5 (>=5.15,<6.0); extra == "qt5"
|
|
18
|
-
Requires-Dist:
|
|
19
|
+
Requires-Dist: PyQt5 (>=5.15,<6.0) ; extra == "qt5"
|
|
20
|
+
Requires-Dist: PyQt5-Qt5 (>=5.15,<5.15.11) ; extra == "qt5"
|
|
21
|
+
Requires-Dist: PyQt6 (>=6.2,<7.0) ; extra == "qt6"
|
|
19
22
|
Requires-Dist: QtPy (>=2.0.1,<3.0.0)
|
|
20
23
|
Requires-Dist: appdirs (>=1.4.4,<2.0.0)
|
|
24
|
+
Requires-Dist: appnope (>=0.1.3,<0.2.0)
|
|
21
25
|
Requires-Dist: atomicwrites (>=1.4.0,<2.0.0)
|
|
22
26
|
Requires-Dist: attrs (>=21.2.0,<22.0.0)
|
|
23
27
|
Requires-Dist: click (>=8.0.1,<9.0.0)
|
|
24
28
|
Requires-Dist: colorspacious (>=1.1.2,<2.0.0)
|
|
25
|
-
Requires-Dist: matplotlib (>=3.
|
|
29
|
+
Requires-Dist: matplotlib (>=3.5,<4.0)
|
|
26
30
|
Requires-Dist: numpy (>=1.21,<2.0)
|
|
27
31
|
Requires-Dist: ruamel.yaml (>=0.17,<0.18)
|
|
28
32
|
Project-URL: Documentation, https://corrscope.github.io/corrscope/
|
|
@@ -64,10 +68,11 @@ On Windows, download Windows binary releases (.7z files) from the [Releases page
|
|
|
64
68
|
pipx creates an isolated environment for each program, and adds their binaries into PATH. I find this most reliable in practice, though it runs into issues after upgrading system Python in-place.
|
|
65
69
|
|
|
66
70
|
- Install Python 3.8 or above.
|
|
67
|
-
- Install pipx using either your
|
|
68
|
-
- Run `pipx install corrscope[qt5]`
|
|
69
|
-
- On Linux, to add support for native Qt themes, instead run `pipx install --system-site-packages corrscope[qt5]`
|
|
70
|
-
- On
|
|
71
|
+
- Install pipx using either your package manager, `pip3 install --user pipx`, or `pip install --user pipx`.
|
|
72
|
+
- Run `pipx install "corrscope[qt5]"`
|
|
73
|
+
- On Linux, to add support for native Qt themes, instead run `pipx install --system-site-packages "corrscope[qt5]"`
|
|
74
|
+
- On FreeBSD, install `py-qt5` and `py39-ruamel.yaml` via `pkg` or ports tree, and install `ffmpeg` via ports tree with `SDL` option enabled. After everything's installed, run `pipx install --system-site-packages "corrscope[qt5]"`
|
|
75
|
+
- On M1 Mac, instead run `pipx install "corrscope[qt6]"`
|
|
71
76
|
- Open a terminal and run `corr (args)`.
|
|
72
77
|
|
|
73
78
|
### Installing from PyPI via Pip (cross-platform, releases)
|
|
@@ -75,9 +80,9 @@ pipx creates an isolated environment for each program, and adds their binaries i
|
|
|
75
80
|
pip installs packages into a per-user Python environment. This has the disadvantage that each program you install influences the packages seen by other programs. It might run into issues when upgrading system Python in-place; I haven't tested.
|
|
76
81
|
|
|
77
82
|
- Install Python 3.8 or above.
|
|
78
|
-
- If necessary, install pip using your
|
|
79
|
-
- Run `pip3 install --user corrscope[qt5]`
|
|
80
|
-
- On M1 Mac, instead run `pip3 install --user corrscope[qt6]`
|
|
83
|
+
- If necessary, install pip using your package manager.
|
|
84
|
+
- Run `pip3 install --user "corrscope[qt5]"`
|
|
85
|
+
- On M1 Mac, instead run `pip3 install --user "corrscope[qt6]"`
|
|
81
86
|
- Open a terminal and run `corr (args)`.
|
|
82
87
|
|
|
83
88
|
### Dev builds (Windows)
|
|
@@ -130,11 +135,11 @@ poetry run corr (args)
|
|
|
130
135
|
|
|
131
136
|
## Mac-specific Issues
|
|
132
137
|
|
|
133
|
-
###
|
|
138
|
+
### Preview audio cutting out
|
|
134
139
|
|
|
135
|
-
|
|
140
|
+
When you preview a video in Corrscope, it sends video frames to ffplay, which opens a video player window and also plays synchronized audio. On Mac (at least my M1 MacBook Air running macOS 12.3), switching windows can cause ffplay to stutter and temporarily or semi-permanently stop playing audio (until you restart the preview). There is no fix for this issue at the moment.
|
|
136
141
|
|
|
137
|
-
|
|
142
|
+
Rendering does not stutter on M1, since neither corrscope nor ffmpeg are affected by app switching, or App Nap.
|
|
138
143
|
|
|
139
144
|
### Gatekeeper
|
|
140
145
|
|
|
@@ -33,10 +33,11 @@ On Windows, download Windows binary releases (.7z files) from the [Releases page
|
|
|
33
33
|
pipx creates an isolated environment for each program, and adds their binaries into PATH. I find this most reliable in practice, though it runs into issues after upgrading system Python in-place.
|
|
34
34
|
|
|
35
35
|
- Install Python 3.8 or above.
|
|
36
|
-
- Install pipx using either your
|
|
37
|
-
- Run `pipx install corrscope[qt5]`
|
|
38
|
-
- On Linux, to add support for native Qt themes, instead run `pipx install --system-site-packages corrscope[qt5]`
|
|
39
|
-
- On
|
|
36
|
+
- Install pipx using either your package manager, `pip3 install --user pipx`, or `pip install --user pipx`.
|
|
37
|
+
- Run `pipx install "corrscope[qt5]"`
|
|
38
|
+
- On Linux, to add support for native Qt themes, instead run `pipx install --system-site-packages "corrscope[qt5]"`
|
|
39
|
+
- On FreeBSD, install `py-qt5` and `py39-ruamel.yaml` via `pkg` or ports tree, and install `ffmpeg` via ports tree with `SDL` option enabled. After everything's installed, run `pipx install --system-site-packages "corrscope[qt5]"`
|
|
40
|
+
- On M1 Mac, instead run `pipx install "corrscope[qt6]"`
|
|
40
41
|
- Open a terminal and run `corr (args)`.
|
|
41
42
|
|
|
42
43
|
### Installing from PyPI via Pip (cross-platform, releases)
|
|
@@ -44,9 +45,9 @@ pipx creates an isolated environment for each program, and adds their binaries i
|
|
|
44
45
|
pip installs packages into a per-user Python environment. This has the disadvantage that each program you install influences the packages seen by other programs. It might run into issues when upgrading system Python in-place; I haven't tested.
|
|
45
46
|
|
|
46
47
|
- Install Python 3.8 or above.
|
|
47
|
-
- If necessary, install pip using your
|
|
48
|
-
- Run `pip3 install --user corrscope[qt5]`
|
|
49
|
-
- On M1 Mac, instead run `pip3 install --user corrscope[qt6]`
|
|
48
|
+
- If necessary, install pip using your package manager.
|
|
49
|
+
- Run `pip3 install --user "corrscope[qt5]"`
|
|
50
|
+
- On M1 Mac, instead run `pip3 install --user "corrscope[qt6]"`
|
|
50
51
|
- Open a terminal and run `corr (args)`.
|
|
51
52
|
|
|
52
53
|
### Dev builds (Windows)
|
|
@@ -99,11 +100,11 @@ poetry run corr (args)
|
|
|
99
100
|
|
|
100
101
|
## Mac-specific Issues
|
|
101
102
|
|
|
102
|
-
###
|
|
103
|
+
### Preview audio cutting out
|
|
103
104
|
|
|
104
|
-
|
|
105
|
+
When you preview a video in Corrscope, it sends video frames to ffplay, which opens a video player window and also plays synchronized audio. On Mac (at least my M1 MacBook Air running macOS 12.3), switching windows can cause ffplay to stutter and temporarily or semi-permanently stop playing audio (until you restart the preview). There is no fix for this issue at the moment.
|
|
105
106
|
|
|
106
|
-
|
|
107
|
+
Rendering does not stutter on M1, since neither corrscope nor ffmpeg are affected by app switching, or App Nap.
|
|
107
108
|
|
|
108
109
|
### Gatekeeper
|
|
109
110
|
|
|
@@ -6,6 +6,7 @@ from typing import Optional, List, Tuple, Union, cast, TypeVar
|
|
|
6
6
|
import click
|
|
7
7
|
|
|
8
8
|
import corrscope
|
|
9
|
+
import corrscope.settings.global_prefs as gp
|
|
9
10
|
from corrscope.channel import ChannelConfig
|
|
10
11
|
from corrscope.config import yaml
|
|
11
12
|
from corrscope.corrscope import template_config, CorrScope, Config, Arguments
|
|
@@ -79,6 +80,7 @@ def get_file_stem(cfg_path: Optional[Path], cfg: Config, default: T) -> Union[st
|
|
|
79
80
|
|
|
80
81
|
CONTEXT_SETTINGS = dict(help_option_names=["-h", "--help"])
|
|
81
82
|
|
|
83
|
+
|
|
82
84
|
# fmt: off
|
|
83
85
|
@click.command(context_settings=CONTEXT_SETTINGS)
|
|
84
86
|
# Inputs
|
|
@@ -232,7 +234,15 @@ def main(
|
|
|
232
234
|
outputs.append(cfg.get_ffmpeg_cfg(video_path))
|
|
233
235
|
|
|
234
236
|
if outputs:
|
|
235
|
-
|
|
237
|
+
try:
|
|
238
|
+
pref = gp.load_prefs()
|
|
239
|
+
except Exception as e:
|
|
240
|
+
print(e)
|
|
241
|
+
pref = gp.GlobalPrefs()
|
|
242
|
+
|
|
243
|
+
arg = Arguments(
|
|
244
|
+
cfg_dir=cfg_dir, outputs=outputs, parallelism=pref.parallelism()
|
|
245
|
+
)
|
|
236
246
|
command = lambda: CorrScope(cfg, arg).play()
|
|
237
247
|
if profile:
|
|
238
248
|
first_song_name = Path(files[0]).name
|