Skip to content

Commit

Permalink
Version 5.7.3 (#576)
Browse files Browse the repository at this point in the history
* Fixing #574 Downmix audio channels not working (thanks to eikixsh)
* Fixing audio and subtitle track count in queue
  • Loading branch information
cdgriffith authored Jul 10, 2024
1 parent 7f49304 commit 5c47d8d
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 11 deletions.
5 changes: 5 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

## Version 5.7.3

* Fixing #574 Downmix audio channels not working (thanks to eikixsh)
* Fixing audio and subtitle track count in queue

## Version 5.7.2

* Fixing audio quality targeting to be enabled properly for ffmpeg
Expand Down
15 changes: 15 additions & 0 deletions fastflix/data/languages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10715,3 +10715,18 @@ Channel Layout:
ukr: Розташування каналів
kor: 채널 레이아웃
ron: Canal Layout
Subtitle Type:
eng: Subtitle Type
deu: Untertitel Typ
fra: Type de sous-titre
ita: Tipo di sottotitolo
spa: Tipo de subtítulo
jpn: 字幕タイプ
rus: Тип субтитров
por: Tipo de legenda
swe: Typ av undertext
pol: Typ podtytułu
chs: 字幕类型
ukr: Тип субтитрів
kor: 자막 유형
ron: Tip subtitrare
2 changes: 1 addition & 1 deletion fastflix/encoders/common/audio.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def build_audio(audio_tracks, audio_file_index=0):
command_list.append(f"-c:{track.outdex} copy")
elif track.conversion_codec:
try:
cl = track.downmix if "downmix" in track and track.downmix else track.raw_info.channel_layout
cl = track.downmix if track.downmix else track.raw_info.channel_layout
except AssertionError:
cl = "stereo"
downmix = (
Expand Down
14 changes: 7 additions & 7 deletions fastflix/shared.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,11 @@ def latest_fastflix(app, show_new_dialog=False):
from fastflix.version import __version__

url = "https://api.github.com/repos/cdgriffith/FastFlix/releases"
contrib = link(
url="https://github.com/sponsors/cdgriffith?frequency=one-time&sponsor=cdgriffith",
text=t("Please consider supporting FastFlix with a one time contribution!"),
theme=app.fastflix.config.theme,
)
# contrib = link(
# url="https://github.com/sponsors/cdgriffith?frequency=one-time&sponsor=cdgriffith",
# text=t("Please consider supporting FastFlix with a one time contribution!"),
# theme=app.fastflix.config.theme,
# )

logger.debug("Checking for newer versions of FastFlix")

Expand Down Expand Up @@ -195,13 +195,13 @@ def latest_fastflix(app, show_new_dialog=False):
)
logger.debug(f"Newer version found: {use_version}")
message(
f"{t('There is a newer version of FastFlix available!')} <br><br> {download_link} <br><br> {contrib} 💓<br>",
f"{t('There is a newer version of FastFlix available!')} <br><br> {download_link} <br>", # <br> {contrib} 💓<br>
title=t("New Version"),
)
return
logger.debug("FastFlix is up tp date")
if show_new_dialog:
message(t(f"You are using the latest version of FastFlix") + f" <br><br> {contrib} 💓 <br>")
message(t(f"You are using the latest version of FastFlix") + f" <br>") # <br> {contrib} 💓 <br>


def file_date():
Expand Down
2 changes: 1 addition & 1 deletion fastflix/version.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
__version__ = "5.7.2"
__version__ = "5.7.3"
__author__ = "Chris Griffith"
8 changes: 6 additions & 2 deletions fastflix/widgets/panels/queue_panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,12 @@ def __init__(self, parent, video: Video, index, first=False):
# grid.addWidget(self.widgets.track_number, 0, 1)
grid.addWidget(title, 0, 1, 1, 3)
grid.addWidget(QtWidgets.QLabel(f"{video.video_settings.video_encoder_settings.name}"), 0, 4)
grid.addWidget(QtWidgets.QLabel(f"{t('Audio Tracks')}: {len(video.audio_tracks)}"), 0, 5)
grid.addWidget(QtWidgets.QLabel(f"{t('Subtitles')}: {len(video.subtitle_tracks)}"), 0, 6)
grid.addWidget(
QtWidgets.QLabel(f"{t('Audio Tracks')}: {len([1 for x in video.audio_tracks if x.enabled])}"), 0, 5
)
grid.addWidget(
QtWidgets.QLabel(f"{t('Subtitles')}: {len([1 for x in video.subtitle_tracks if x.enabled])}"), 0, 6
)
grid.addWidget(QtWidgets.QLabel(status), 0, 7)
if not video.status.error and video.status.complete and not get_bool_env("FF_DOCKERMODE"):
grid.addWidget(view_button, 0, 8)
Expand Down

0 comments on commit 5c47d8d

Please sign in to comment.