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

ran tabspace

Browse Source 
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@2272 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
XhmikosR 2013-12-02 08:46:12 +00:00
parent 0706727fe5
commit 8eba3e62f0
9 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Changelog.txt
View File

@ -16,7 +16,7 @@
* FIXED:
* Fixed audio waveform so it works better with VLC
* Fixed sync of spectrogram
* Fixed spectrogram so it works with FFMPEG
* Fixed spectrogram so it works with FFmpeg
* Dragging line in wave form in frames mode keeps duration - thx Adrian
* Fixed Slovak spell check dictionary link
* Status text after re-calculating display times fixed - thx Dennis

2
src/Controls/AudioVisualizer.cs
View File

@ -1655,7 +1655,7 @@ namespace Nikse.SubtitleEdit.Controls
{
double duration = EndPositionSeconds - StartPositionSeconds;
int width = (int)(duration / _sampleDuration);
Bitmap bmpDestination = new Bitmap(width, 128); //calculate width
Graphics gfx = Graphics.FromImage(bmpDestination);

4
src/Forms/AddWareForm.cs
View File

@ -51,7 +51,7 @@ namespace Nikse.SubtitleEdit.Forms
_cancel = false;
bool runningOnWindows = false;
SourceVideoFileName = labelVideoFileName.Text;
string targetFile = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".wav");
string targetFile = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".wav");
string parameters = "\"" + SourceVideoFileName + "\" -I dummy -vvv --no-sout-video --audio-track=" + _audioTrackNumber.ToString() + " --sout=\"#transcode{acodec=s16l,channels=2,ab=128,samplerate=24000}:std{access=file,mux=wav,dst=" + targetFile + "}\" vlc://quit";
string exeFilePath;
if (Utilities.IsRunningOnLinux() || Utilities.IsRunningOnMac())
@ -88,7 +88,7 @@ namespace Nikse.SubtitleEdit.Forms
labelInfo.Text = "VLC";
if (Configuration.Settings.General.UseFFMPEGForWaveExtraction && File.Exists(Configuration.Settings.General.FFMPEGLocation))
{
string FFMPEGWaveTranscodeSettings = "-i \"{0}\" -vn -ar 24000 -ac 2 -ab 128 -vol 448 -f wav \"{1}\"";
string FFMPEGWaveTranscodeSettings = "-i \"{0}\" -vn -ar 24000 -ac 2 -ab 128 -vol 448 -f wav \"{1}\"";
//-i indicates the input
//-vn means no video ouput
//-ar 44100 indicates the sampling frequency.

2
src/Forms/ExportPngXml.cs
View File

@ -50,7 +50,7 @@ namespace Nikse.SubtitleEdit.Forms
public int ShadowWidth { get; set; }
public int ShadowAlpha { get; set; }
public int LineHeight { get; set; }
public MakeBitmapParameter()
{

2
src/Forms/RestoreAutoBackup.cs
View File

@ -101,7 +101,7 @@ namespace Nikse.SubtitleEdit.Forms
item.SubItems.Add(subItem);
}
catch
{
{
}

2
src/Logic/LanguageStructure.cs
View File

@ -431,7 +431,7 @@
public string SaveFabImageScriptAs { get; set; }
public string SaveDvdStudioProStlAs { get; set; }
public string SomeLinesWereTooLongX { get; set; }
public string LineHeight { get; set; }
public string LineHeight { get; set; }
}
public class ExportText

2
src/Logic/Settings.cs
View File

@ -2499,7 +2499,7 @@ namespace Nikse.SubtitleEdit.Logic
textWriter.WriteElementString("MusicSymbolStyle", settings.Tools.MusicSymbolStyle);
textWriter.WriteElementString("BridgeGapMilliseconds", settings.Tools.BridgeGapMilliseconds.ToString());
textWriter.WriteElementString("ExportCustomTemplates", settings.Tools.ExportCustomTemplates);
textWriter.WriteElementString("ChangeCasingChoice", settings.Tools.ChangeCasingChoice);
textWriter.WriteElementString("ChangeCasingChoice", settings.Tools.ChangeCasingChoice);
textWriter.WriteEndElement();

2
src/Logic/SubtitleFormats/TimedText.cs
View File

@ -243,7 +243,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
}
else
{
subtitle.Paragraphs.Add(new Paragraph(TimedText10.GetTimeCode(start, false), TimedText10.GetTimeCode(end, false), text));
subtitle.Paragraphs.Add(new Paragraph(TimedText10.GetTimeCode(start, false), TimedText10.GetTimeCode(end, false), text));
}
}
}

4
src/Logic/WaveToVisualizer.cs
View File

@ -130,7 +130,7 @@ namespace Nikse.SubtitleEdit.Logic
const int headerSize = 44;
int byteRate = sampleRate * (bitsPerSample / 8) * numberOfChannels;
WriteInt32ToByteArray(_headerData, 4, dataSize + headerSize - 8);
WriteInt16ToByteArray(_headerData, 16, fmtChunckSize); //
WriteInt16ToByteArray(_headerData, 16, fmtChunckSize); //
WriteInt16ToByteArray(_headerData, ConstantHeaderSize + 2, numberOfChannels);
WriteInt32ToByteArray(_headerData, ConstantHeaderSize + 4, sampleRate);
WriteInt32ToByteArray(_headerData, ConstantHeaderSize + 8, byteRate);
@ -459,7 +459,7 @@ namespace Nikse.SubtitleEdit.Logic
samplesAsReal[k] = samples[k] / divider;
var bmp = DrawSpectrogram(nfft, samplesAsReal, f, palette);
bmp.Save(Path.Combine(spectrogramDirectory, count + ".gif"), System.Drawing.Imaging.ImageFormat.Gif);
bitmaps.Add(bmp);
bitmaps.Add(bmp);
samples = new List<int>();
count++;
}