mirror of https://github.com/odrling/Aegisub
Fixed loading of avisynth scripts as audio
Originally committed to SVN as r1296.
This commit is contained in:
parent
54f5c82296
commit
d5a42097ff
|
@ -119,9 +119,19 @@ void AvisynthAudioProvider::OpenAVSAudio() {
|
||||||
wxMutexLocker lock(AviSynthMutex);
|
wxMutexLocker lock(AviSynthMutex);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const char * argnames[3] = { 0, "video", "audio" };
|
// Include
|
||||||
AVSValue args[3] = { env->SaveString(filename.mb_str(wxConvLocal)), false, true };
|
if (filename.EndsWith(_T(".avs"))) {
|
||||||
script = env->Invoke("DirectShowSource", AVSValue(args,3),argnames);
|
wxFileName fn(filename);
|
||||||
|
char *fname = env->SaveString(fn.GetShortPath().mb_str(wxConvLocal));
|
||||||
|
script = env->Invoke("Import", fname);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Use DirectShowSource
|
||||||
|
else {
|
||||||
|
const char * argnames[3] = { 0, "video", "audio" };
|
||||||
|
AVSValue args[3] = { env->SaveString(filename.mb_str(wxConvLocal)), false, true };
|
||||||
|
script = env->Invoke("DirectShowSource", AVSValue(args,3),argnames);
|
||||||
|
}
|
||||||
|
|
||||||
LoadFromClip(script);
|
LoadFromClip(script);
|
||||||
|
|
||||||
|
|
|
@ -52,6 +52,7 @@ Please visit http://aegisub.net to download latest version
|
||||||
o Added option to disable automatic grabbing of times from selected lines on the audio display. Also, it will never pick the times from 0:00:00.00 -> 0:00:00.00 lines. (AMZ)
|
o Added option to disable automatic grabbing of times from selected lines on the audio display. Also, it will never pick the times from 0:00:00.00 -> 0:00:00.00 lines. (AMZ)
|
||||||
o Moved karaoke syllable text in audio display to the top instead of bottom, since it often covered important information in spectrum mode (jfs)
|
o Moved karaoke syllable text in audio display to the top instead of bottom, since it often covered important information in spectrum mode (jfs)
|
||||||
o Misc. changes and bugfixes in karaoke mode. Using the syllable splitter should be easier now. (jfs)
|
o Misc. changes and bugfixes in karaoke mode. Using the syllable splitter should be easier now. (jfs)
|
||||||
|
o Fixed loading of Avisynth Scripts as audio. (AMZ)
|
||||||
- Changes to Audio Spectrum: (jfs)
|
- Changes to Audio Spectrum: (jfs)
|
||||||
o The calculated FFT data are now cached, so things should be faster
|
o The calculated FFT data are now cached, so things should be faster
|
||||||
o Actual signal power is now more accurately represented
|
o Actual signal power is now more accurately represented
|
||||||
|
|
Loading…
Reference in New Issue