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

Add opton to auto gen waveform when loading video - thx jirih :)

Browse Source 
Fix #4712
This commit is contained in:
niksedk 2021-12-03 15:11:39 +01:00
parent 363e9f5094
commit 96f0487984
7 changed files with 47 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LanguageMaster.xml
View File

@ -1711,6 +1711,7 @@ If you have edited this file with Subtitle Edit you might be able to find a back
<Errors>Errors</Errors>
<ShowVideoControls>Show video controls</ShowVideoControls>
<HideVideoControls>Hide video controls</HideVideoControls>
<GeneratingWaveformInBackground>Generating waveform in background...</GeneratingWaveformInBackground>
</Main>
<MatroskaSubtitleChooser>
<Title>Choose subtitle from Matroska file</Title>
@ -2168,6 +2169,7 @@ can edit in same subtitle file (collaboration)</Information>
<WaveformListViewFocusMouseEnter>Also set list view focus on mouse enter in list view</WaveformListViewFocusMouseEnter>
<WaveformSingleClickSelect>Single click to select subtitles</WaveformSingleClickSelect>
<WaveformSnapToSceneChanges>Snap to scene changes (hold Shift to override)</WaveformSnapToSceneChanges>
<WaveformAutoGen>Auto generate waveform when opening video</WaveformAutoGen>
<WaveformBorderHitMs1>Border marker hit must be within</WaveformBorderHitMs1>
<WaveformBorderHitMs2>milliseconds</WaveformBorderHitMs2>
<WaveformColor>Color</WaveformColor>

4
src/ui/Forms/Main.cs
View File

@ -20600,7 +20600,7 @@ namespace Nikse.SubtitleEdit.Forms
try
{
process = AddWaveform.GetCommandLineProcess(fileName, -1, targetFile, Configuration.Settings.General.VlcWaveTranscodeSettings, out var encoderName);
System.Threading.SynchronizationContext.Current.Post(TimeSpan.FromMilliseconds(25), () => ShowStatus("Generating waveform in background..."));
System.Threading.SynchronizationContext.Current.Post(TimeSpan.FromMilliseconds(25), () => ShowStatus(_language.GeneratingWaveformInBackground));
var bw = new BackgroundWorker();
bw.DoWork += (sender, args) =>
{
@ -20692,8 +20692,6 @@ namespace Nikse.SubtitleEdit.Forms
{
audioVisualizer.UseSmpteDropFrameTime();
}
ShowStatus("Waveform loaded");
}
}
else

49
src/ui/Forms/Options/Settings.Designer.cs generated
View File

