From 5c47d8ddd6553f06acdd45b4739a8834c8b3d02f Mon Sep 17 00:00:00 2001
From: Chris Griffith <chris@cdgriffith.com>
Date: Wed, 10 Jul 2024 18:05:35 -0500
Subject: [PATCH] Version 5.7.3 (#576)

* Fixing #574 Downmix audio channels not working (thanks to eikixsh)
* Fixing audio and subtitle track count in queue
---
 CHANGES                                |  5 +++++
 fastflix/data/languages.yaml           | 15 +++++++++++++++
 fastflix/encoders/common/audio.py      |  2 +-
 fastflix/shared.py                     | 14 +++++++-------
 fastflix/version.py                    |  2 +-
 fastflix/widgets/panels/queue_panel.py |  8 ++++++--
 6 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/CHANGES b/CHANGES
index 9e31e3f2..0eb21c1b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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
diff --git a/fastflix/data/languages.yaml b/fastflix/data/languages.yaml
index 0a8ce704..dd138523 100644
--- a/fastflix/data/languages.yaml
+++ b/fastflix/data/languages.yaml
@@ -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
diff --git a/fastflix/encoders/common/audio.py b/fastflix/encoders/common/audio.py
index a29041ce..59052f32 100644
--- a/fastflix/encoders/common/audio.py
+++ b/fastflix/encoders/common/audio.py
@@ -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 = (
diff --git a/fastflix/shared.py b/fastflix/shared.py
index b9b61906..3e098e9d 100644
--- a/fastflix/shared.py
+++ b/fastflix/shared.py
@@ -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")
 
@@ -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():
diff --git a/fastflix/version.py b/fastflix/version.py
index 7141d7dc..26b6119e 100644
--- a/fastflix/version.py
+++ b/fastflix/version.py
@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-__version__ = "5.7.2"
+__version__ = "5.7.3"
 __author__ = "Chris Griffith"
diff --git a/fastflix/widgets/panels/queue_panel.py b/fastflix/widgets/panels/queue_panel.py
index 9a8f0416..64eb4e85 100644
--- a/fastflix/widgets/panels/queue_panel.py
+++ b/fastflix/widgets/panels/queue_panel.py
@@ -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)