Skip to content

Commit 0d6b5f0

Browse files
n00mkradn00mkrad
committed
Rename "multi file mode" to "muxing mode"
1 parent 72b5f04 commit 0d6b5f0

File tree

11 files changed

+22
-28
lines changed

11 files changed

+22
-28
lines changed

‎ff-utils-winforms/Forms/MainForm.Designer.cs‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ff-utils-winforms/Forms/MainForm.StreamList.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public void RefreshStreamListUi()
3131
{
3232
string note = "Stream selection is not available in Batch Processing Mode.";
3333

34-
if (RunTask.currentFileListMode == RunTask.FileListMode.BatchProcess)
34+
if (RunTask.currentFileListMode == RunTask.FileListMode.Batch)
3535
formatInfo.Text = note;
3636
else if (formatInfo.Text == note)
3737
formatInfo.Text = "";

‎ff-utils-winforms/Forms/MainForm.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ private void inputPanel_DragDrop(object sender, DragEventArgs e)
222222

223223
public void runBtn_Click(object sender = null, EventArgs e = null)
224224
{
225-
if (RunTask.currentFileListMode == RunTask.FileListMode.MultiFileInput)
225+
if (RunTask.currentFileListMode == RunTask.FileListMode.Mux)
226226
RunTask.Start();
227227
else
228228
RunTask.StartBatch();
@@ -292,30 +292,30 @@ public void RefreshFileListUi()
292292
SetButtonActive(fileListMoveUpBtn, oneSelected);
293293
SetButtonActive(fileListMoveDownBtn, oneSelected);
294294
SetButtonActive(fileListRemoveBtn, anySelected);
295-
SetButtonActive(addTracksFromFileBtn, RunTask.currentFileListMode == RunTask.FileListMode.MultiFileInput && anySelected);
295+
SetButtonActive(addTracksFromFileBtn, RunTask.currentFileListMode == RunTask.FileListMode.Mux && anySelected);
296296

297297
int count = Program.mainForm.fileListBox.Items.Count;
298298

299299
fileCountLabel.Text = $"{count} file{(count != 1 ? "s" : "")} loaded. " +
300-
$"{(count > 1 && RunTask.currentFileListMode == RunTask.FileListMode.MultiFileInput ? "Double click any of them or use the Load Tracks button to load their tracks." : "")}";
300+
$"{(count > 1 && RunTask.currentFileListMode == RunTask.FileListMode.Mux ? "Double click any of them or use the Load Tracks button to load their tracks." : "")}";
301301
}
302302

303303
private async void fileListMode_SelectedIndexChanged(object sender, EventArgs e)
304304
{
305305
RunTask.FileListMode oldMode = RunTask.currentFileListMode;
306306
RunTask.FileListMode newMode = (RunTask.FileListMode)fileListMode.SelectedIndex;
307307

308-
if (oldMode == RunTask.FileListMode.MultiFileInput && newMode == RunTask.FileListMode.BatchProcess)
308+
if (oldMode == RunTask.FileListMode.Mux && newMode == RunTask.FileListMode.Batch)
309309
TrackList.ClearCurrentFile();
310310

311311
RunTask.currentFileListMode = newMode;
312312

313-
Text = $"NMKODER [{(RunTask.currentFileListMode == RunTask.FileListMode.MultiFileInput ? "MFM" : "BPM")}]";
313+
Text = $"NMKODER [{(RunTask.currentFileListMode == RunTask.FileListMode.Mux ? "Mux" : "Batch")}]";
314314

315315
SaveUiConfig();
316316
RefreshFileListUi();
317317

318-
if (oldMode == RunTask.FileListMode.BatchProcess && newMode == RunTask.FileListMode.MultiFileInput)
318+
if (oldMode == RunTask.FileListMode.Batch && newMode == RunTask.FileListMode.Mux)
319319
{
320320
if (fileList.Items.Count == 1 && !AreAnyTracksLoaded())
321321
await TrackList.LoadFirstFile(fileList.Items[0]);
@@ -375,7 +375,7 @@ private void fileList_MouseDoubleClick(object sender, System.Windows.Forms.Mouse
375375
{
376376
ListViewItem item = fileList.HitTest(e.X, e.Y).Item;
377377

378-
if (item != null && RunTask.currentFileListMode == RunTask.FileListMode.MultiFileInput)
378+
if (item != null && RunTask.currentFileListMode == RunTask.FileListMode.Mux)
379379
addTracksFromFileBtn_Click(null, null);
380380
}
381381

‎ff-utils-winforms/Forms/Utils/UtilsColorDataForm.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public partial class UtilsColorDataForm : Form
2727
public UtilsColorDataForm(bool close = false)
2828
{
2929
InitializeComponent();
30-
batchMode = RunTask.currentFileListMode == RunTask.FileListMode.BatchProcess;
30+
batchMode = RunTask.currentFileListMode == RunTask.FileListMode.Batch;
3131
closeRightAway = close || batchMode;
3232

3333
if (closeRightAway)
@@ -36,7 +36,7 @@ public UtilsColorDataForm(bool close = false)
3636
if (batchMode)
3737
{
3838
if(!close)
39-
Logger.Log($"In batch processing mode, this util can only be used to read the metadata! Use the Multi File Mode for transferring.");
39+
Logger.Log($"In batch processing mode, this util can only be used to read the metadata! Use the Muxing Mode for transferring.");
4040

4141
if (TrackList.current == null)
4242
{

‎ff-utils-winforms/Main/RunTask.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class RunTask
2121
public enum TaskType { Null, None, Convert, Av1an, UtilReadBitrates, UtilGetMetrics, UtilOcr, UtilColorData, UtilConcat, PlotBitrate };
2222
//public static TaskType currentTask;
2323

24-
public enum FileListMode { MultiFileInput, BatchProcess };
24+
public enum FileListMode { Mux, Batch };
2525
public static FileListMode currentFileListMode;
2626

2727
public static bool runningBatch = false;
@@ -61,7 +61,7 @@ public static async Task Start (TaskType batchTask = TaskType.Null)
6161

6262
bool loadedFileRequired = taskType == TaskType.Convert || taskType == TaskType.Av1an || taskType == TaskType.UtilReadBitrates || taskType == TaskType.UtilOcr;
6363

64-
if (loadedFileRequired && (currentFileListMode == FileListMode.MultiFileInput && TrackList.current == null))
64+
if (loadedFileRequired && (currentFileListMode == FileListMode.Mux && TrackList.current == null))
6565
{
6666
MessageBox.Show("No input file loaded! Please load one first (File List).", "Error");
6767
return;

‎ff-utils-winforms/UI/FileList.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public static async Task HandleFiles(string[] paths, bool clearExisting)
5050
Logger.Log($"Added {paths.Length} file{((paths.Length == 1) ? "" : "s")} to list.");
5151
LoadFiles(paths, clearExisting);
5252

53-
if (RunTask.currentFileListMode == RunTask.FileListMode.MultiFileInput && Program.mainForm.fileListBox.Items.Count == 1)
53+
if (RunTask.currentFileListMode == RunTask.FileListMode.Mux && Program.mainForm.fileListBox.Items.Count == 1)
5454
await TrackList.LoadFirstFile(Program.mainForm.fileListBox.Items[0]);
5555

5656
if (runInstantly)

‎ff-utils-winforms/UI/Tasks/Av1anUi.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ public static void AskDeleteTempFolder (string dir)
334334
int minKbytes = 4; // If the temp folder is smaller than this, delete it without asking
335335
var dirSize = IoUtils.GetDirSize(dir, true);
336336

337-
if (RunTask.currentFileListMode == RunTask.FileListMode.BatchProcess || RunTask.runningBatch || !Directory.Exists(Path.Combine(dir, "split")) || !File.Exists(Path.Combine(dir, "scenes.json")) || dirSize < minKbytes * 1024)
337+
if (RunTask.currentFileListMode == RunTask.FileListMode.Batch || RunTask.runningBatch || !Directory.Exists(Path.Combine(dir, "split")) || !File.Exists(Path.Combine(dir, "scenes.json")) || dirSize < minKbytes * 1024)
338338
{
339339
Logger.Log($"Temp folder has no scene detection data or is <{minKbytes}kb, deleting without asking", true);
340340
IoUtils.TryDeleteIfExists(dir);

‎ff-utils-winforms/UI/Tasks/UtilColorData.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@ class UtilColorData
2121

2222
public static async Task Run()
2323
{
24-
// if (RunTask.currentFileListMode == RunTask.FileListMode.BatchProcess)
25-
// {
26-
// Logger.Log($"Color Data Utility: Didn't run because this util only works in Multi File Mode!");
27-
// return;
28-
// }
29-
3024
Program.mainForm.SetWorking(true);
3125

3226
try

‎ff-utils-winforms/UI/Tasks/UtilConcat.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ class UtilConcat
1818
{
1919
public static async Task Run()
2020
{
21-
if (RunTask.currentFileListMode == RunTask.FileListMode.BatchProcess)
21+
if (RunTask.currentFileListMode == RunTask.FileListMode.Batch)
2222
{
23-
Logger.Log($"Color Data Utility: Didn't run because this util only works in Multi File Mode!");
23+
Logger.Log($"Color Data Utility: Didn't run because this util only works in Muxing Mode!");
2424
return;
2525
}
2626

‎ff-utils-winforms/UI/Tasks/UtilGetMetrics.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ class UtilGetMetrics
2828

2929
public static async Task Run(bool fixRate = true)
3030
{
31-
if(RunTask.currentFileListMode == RunTask.FileListMode.BatchProcess)
31+
if(RunTask.currentFileListMode == RunTask.FileListMode.Batch)
3232
{
33-
Logger.Log($"Metrics Utility: Didn't run because this util only works in Multi File Mode!");
33+
Logger.Log($"Metrics Utility: Didn't run because this util only works in Muxing Mode!");
3434
return;
3535
}
3636

0 commit comments

Comments
 (0)