@ -244,6 +244,7 @@
this.checkBoxWaveformShowGrid = new System.Windows.Forms.CheckBox();
this.panelTools = new System.Windows.Forms.Panel();
this.groupBoxToolsMisc = new System.Windows.Forms.GroupBox();
this.checkBoxShortcutsAllowLetterOrNumberInTextBox = new System.Windows.Forms.CheckBox();
this.comboBoxBDOpensIn = new System.Windows.Forms.ComboBox();
this.labelBDOpensIn = new System.Windows.Forms.Label();
this.groupBoxGoogleTranslate = new System.Windows.Forms.GroupBox();
@ -413,7 +414,7 @@
this.buttonReset = new System.Windows.Forms.Button();
this.toolTipContinuationPreview = new System.Windows.Forms.ToolTip(this.components);
this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog();
this.checkBoxShortcutsAllowLetterOrNumberInTextBox = new System.Windows.Forms.CheckBox();
this.checkBoxWaveformAutoGen = new System.Windows.Forms.CheckBox();
this.panelGeneral.SuspendLayout();
this.groupBoxMiscellaneous.SuspendLayout();
this.groupBoxGeneralRules.SuspendLayout();
@ -2787,6 +2788,7 @@
//
this.groupBoxWaveformAppearence.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBoxWaveformAppearence.Controls.Add(this.checkBoxWaveformAutoGen);
this.groupBoxWaveformAppearence.Controls.Add(this.panelWaveformCursorColor);
this.groupBoxWaveformAppearence.Controls.Add(this.buttonWaveformCursorColor);
this.groupBoxWaveformAppearence.Controls.Add(this.checkBoxWaveformSnapToSceneChanges);
@ -2864,7 +2866,7 @@
// checkBoxWaveformShowWpm
//
this.checkBoxWaveformShowWpm.AutoSize = true;
this.checkBoxWaveformShowWpm.Location = new System.Drawing.Point(16, 256);
this.checkBoxWaveformShowWpm.Location = new System.Drawing.Point(16, 249);
this.checkBoxWaveformShowWpm.Name = "checkBoxWaveformShowWpm";
this.checkBoxWaveformShowWpm.Size = new System.Drawing.Size(104, 17);
this.checkBoxWaveformShowWpm.TabIndex = 8;
@ -2874,7 +2876,7 @@
// checkBoxWaveformShowCps
//
this.checkBoxWaveformShowCps.AutoSize = true;
this.checkBoxWaveformShowCps.Location = new System.Drawing.Point(16, 233);
this.checkBoxWaveformShowCps.Location = new System.Drawing.Point(16, 226);
this.checkBoxWaveformShowCps.Name = "checkBoxWaveformShowCps";
this.checkBoxWaveformShowCps.Size = new System.Drawing.Size(96, 17);
this.checkBoxWaveformShowCps.TabIndex = 7;
@ -2894,7 +2896,7 @@
// labelWaveformTextSize
//
this.labelWaveformTextSize.AutoSize = true;
this.labelWaveformTextSize.Location = new System.Drawing.Point(259, 194);
this.labelWaveformTextSize.Location = new System.Drawing.Point(259, 220);
this.labelWaveformTextSize.Name = "labelWaveformTextSize";
this.labelWaveformTextSize.Size = new System.Drawing.Size(73, 13);
this.labelWaveformTextSize.TabIndex = 27;
@ -2903,7 +2905,7 @@
// checkBoxWaveformTextBold
//
this.checkBoxWaveformTextBold.AutoSize = true;
this.checkBoxWaveformTextBold.Location = new System.Drawing.Point(463, 195);
this.checkBoxWaveformTextBold.Location = new System.Drawing.Point(463, 221);
this.checkBoxWaveformTextBold.Name = "checkBoxWaveformTextBold";
this.checkBoxWaveformTextBold.Size = new System.Drawing.Size(46, 17);
this.checkBoxWaveformTextBold.TabIndex = 29;
@ -2929,7 +2931,7 @@
"18",
"19",
"20"});
this.comboBoxWaveformTextSize.Location = new System.Drawing.Point(336, 191);
this.comboBoxWaveformTextSize.Location = new System.Drawing.Point(336, 217);
this.comboBoxWaveformTextSize.Name = "comboBoxWaveformTextSize";
this.comboBoxWaveformTextSize.Size = new System.Drawing.Size(121, 21);
this.comboBoxWaveformTextSize.TabIndex = 28;
@ -2958,7 +2960,7 @@
// labelWaveformBorderHitMs2
//
this.labelWaveformBorderHitMs2.AutoSize = true;
this.labelWaveformBorderHitMs2.Location = new System.Drawing.Point(454, 224);
this.labelWaveformBorderHitMs2.Location = new System.Drawing.Point(454, 250);
this.labelWaveformBorderHitMs2.Name = "labelWaveformBorderHitMs2";
this.labelWaveformBorderHitMs2.Size = new System.Drawing.Size(62, 13);
this.labelWaveformBorderHitMs2.TabIndex = 32;
@ -2966,7 +2968,7 @@
//
// numericUpDownWaveformBorderHitMs
//
this.numericUpDownWaveformBorderHitMs.Location = new System.Drawing.Point(392, 222);
this.numericUpDownWaveformBorderHitMs.Location = new System.Drawing.Point(392, 248);
this.numericUpDownWaveformBorderHitMs.Minimum = new decimal(new int[] {
10,
0,
@ -2984,7 +2986,7 @@
// labelWaveformBorderHitMs1
//
this.labelWaveformBorderHitMs1.AutoSize = true;
this.labelWaveformBorderHitMs1.Location = new System.Drawing.Point(259, 224);
this.labelWaveformBorderHitMs1.Location = new System.Drawing.Point(259, 250);
this.labelWaveformBorderHitMs1.Name = "labelWaveformBorderHitMs1";
this.labelWaveformBorderHitMs1.Size = new System.Drawing.Size(127, 13);
this.labelWaveformBorderHitMs1.TabIndex = 30;
@ -3143,6 +3145,16 @@
this.groupBoxToolsMisc.TabStop = false;
this.groupBoxToolsMisc.Text = "Misc";
//
// checkBoxShortcutsAllowLetterOrNumberInTextBox
//
this.checkBoxShortcutsAllowLetterOrNumberInTextBox.AutoSize = true;
this.checkBoxShortcutsAllowLetterOrNumberInTextBox.Location = new System.Drawing.Point(8, 65);
this.checkBoxShortcutsAllowLetterOrNumberInTextBox.Name = "checkBoxShortcutsAllowLetterOrNumberInTextBox";
this.checkBoxShortcutsAllowLetterOrNumberInTextBox.Size = new System.Drawing.Size(223, 17);
this.checkBoxShortcutsAllowLetterOrNumberInTextBox.TabIndex = 61;
this.checkBoxShortcutsAllowLetterOrNumberInTextBox.Text = "Allow letter/number shortcuts in text box";
this.checkBoxShortcutsAllowLetterOrNumberInTextBox.UseVisualStyleBackColor = true;
//
// comboBoxBDOpensIn
//
this.comboBoxBDOpensIn.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
@ -4953,21 +4965,22 @@
this.toolTipContinuationPreview.InitialDelay = 500;
this.toolTipContinuationPreview.ReshowDelay = 100;
//
// checkBoxShortcutsAllowLetterOrNumberInTextBox
// checkBoxWaveformAutoGen
//
this.checkBoxShortcutsAllowLetterOrNumberInTextBox.AutoSize = true;
this.checkBoxShortcutsAllowLetterOrNumberInTextBox.Location = new System.Drawing.Point(8, 65);
this.checkBoxShortcutsAllowLetterOrNumberInTextBox.Name = "checkBoxShortcutsAllowLetterOrNumberInTextBox";
this.checkBoxShortcutsAllowLetterOrNumberInTextBox.Size = new System.Drawing.Size(223, 17);
this.checkBoxShortcutsAllowLetterOrNumberInTextBox.TabIndex = 61;
this.checkBoxShortcutsAllowLetterOrNumberInTextBox.Text = "Allow letter/number shortcuts in text box";
this.checkBoxShortcutsAllowLetterOrNumberInTextBox.UseVisualStyleBackColor = true;
this.checkBoxWaveformAutoGen.AutoSize = true;
this.checkBoxWaveformAutoGen.Location = new System.Drawing.Point(262, 188);
this.checkBoxWaveformAutoGen.Name = "checkBoxWaveformAutoGen";
this.checkBoxWaveformAutoGen.Size = new System.Drawing.Size(220, 17);
this.checkBoxWaveformAutoGen.TabIndex = 35;
this.checkBoxWaveformAutoGen.Text = "Auto gen waveform when opening video";
this.checkBoxWaveformAutoGen.UseVisualStyleBackColor = true;
//
// Settings
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1092, 574);
this.Controls.Add(this.panelWaveform);
this.Controls.Add(this.panelTools);
this.Controls.Add(this.panelShortcuts);
this.Controls.Add(this.panelSubtitleFormats);
@ -4977,7 +4990,6 @@
this.Controls.Add(this.panelVideoPlayer);
this.Controls.Add(this.panelWordLists);
this.Controls.Add(this.panelToolBar);
this.Controls.Add(this.panelWaveform);
this.Controls.Add(this.panelSyntaxColoring);
this.Controls.Add(this.listBoxSection);
this.Controls.Add(this.buttonReset);
@ -5493,5 +5505,6 @@
private System.Windows.Forms.ComboBox comboBoxBDOpensIn;
private System.Windows.Forms.Label labelBDOpensIn;
private System.Windows.Forms.CheckBox checkBoxShortcutsAllowLetterOrNumberInTextBox;
private System.Windows.Forms.CheckBox checkBoxWaveformAutoGen;
}
}

