Reduce software size by removing ffmpeg

Paradeluxe · Dec 24, 2024 · 5be802d · 5be802d
1 parent 0bea62c
commit 5be802d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 16 deletions.
diff --git a/core.py b/core.py
@@ -11,14 +11,14 @@
 
 plat = os.name.lower()
 
-if plat == 'nt':  # Windows
-    AudioSegment.converter = resource_path(f"./ffmpeg/{plat}/ffmpeg.exe")
-    AudioSegment.ffmpeg = resource_path(f"./ffmpeg/{plat}/ffmpeg.exe")
-elif plat == 'posix':  # Unix-like systems (Linux, macOS)
-    AudioSegment.converter = resource_path(f"./ffmpeg/{plat}/ffmpeg")
-    AudioSegment.ffmpeg = resource_path(f"./ffmpeg/{plat}/ffmpeg")
-else:
-    pass
+# if plat == 'nt':  # Windows
+#     AudioSegment.converter = resource_path(f"./ffmpeg/{plat}/ffmpeg.exe")
+#     AudioSegment.ffmpeg = resource_path(f"./ffmpeg/{plat}/ffmpeg.exe")
+# elif plat == 'posix':  # Unix-like systems (Linux, macOS)
+#     AudioSegment.converter = resource_path(f"./ffmpeg/{plat}/ffmpeg")
+#     AudioSegment.ffmpeg = resource_path(f"./ffmpeg/{plat}/ffmpeg")
+# else:
+#     pass
 
 
 def runPraditorWithTimeRange(params, audio_obj, which_set, stime=0, etime=-1):

diff --git a/main.py b/main.py
@@ -260,7 +260,7 @@ def __init__(self):
         # file_menu.addAction(button_action2)
         # ---------------------------------------------------
         self.AudioViewer = AudioViewer()
-        self.AudioViewer.setMinimumHeight(100)
+        self.AudioViewer.setMinimumHeight(200)
         layout.addWidget(self.AudioViewer)
         # ---------------------------------------------------
 
@@ -418,7 +418,7 @@ def showParams(self):
         if self.select_mode.text() == "Current":
             if not os.path.exists(os.path.splitext(self.file_path)[0] + ".txt"):
                 with open(os.path.splitext(self.file_path)[0] + ".txt", "w") as txt_file:
-                    with open(resource_path("params.txt"), "r") as default_txt_file:
+                    with open("params.txt", "r") as default_txt_file:
                         txt_file.write(default_txt_file.read())
         elif self.select_mode.text() == "Default":
             pass
@@ -428,7 +428,7 @@ def showParams(self):
             with open(os.path.splitext(self.file_path)[0] + ".txt", 'r') as txt_file:
                 self.MySliders.resetParams(eval(txt_file.read()))
         elif self.select_mode.text() == "Default":
-            with open(resource_path("params.txt"), 'r') as txt_file:
+            with open("params.txt", 'r') as txt_file:
                 self.MySliders.resetParams(eval(txt_file.read()))
 
 
@@ -539,7 +539,7 @@ def nextAudio(self):
 
 # 加载图标文件
 # icon = QIcon('icon.png')  # 替换为你的图标文件路径
-
+print(resource_path('icon.ico'))
 # 设置窗口图标
 window.setWindowIcon(QIcon(resource_path('icon.ico')))
 window.show()

diff --git a/slider/slider_single.py b/slider/slider_single.py
@@ -17,12 +17,14 @@ def __init__(self, param_name, minimum, step, maximum, font_color='#272727', col
         except IndexError:
             self.digit = 0
         # self.setMaximumHeight(40)
-        self.setMinimumHeight(20)
-        # self.setMaximumHeight(25)
-
+        self.setFixedHeight(35)
+        # self.setMinimumHeight(20)
+        self.setContentsMargins(0, 0, 0, 0)
 
         self.name_label = QLabel(param_name)
         self.name_label.setFixedWidth(90)
+        self.name_label.setFixedHeight(25)
+        self.name_label.setContentsMargins(0, 0, 0, 0)
         # self.name_label.setFixedSize(90, 20)
 
         # if param_name:
@@ -53,7 +55,7 @@ def __init__(self, param_name, minimum, step, maximum, font_color='#272727', col
 
         self.param_slider = QSlider(Qt.Orientation.Horizontal)
 
-        # self.param_slider.setFixedHeight(20)
+        self.param_slider.setFixedHeight(20)
         self.param_slider.setMinimum(minimum)
         self.param_slider.setSingleStep(step)
         self.param_slider.setMaximum(maximum)
@@ -63,6 +65,7 @@ def __init__(self, param_name, minimum, step, maximum, font_color='#272727', col
 
         # #2AD25E #1991D3
         self.param_slider.setStyleSheet(qss_slider_with_color(color))
+        self.param_slider.setContentsMargins(0, 0, 0, 0)
 
 
 
@@ -72,6 +75,7 @@ def __init__(self, param_name, minimum, step, maximum, font_color='#272727', col
 
         self.value_label = QLabel(f"{self.param_slider.sliderPosition()}")
         self.value_label.setFixedWidth(50)
+        self.value_label.setFixedHeight(25)
         # self.value_label.setFixedSize(50, 20)
         self.value_label.setAlignment(Qt.AlignRight | Qt.AlignVCenter)
         self.value_label.setStyleSheet("""
@@ -84,6 +88,7 @@ def __init__(self, param_name, minimum, step, maximum, font_color='#272727', col
 
 
         """)
+        self.value_label.setContentsMargins(0, 0, 0, 0)
 
         if default is not None:
             self.param_slider.setValue(default)