Audio viz - don't generate wav if source is already wav - thx MM :)

This commit is contained in:
niksedk 2015-09-08 18:49:03 +02:00
parent e1a280b219
commit 3f4141a1a7

View File

@ -14830,13 +14830,20 @@ namespace Nikse.SubtitleEdit.Forms
if (string.IsNullOrEmpty(_videoFileName)) if (string.IsNullOrEmpty(_videoFileName))
return; return;
} }
mediaPlayer.Pause(); mediaPlayer.Pause();
using (var addWaveform = new AddWaveform()) using (var addWaveform = new AddWaveform())
{ {
var peakWaveFileName = GetPeakWaveFileName(_videoFileName); var peakWaveFileName = GetPeakWaveFileName(_videoFileName);
var spectrogramFolder = GetSpectrogramFolder(_videoFileName); var spectrogramFolder = GetSpectrogramFolder(_videoFileName);
if (_videoFileName.EndsWith(".wav", StringComparison.OrdinalIgnoreCase))
{
addWaveform.InitializeViaWaveFile(_videoFileName, spectrogramFolder);
}
else
{
addWaveform.Initialize(_videoFileName, spectrogramFolder, _videoAudioTrackNumber); addWaveform.Initialize(_videoFileName, spectrogramFolder, _videoAudioTrackNumber);
}
if (addWaveform.ShowDialog() == DialogResult.OK) if (addWaveform.ShowDialog() == DialogResult.OK)
{ {
addWaveform.WavePeak.WritePeakSamples(peakWaveFileName); addWaveform.WavePeak.WritePeakSamples(peakWaveFileName);
@ -15181,7 +15188,7 @@ namespace Nikse.SubtitleEdit.Forms
string ext = Path.GetExtension(fileName).ToLowerInvariant(); string ext = Path.GetExtension(fileName).ToLowerInvariant();
if (ext != ".wav") if (ext != ".wav")
{ {
if (audioVisualizer.WavePeaks == null && (Utilities.GetMovieFileExtensions().Contains(ext) || ext == ".mp3")) if (audioVisualizer.WavePeaks == null && (Utilities.GetMovieFileExtensions().Contains(ext) || ext == ".mp3" || ext == ".mka" || ext == ".m4a" || ext == ".wma"))
{ {
_videoFileName = fileName; _videoFileName = fileName;
AudioWaveform_Click(null, null); AudioWaveform_Click(null, null);