3
src/ui/Forms/Options/Settings.cs
View File

@ -657,6 +657,7 @@ namespace Nikse.SubtitleEdit.Forms.Options
checkBoxListViewMouseEnterFocus.Text = language.WaveformListViewFocusMouseEnter;
checkBoxWaveformSingleClickSelect.Text = language.WaveformSingleClickSelect;
checkBoxWaveformSnapToSceneChanges.Text = language.WaveformSnapToSceneChanges;
checkBoxWaveformAutoGen.Text = language.WaveformAutoGen;
labelWaveformBorderHitMs1.Text = language.WaveformBorderHitMs1;
labelWaveformBorderHitMs2.Text = language.WaveformBorderHitMs2;
numericUpDownWaveformBorderHitMs.Left = labelWaveformBorderHitMs1.Left + labelWaveformBorderHitMs1.Width;
@ -1010,6 +1011,7 @@ namespace Nikse.SubtitleEdit.Forms.Options
checkBoxListViewMouseEnterFocus.Checked = Configuration.Settings.VideoControls.WaveformListViewFocusOnMouseEnter;
checkBoxWaveformSingleClickSelect.Checked = Configuration.Settings.VideoControls.WaveformSingleClickSelect;
checkBoxWaveformSnapToSceneChanges.Checked = Configuration.Settings.VideoControls.WaveformSnapToSceneChanges;
checkBoxWaveformAutoGen.Checked = Configuration.Settings.General.WaveformAutoGenWhenOpeningVideo;
if (Configuration.Settings.VideoControls.WaveformBorderHitMs >= numericUpDownWaveformBorderHitMs.Minimum &&
Configuration.Settings.VideoControls.WaveformBorderHitMs <= numericUpDownWaveformBorderHitMs.Maximum)
{
@ -2094,6 +2096,7 @@ namespace Nikse.SubtitleEdit.Forms.Options
Configuration.Settings.VideoControls.WaveformListViewFocusOnMouseEnter = checkBoxListViewMouseEnterFocus.Checked;
Configuration.Settings.VideoControls.WaveformSingleClickSelect = checkBoxWaveformSingleClickSelect.Checked;
Configuration.Settings.VideoControls.WaveformSnapToSceneChanges = checkBoxWaveformSnapToSceneChanges.Checked;
Configuration.Settings.General.WaveformAutoGenWhenOpeningVideo = checkBoxWaveformAutoGen.Checked;
Configuration.Settings.VideoControls.WaveformBorderHitMs = Convert.ToInt32(numericUpDownWaveformBorderHitMs.Value);
gs.UseFFmpegForWaveExtraction = checkBoxUseFFmpeg.Checked;
gs.FFmpegLocation = textBoxFFmpegPath.Text;

2
src/ui/Logic/Language.cs
View File

@ -1612,6 +1612,7 @@ namespace Nikse.SubtitleEdit.Logic
Errors = "Errors",
ShowVideoControls = "Show video controls",
HideVideoControls = "Hide video controls",
GeneratingWaveformInBackground = "Generating waveform in background...",
Menu = new LanguageStructure.Main.MainMenu
{
@ -2497,6 +2498,7 @@ can edit in same subtitle file (collaboration)",
WaveformListViewFocusMouseEnter = "Also set list view focus on mouse enter in list view",
WaveformSingleClickSelect = "Single click to select subtitles",
WaveformSnapToSceneChanges = "Snap to scene changes (hold Shift to override)",
WaveformAutoGen = "Auto generate waveform when opening video",
WaveformBorderHitMs1 = "Border marker hit must be within",
WaveformBorderHitMs2 = "milliseconds",
WaveformColor = "Color",

6
src/ui/Logic/LanguageDeserializer.cs
View File

@ -3715,6 +3715,9 @@ namespace Nikse.SubtitleEdit.Logic
case "Main/HideVideoControls":
language.Main.HideVideoControls = reader.Value;
break;
case "Main/GeneratingWaveformInBackground":
language.Main.GeneratingWaveformInBackground = reader.Value;
break;
case "Main/Menu/File/Title":
language.Main.Menu.File.Title = reader.Value;
break;
@ -5878,6 +5881,9 @@ namespace Nikse.SubtitleEdit.Logic
case "Settings/WaveformSnapToSceneChanges":
language.Settings.WaveformSnapToSceneChanges = reader.Value;
break;
case "Settings/WaveformAutoGen":
language.Settings.WaveformAutoGen = reader.Value;
break;
case "Settings/WaveformBorderHitMs1":
language.Settings.WaveformBorderHitMs1 = reader.Value;
break;

2
src/ui/Logic/LanguageStructure.cs
View File

@ -1464,6 +1464,7 @@
public string Errors { get; set; }
public string ShowVideoControls { get; set; }
public string HideVideoControls { get; set; }
public string GeneratingWaveformInBackground { get; set; }
public class MainMenu
{
@ -2346,6 +2347,7 @@
public string WaveformListViewFocusMouseEnter { get; set; }
public string WaveformSingleClickSelect { get; set; }
public string WaveformSnapToSceneChanges { get; set; }
public string WaveformAutoGen { get; set; }
public string WaveformBorderHitMs1 { get; set; }
public string WaveformBorderHitMs2 { get; set; }
public string WaveformColor { get; set; }