From af58db5b9e9ca4b1c10763df70b2dac28c831b3e Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Wed, 29 Feb 2012 01:24:16 +0000 Subject: [PATCH] Fix reindexing of files on every open FFMS_IndexBelongsToFile returns 0 when the index belongs to the file, not 1. Originally committed to SVN as r6526. --- aegisub/src/audio_provider_ffmpegsource.cpp | 2 +- aegisub/src/video_provider_ffmpegsource.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aegisub/src/audio_provider_ffmpegsource.cpp b/aegisub/src/audio_provider_ffmpegsource.cpp index 0d1e4140b..290bd1697 100644 --- a/aegisub/src/audio_provider_ffmpegsource.cpp +++ b/aegisub/src/audio_provider_ffmpegsource.cpp @@ -100,7 +100,7 @@ void FFmpegSourceAudioProvider::LoadAudio(wxString filename) { agi::scoped_holder Index(FFMS_ReadIndex(CacheName.utf8_str(), &ErrInfo), FFMS_DestroyIndex); - if (Index && !FFMS_IndexBelongsToFile(Index, FileNameShort.utf8_str(), &ErrInfo)) + if (Index && FFMS_IndexBelongsToFile(Index, FileNameShort.utf8_str(), &ErrInfo)) Index = NULL; // index valid but track number still not set? diff --git a/aegisub/src/video_provider_ffmpegsource.cpp b/aegisub/src/video_provider_ffmpegsource.cpp index 8c574483d..5def6d435 100644 --- a/aegisub/src/video_provider_ffmpegsource.cpp +++ b/aegisub/src/video_provider_ffmpegsource.cpp @@ -113,7 +113,7 @@ void FFmpegSourceVideoProvider::LoadVideo(wxString filename) { agi::scoped_holder Index(FFMS_ReadIndex(CacheName.utf8_str(), &ErrInfo), FFMS_DestroyIndex); - if (Index && !FFMS_IndexBelongsToFile(Index, FileNameShort.utf8_str(), &ErrInfo)) + if (Index && FFMS_IndexBelongsToFile(Index, FileNameShort.utf8_str(), &ErrInfo)) Index = NULL; // time to examine the index and check if the track we want is indexed