From c170f7f09689c130286566d38c8deed6bf386c9a Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Thu, 23 Jul 2009 05:32:13 +0000 Subject: [PATCH] c_str() -> wc_str() in preperation for wx2.9, these changes are required for Unix, should be harmless on Windows. Originally committed to SVN as r3214. --- aegisub/src/audio_provider_ffmpegsource.cpp | 2 +- aegisub/src/video_provider_ffmpegsource.cpp | 2 +- aegisub/src/video_provider_yuv4mpeg.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/aegisub/src/audio_provider_ffmpegsource.cpp b/aegisub/src/audio_provider_ffmpegsource.cpp index 6b871175d..adf8423d2 100644 --- a/aegisub/src/audio_provider_ffmpegsource.cpp +++ b/aegisub/src/audio_provider_ffmpegsource.cpp @@ -82,7 +82,7 @@ void FFmpegSourceAudioProvider::LoadAudio(Aegisub::String filename) { // clean up Close(); - wxString FileNameWX = wxFileName(wxString(filename.c_str(), wxConvFile)).GetShortPath(); + wxString FileNameWX = wxFileName(wxString(filename.wc_str(), wxConvFile)).GetShortPath(); FFIndexer *Indexer = FFMS_CreateIndexer(FileNameWX.mb_str(wxConvUTF8), FFMSErrMsg, MsgSize); if (Indexer == NULL) { diff --git a/aegisub/src/video_provider_ffmpegsource.cpp b/aegisub/src/video_provider_ffmpegsource.cpp index 56bb9beec..c0677f7e3 100644 --- a/aegisub/src/video_provider_ffmpegsource.cpp +++ b/aegisub/src/video_provider_ffmpegsource.cpp @@ -100,7 +100,7 @@ void FFmpegSourceVideoProvider::LoadVideo(Aegisub::String filename) { // make sure we don't have anything messy lying around Close(); - wxString FileNameWX = wxFileName(wxString(filename.c_str(), wxConvFile)).GetShortPath(); + wxString FileNameWX = wxFileName(wxString(filename.wc_str(), wxConvFile)).GetShortPath(); FFIndexer *Indexer = FFMS_CreateIndexer(FileNameWX.mb_str(wxConvUTF8), FFMSErrMsg, MsgSize); if (Indexer == NULL) { diff --git a/aegisub/src/video_provider_yuv4mpeg.cpp b/aegisub/src/video_provider_yuv4mpeg.cpp index 79af2f648..a45d36c03 100644 --- a/aegisub/src/video_provider_yuv4mpeg.cpp +++ b/aegisub/src/video_provider_yuv4mpeg.cpp @@ -85,7 +85,7 @@ YUV4MPEGVideoProvider::~YUV4MPEGVideoProvider() { void YUV4MPEGVideoProvider::LoadVideo(const Aegisub::String _filename) { Close(); - wxString filename = wxFileName(wxString(_filename.c_str(), wxConvFile)).GetShortPath(); + wxString filename = wxFileName(wxString(_filename.wc_str(), wxConvFile)).GetShortPath(); #ifdef WIN32 sf = _wfopen(filename.wc_str(), _T("rb"));