kopia lustrzana https://github.com/corrscope/corrscope
Rename ffmpeg_path.py to settings/paths.py
rodzic
9c9295f604
commit
d5fff45564
|
@ -9,7 +9,7 @@ import click
|
||||||
import corrscope
|
import corrscope
|
||||||
from corrscope.channel import ChannelConfig
|
from corrscope.channel import ChannelConfig
|
||||||
from corrscope.config import yaml
|
from corrscope.config import yaml
|
||||||
from corrscope.ffmpeg_path import MissingFFmpegError
|
from corrscope.settings.paths import MissingFFmpegError
|
||||||
from corrscope.outputs import IOutputConfig, FFplayOutputConfig, FFmpegOutputConfig
|
from corrscope.outputs import IOutputConfig, FFplayOutputConfig, FFmpegOutputConfig
|
||||||
from corrscope.corrscope import default_config, CorrScope, Config, Arguments
|
from corrscope.corrscope import default_config, CorrScope, Config, Arguments
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@ from PyQt5.QtWidgets import QShortcut
|
||||||
|
|
||||||
import corrscope
|
import corrscope
|
||||||
from corrscope import cli # module wtf?
|
from corrscope import cli # module wtf?
|
||||||
from corrscope import ffmpeg_path
|
from corrscope.settings import paths
|
||||||
from corrscope.channel import ChannelConfig
|
from corrscope.channel import ChannelConfig
|
||||||
from corrscope.config import CorrError, copy_config, yaml
|
from corrscope.config import CorrError, copy_config, yaml
|
||||||
from corrscope.corrscope import CorrScope, Config, Arguments, default_config
|
from corrscope.corrscope import CorrScope, Config, Arguments, default_config
|
||||||
|
@ -410,7 +410,7 @@ class CorrThread(qc.QThread):
|
||||||
try:
|
try:
|
||||||
CorrScope(cfg, arg).play()
|
CorrScope(cfg, arg).play()
|
||||||
|
|
||||||
except ffmpeg_path.MissingFFmpegError:
|
except paths.MissingFFmpegError:
|
||||||
arg.on_end()
|
arg.on_end()
|
||||||
self.ffmpeg_missing.emit()
|
self.ffmpeg_missing.emit()
|
||||||
|
|
||||||
|
@ -911,10 +911,10 @@ nope = qc.QVariant()
|
||||||
class DownloadFFmpegActivity:
|
class DownloadFFmpegActivity:
|
||||||
title = "Missing FFmpeg"
|
title = "Missing FFmpeg"
|
||||||
|
|
||||||
ffmpeg_url = ffmpeg_path.get_ffmpeg_url()
|
ffmpeg_url = paths.get_ffmpeg_url()
|
||||||
can_download = bool(ffmpeg_url)
|
can_download = bool(ffmpeg_url)
|
||||||
|
|
||||||
path_uri = qc.QUrl.fromLocalFile(ffmpeg_path.path_dir).toString()
|
path_uri = qc.QUrl.fromLocalFile(paths.path_dir).toString()
|
||||||
|
|
||||||
required = (
|
required = (
|
||||||
f"FFmpeg must be in PATH or "
|
f"FFmpeg must be in PATH or "
|
||||||
|
|
|
@ -7,7 +7,7 @@ from typing import TYPE_CHECKING, Type, List, Union, Optional
|
||||||
import numpy as np
|
import numpy as np
|
||||||
|
|
||||||
from corrscope.config import register_config
|
from corrscope.config import register_config
|
||||||
from corrscope.ffmpeg_path import MissingFFmpegError
|
from corrscope.settings.paths import MissingFFmpegError
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from corrscope.corrscope import Config
|
from corrscope.corrscope import Config
|
||||||
|
|
Ładowanie…
Reference in New Issue