Minor clean

This commit is contained in:
Nikolaj Olsson 2019-11-10 17:57:36 +01:00
parent 6a798311ff
commit 06cd28ebf2
4 changed files with 8 additions and 8 deletions

View File

@ -21,7 +21,7 @@ namespace Nikse.SubtitleEdit.Forms
private string _spectrogramDirectory; private string _spectrogramDirectory;
public WavePeakData Peaks { get; private set; } public WavePeakData Peaks { get; private set; }
public SpectrogramData Spectrogram { get; private set; } public SpectrogramData Spectrogram { get; private set; }
private string _encodeParamters; private string _encodeParameters;
private const string RetryEncodeParameters = "acodec=s16l"; private const string RetryEncodeParameters = "acodec=s16l";
private int _audioTrackNumber = -1; private int _audioTrackNumber = -1;
private int _delayInMilliseconds; private int _delayInMilliseconds;
@ -53,7 +53,7 @@ namespace Nikse.SubtitleEdit.Forms
buttonCancel.Text = Configuration.Settings.Language.General.Cancel; buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
labelSourcevideoFile.Text = Configuration.Settings.Language.AddWaveform.SourceVideoFile; labelSourcevideoFile.Text = Configuration.Settings.Language.AddWaveform.SourceVideoFile;
_spectrogramDirectory = spectrogramDirectory; _spectrogramDirectory = spectrogramDirectory;
_encodeParamters = Configuration.Settings.General.VlcWaveTranscodeSettings; _encodeParameters = Configuration.Settings.General.VlcWaveTranscodeSettings;
} }
public static Process GetCommandLineProcess(string inputVideoFile, int audioTrackNumber, string outWaveFile, string encodeParamters, out string encoderName) public static Process GetCommandLineProcess(string inputVideoFile, int audioTrackNumber, string outWaveFile, string encodeParamters, out string encoderName)
@ -132,7 +132,7 @@ namespace Nikse.SubtitleEdit.Forms
Process process; Process process;
try try
{ {
process = GetCommandLineProcess(SourceVideoFileName, _audioTrackNumber, targetFile, _encodeParamters, out encoderName); process = GetCommandLineProcess(SourceVideoFileName, _audioTrackNumber, targetFile, _encodeParameters, out encoderName);
labelInfo.Text = encoderName; labelInfo.Text = encoderName;
} }
catch (DllNotFoundException) catch (DllNotFoundException)
@ -220,9 +220,9 @@ namespace Nikse.SubtitleEdit.Forms
var targetFileInfo = new FileInfo(targetFile); var targetFileInfo = new FileInfo(targetFile);
if (!targetFileInfo.Exists) if (!targetFileInfo.Exists)
{ {
if (_encodeParamters != RetryEncodeParameters) if (_encodeParameters != RetryEncodeParameters)
{ {
_encodeParamters = RetryEncodeParameters; _encodeParameters = RetryEncodeParameters;
buttonRipWave_Click(null, null); buttonRipWave_Click(null, null);
return; return;
} }

View File

@ -1,6 +1,6 @@
namespace Nikse.SubtitleEdit.Forms namespace Nikse.SubtitleEdit.Forms
{ {
partial class ChooseAudioTrack sealed partial class ChooseAudioTrack
{ {
/// <summary> /// <summary>
/// Required designer variable. /// Required designer variable.

View File

@ -6,7 +6,7 @@ using System.Windows.Forms;
namespace Nikse.SubtitleEdit.Forms namespace Nikse.SubtitleEdit.Forms
{ {
public partial class ChooseAudioTrack : Form public sealed partial class ChooseAudioTrack : Form
{ {
public ChooseAudioTrack(List<string> tracks, int defaultTrack) public ChooseAudioTrack(List<string> tracks, int defaultTrack)
{ {

View File

@ -19674,7 +19674,7 @@ namespace Nikse.SubtitleEdit.Forms
using (var addWaveform = new AddWaveform()) using (var addWaveform = new AddWaveform())
{ {
var peakWaveFileName = WavePeakGenerator.GetPeakWaveFileName(_videoFileName); var peakWaveFileName = WavePeakGenerator.GetPeakWaveFileName(_videoFileName);
var spectrogramFolder = Nikse.SubtitleEdit.Core.WavePeakGenerator.SpectrogramDrawer.GetSpectrogramFolder(_videoFileName); var spectrogramFolder = WavePeakGenerator.SpectrogramDrawer.GetSpectrogramFolder(_videoFileName);
if (WavePeakGenerator.IsFileValidForVisualizer(_videoFileName)) if (WavePeakGenerator.IsFileValidForVisualizer(_videoFileName))
{ {