From 02065a75096cdf5f5f2ebc6fc9fc105a21c9ffb9 Mon Sep 17 00:00:00 2001 From: Fredrik Mellbin Date: Thu, 28 May 2009 19:34:52 +0000 Subject: [PATCH] Changes required to compile because of the previous commit Originally committed to SVN as r2992. --- aegisub/src/audio_provider_ffmpegsource.cpp | 10 +++++----- aegisub/src/video_provider_ffmpegsource.cpp | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/aegisub/src/audio_provider_ffmpegsource.cpp b/aegisub/src/audio_provider_ffmpegsource.cpp index a0e3c9508..6a121477e 100644 --- a/aegisub/src/audio_provider_ffmpegsource.cpp +++ b/aegisub/src/audio_provider_ffmpegsource.cpp @@ -101,7 +101,7 @@ void FFmpegSourceAudioProvider::LoadAudio(Aegisub::String filename) { // index exists, but does it have indexing info for the audio track(s)? int NumTracks = FFMS_GetNumTracks(Index); if (NumTracks <= 0) { - FFMS_DestroyFFIndex(Index); + FFMS_DestroyIndex(Index); Index = NULL; throw _T("FFmpegSource audio provider: no tracks found in index file"); } @@ -109,7 +109,7 @@ void FFmpegSourceAudioProvider::LoadAudio(Aegisub::String filename) { for (int i = 0; i < NumTracks; i++) { FFTrack *FrameData = FFMS_GetTrackFromIndex(Index, i); if (FrameData == NULL) { - FFMS_DestroyFFIndex(Index); + FFMS_DestroyIndex(Index); Index = NULL; wxString temp(FFMSErrMsg, wxConvUTF8); MsgString << _T("Couldn't get track data: ") << temp; @@ -120,7 +120,7 @@ void FFmpegSourceAudioProvider::LoadAudio(Aegisub::String filename) { if (FFMS_GetNumFrames(FrameData) <= 0 && (FFMS_GetTrackType(FrameData) == FFMS_TYPE_AUDIO)) { // found an unindexed audio track, we'll need to reindex try { - FFMS_DestroyFFIndex(Index); + FFMS_DestroyIndex(Index); Index = NULL; Index = DoIndexing(Index, FileNameWX, CacheName, FFMSTrackMaskAll, false); } catch (wxString temp) { @@ -142,7 +142,7 @@ void FFmpegSourceAudioProvider::LoadAudio(Aegisub::String filename) { // FIXME: provide a way to choose which audio track to load? int TrackNumber = FFMS_GetFirstTrackOfType(Index, FFMS_TYPE_AUDIO, FFMSErrMsg, MsgSize); if (TrackNumber < 0) { - FFMS_DestroyFFIndex(Index); + FFMS_DestroyIndex(Index); Index = NULL; wxString temp(FFMSErrMsg, wxConvUTF8); MsgString << _T("Couldn't find any audio tracks: ") << temp; @@ -150,7 +150,7 @@ void FFmpegSourceAudioProvider::LoadAudio(Aegisub::String filename) { } AudioSource = FFMS_CreateAudioSource(FileNameWX.mb_str(wxConvLocal), TrackNumber, Index, FFMSErrMsg, MsgSize); - FFMS_DestroyFFIndex(Index); + FFMS_DestroyIndex(Index); Index = NULL; if (!AudioSource) { wxString temp(FFMSErrMsg, wxConvUTF8); diff --git a/aegisub/src/video_provider_ffmpegsource.cpp b/aegisub/src/video_provider_ffmpegsource.cpp index 0b2245d65..02e10eab9 100644 --- a/aegisub/src/video_provider_ffmpegsource.cpp +++ b/aegisub/src/video_provider_ffmpegsource.cpp @@ -148,7 +148,7 @@ void FFmpegSourceVideoProvider::LoadVideo(Aegisub::String filename, double fps) // FIXME: provide a way to choose which audio track to load? int TrackNumber = FFMS_GetFirstTrackOfType(Index, FFMS_TYPE_VIDEO, FFMSErrorMessage, MessageSize); if (TrackNumber < 0) { - FFMS_DestroyFFIndex(Index); + FFMS_DestroyIndex(Index); Index = NULL; wxString temp(FFMSErrorMessage, wxConvUTF8); ErrorMsg << _T("Couldn't find any video tracks: ") << temp; @@ -156,7 +156,7 @@ void FFmpegSourceVideoProvider::LoadVideo(Aegisub::String filename, double fps) } VideoSource = FFMS_CreateVideoSource(FileNameWX.mb_str(wxConvLocal), TrackNumber, Index, "", Threads, SeekMode, FFMSErrorMessage, MessageSize); - FFMS_DestroyFFIndex(Index); + FFMS_DestroyIndex(Index); Index = NULL; if (VideoSource == NULL) { wxString temp(FFMSErrorMessage, wxConvUTF8);