Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-22 11:12:36 +01:00
Code Issues Projects Releases Wiki Activity

Fixed a few leaks

Browse Source
This commit is contained in:
niksedk 2014-10-05 00:22:33 +02:00
parent cdbc5f083d
commit a57e593411
1 changed files with 90 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

160
src/Forms/Main.cs
View File

@ -6278,6 +6278,7 @@ namespace Nikse.SubtitleEdit.Forms
RefreshSelectedParagraph(); RefreshSelectedParagraph();
} }
} }
form.Dispose();
} }
private void WebVTTRemoveVoices(object sender, EventArgs e) private void WebVTTRemoveVoices(object sender, EventArgs e)
@ -6336,6 +6337,7 @@ namespace Nikse.SubtitleEdit.Forms
} }
} }
} }
form.Dispose();
} }
private void BoldToolStripMenuItemClick(object sender, EventArgs e) private void BoldToolStripMenuItemClick(object sender, EventArgs e)
@ -10966,12 +10968,14 @@ namespace Nikse.SubtitleEdit.Forms
} }
else else
{ {
Watermark watermarkForm = new Watermark(); using (var watermarkForm = new Watermark())
watermarkForm.Initialize(_subtitle, FirstSelectedIndex);
if (watermarkForm.ShowDialog(this) == DialogResult.OK)
{ {
watermarkForm.AddOrRemove(_subtitle); watermarkForm.Initialize(_subtitle, FirstSelectedIndex);
RefreshSelectedParagraph(); if (watermarkForm.ShowDialog(this) == DialogResult.OK)
{
watermarkForm.AddOrRemove(_subtitle);
RefreshSelectedParagraph();
}
} }
} }
} }
@ -11119,12 +11123,14 @@ namespace Nikse.SubtitleEdit.Forms
} }
else if (e.Modifiers == (Keys.Control | Keys.Alt | Keys.Shift) && e.KeyCode == Keys.I) // watermak else if (e.Modifiers == (Keys.Control | Keys.Alt | Keys.Shift) && e.KeyCode == Keys.I) // watermak
{ {
var form = new ImportUnknownFormat(string.Empty); using (var form = new ImportUnknownFormat(string.Empty))
if (form.ShowDialog(this) == DialogResult.OK)
{ {
_subtitle = form.ImportedSubitle; if (form.ShowDialog(this) == DialogResult.OK)
_fileName = null; {
SubtitleListview1.Fill(_subtitle, _subtitleAlternate); _subtitle = form.ImportedSubitle;
_fileName = null;
SubtitleListview1.Fill(_subtitle, _subtitleAlternate);
}
} }
e.SuppressKeyPress = true; e.SuppressKeyPress = true;
} }
@ -14592,8 +14598,10 @@ namespace Nikse.SubtitleEdit.Forms
_timerCheckForUpdates.Stop(); _timerCheckForUpdates.Stop();
if (_checkForUpdatesHelper.IsUpdateAvailable()) if (_checkForUpdatesHelper.IsUpdateAvailable())
{ {
var form = new CheckForUpdates(this, _checkForUpdatesHelper); using (var form = new CheckForUpdates(this, _checkForUpdatesHelper))
form.ShowDialog(this); {
form.ShowDialog(this);
}
} }
_checkForUpdatesHelper = null; _checkForUpdatesHelper = null;
_timerCheckForUpdates = null; _timerCheckForUpdates = null;
@ -15228,20 +15236,22 @@ namespace Nikse.SubtitleEdit.Forms
} }
mediaPlayer.Pause(); mediaPlayer.Pause();
var addWaveform = new AddWaveform(); using (var addWaveform = new AddWaveform())
string peakWaveFileName = GetPeakWaveFileName(_videoFileName);
string spectrogramFolder = GetSpectrogramFolder(_videoFileName);
addWaveform.Initialize(_videoFileName, spectrogramFolder, _videoAudioTrackNumber);
if (addWaveform.ShowDialog() == DialogResult.OK)
{ {
addWaveform.WavePeak.WritePeakSamples(peakWaveFileName); string peakWaveFileName = GetPeakWaveFileName(_videoFileName);
var audioPeakWave = new WavePeakGenerator(peakWaveFileName); string spectrogramFolder = GetSpectrogramFolder(_videoFileName);
audioPeakWave.GenerateAllSamples(); addWaveform.Initialize(_videoFileName, spectrogramFolder, _videoAudioTrackNumber);
audioPeakWave.Close(); if (addWaveform.ShowDialog() == DialogResult.OK)
audioVisualizer.WavePeaks = audioPeakWave; {
if (addWaveform.SpectrogramBitmaps != null) addWaveform.WavePeak.WritePeakSamples(peakWaveFileName);
audioVisualizer.InitializeSpectrogram(addWaveform.SpectrogramBitmaps, spectrogramFolder); var audioPeakWave = new WavePeakGenerator(peakWaveFileName);
timerWaveform.Start(); audioPeakWave.GenerateAllSamples();
audioPeakWave.Close();
audioVisualizer.WavePeaks = audioPeakWave;
if (addWaveform.SpectrogramBitmaps != null)
audioVisualizer.InitializeSpectrogram(addWaveform.SpectrogramBitmaps, spectrogramFolder);
timerWaveform.Start();
}
} }
} }
} }
@ -15592,17 +15602,19 @@ namespace Nikse.SubtitleEdit.Forms
return; return;
} }
var addWaveform = new AddWaveform(); using (var addWaveform = new AddWaveform())
string spectrogramFolder = GetSpectrogramFolder(_videoFileName);
addWaveform.InitializeViaWaveFile(fileName, spectrogramFolder);
if (addWaveform.ShowDialog() == DialogResult.OK)
{ {
string peakWaveFileName = GetPeakWaveFileName(_videoFileName); string spectrogramFolder = GetSpectrogramFolder(_videoFileName);
addWaveform.WavePeak.WritePeakSamples(peakWaveFileName); addWaveform.InitializeViaWaveFile(fileName, spectrogramFolder);
var audioPeakWave = new WavePeakGenerator(peakWaveFileName); if (addWaveform.ShowDialog() == DialogResult.OK)
audioPeakWave.GenerateAllSamples(); {
audioVisualizer.WavePeaks = audioPeakWave; string peakWaveFileName = GetPeakWaveFileName(_videoFileName);
timerWaveform.Start(); addWaveform.WavePeak.WritePeakSamples(peakWaveFileName);
var audioPeakWave = new WavePeakGenerator(peakWaveFileName);
audioPeakWave.GenerateAllSamples();
audioVisualizer.WavePeaks = audioPeakWave;
timerWaveform.Start();
}
} }
} }
@ -18819,32 +18831,34 @@ namespace Nikse.SubtitleEdit.Forms
private void GuessTimeCodesToolStripMenuItemClick(object sender, EventArgs e) private void GuessTimeCodesToolStripMenuItemClick(object sender, EventArgs e)
{ {
var form = new WaveformGenerateTimeCodes(); using (var form = new WaveformGenerateTimeCodes())
if (form.ShowDialog(this) == DialogResult.OK)
{ {
MakeHistoryForUndoOnlyIfNotResent(string.Format(_language.BeforeGuessingTimeCodes)); if (form.ShowDialog(this) == DialogResult.OK)
double startFrom = 0;
if (form.StartFromVideoPosition)
startFrom = mediaPlayer.CurrentPosition;
if (form.DeleteAll)
{ {
_subtitle.Paragraphs.Clear(); MakeHistoryForUndoOnlyIfNotResent(string.Format(_language.BeforeGuessingTimeCodes));
}
else if (form.DeleteForward) double startFrom = 0;
{ if (form.StartFromVideoPosition)
for (int i = _subtitle.Paragraphs.Count - 1; i > 0; i--) startFrom = mediaPlayer.CurrentPosition;
if (form.DeleteAll)
{ {
if (_subtitle.Paragraphs[i].EndTime.TotalSeconds + 1 > startFrom) _subtitle.Paragraphs.Clear();
_subtitle.Paragraphs.RemoveAt(i);
} }
else if (form.DeleteForward)
{
for (int i = _subtitle.Paragraphs.Count - 1; i > 0; i--)
{
if (_subtitle.Paragraphs[i].EndTime.TotalSeconds + 1 > startFrom)
_subtitle.Paragraphs.RemoveAt(i);
}
}
audioVisualizer.GenerateTimeCodes(form.BlockSize, form.VolumeMinimum, form.VolumeMaximum, form.DefaultMilliseconds);
if (IsFramesRelevant && CurrentFrameRate > 0)
_subtitle.CalculateFrameNumbersFromTimeCodesNoCheck(CurrentFrameRate);
SubtitleListview1.Fill(_subtitle, _subtitleAlternate);
RefreshSelectedParagraph();
} }
audioVisualizer.GenerateTimeCodes(form.BlockSize, form.VolumeMinimum, form.VolumeMaximum, form.DefaultMilliseconds);
if (IsFramesRelevant && CurrentFrameRate > 0)
_subtitle.CalculateFrameNumbersFromTimeCodesNoCheck(CurrentFrameRate);
SubtitleListview1.Fill(_subtitle, _subtitleAlternate);
RefreshSelectedParagraph();
} }
} }
@ -18988,6 +19002,7 @@ namespace Nikse.SubtitleEdit.Forms
SubtitleListview1.SelectIndexAndEnsureVisible(index, true); SubtitleListview1.SelectIndexAndEnsureVisible(index, true);
RefreshSelectedParagraph(); RefreshSelectedParagraph();
} }
form.Dispose();
} }
} }
@ -19244,13 +19259,13 @@ namespace Nikse.SubtitleEdit.Forms
private void toolStripMenuItemBatchConvert_Click(object sender, EventArgs e) private void toolStripMenuItemBatchConvert_Click(object sender, EventArgs e)
{ {
this.Visible = false; Visible = false;
var form = new BatchConvert(this.Icon); var form = new BatchConvert(this.Icon);
_formPositionsAndSizes.SetPositionAndSize(form); _formPositionsAndSizes.SetPositionAndSize(form);
form.ShowDialog(this); form.ShowDialog(this);
_formPositionsAndSizes.SavePositionAndSize(form); _formPositionsAndSizes.SavePositionAndSize(form);
form.Dispose(); form.Dispose();
this.Visible = true; Visible = true;
} }
private void copyOriginalTextToCurrentToolStripMenuItem_Click(object sender, EventArgs e) private void copyOriginalTextToCurrentToolStripMenuItem_Click(object sender, EventArgs e)
@ -19417,14 +19432,15 @@ namespace Nikse.SubtitleEdit.Forms
private void toolStripMenuItemImportOcrHardSub_Click(object sender, EventArgs e) private void toolStripMenuItemImportOcrHardSub_Click(object sender, EventArgs e)
{ {
var form = new HardSubExtract(_videoFileName); using (var form = new HardSubExtract(_videoFileName))
if (form.ShowDialog(this) == DialogResult.OK)
{ {
if (form.ShowDialog(this) == DialogResult.OK)
if (!string.IsNullOrEmpty(form.OcrFileName))
{ {
MakeHistoryForUndo(_language.BeforeAutoBalanceSelectedLines); //TODO: Fix text if (!string.IsNullOrEmpty(form.OcrFileName))
OpenSubtitle(form.OcrFileName, null); {
MakeHistoryForUndo(_language.BeforeAutoBalanceSelectedLines); //TODO: Fix text
OpenSubtitle(form.OcrFileName, null);
}
} }
} }
} }
@ -19461,10 +19477,12 @@ namespace Nikse.SubtitleEdit.Forms
private void toolStripMenuItemMeasurementConverter_Click(object sender, EventArgs e) private void toolStripMenuItemMeasurementConverter_Click(object sender, EventArgs e)
{ {
var form = new MeasurementConverter(); using (var form = new MeasurementConverter())
_formPositionsAndSizes.SetPositionAndSize(form); {
form.Show(this); _formPositionsAndSizes.SetPositionAndSize(form);
// _formPositionsAndSizes.SavePositionAndSize(form); form.Show(this);
// _formPositionsAndSizes.SavePositionAndSize(form);
}
} }
private void toolStripMenuItemImportSceneChanges_Click(object sender, EventArgs e) private void toolStripMenuItemImportSceneChanges_Click(object sender, EventArgs e)
@ -19741,8 +19759,10 @@ namespace Nikse.SubtitleEdit.Forms
{ {
} }
var form = new CheckForUpdates(this); using (var form = new CheckForUpdates(this))
form.ShowDialog(this); {
form.ShowDialog(this);
}
Configuration.Settings.General.LastCheckForUpdates = DateTime.Now; Configuration.Settings.General.LastCheckForUpdates = DateTime.Now;
} }