iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
Amar Takhar 2009-07-23 05:32:13 +00:00
parent b127105f42
commit c170f7f096
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aegisub/src/audio_provider_ffmpegsource.cpp
View File

@ -82,7 +82,7 @@ void FFmpegSourceAudioProvider::LoadAudio(Aegisub::String filename) {
// clean up // clean up
Close(); 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); FFIndexer *Indexer = FFMS_CreateIndexer(FileNameWX.mb_str(wxConvUTF8), FFMSErrMsg, MsgSize);
if (Indexer == NULL) { if (Indexer == NULL) {

2
aegisub/src/video_provider_ffmpegsource.cpp
View File

@ -100,7 +100,7 @@ void FFmpegSourceVideoProvider::LoadVideo(Aegisub::String filename) {
// make sure we don't have anything messy lying around // make sure we don't have anything messy lying around
Close(); 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); FFIndexer *Indexer = FFMS_CreateIndexer(FileNameWX.mb_str(wxConvUTF8), FFMSErrMsg, MsgSize);
if (Indexer == NULL) { if (Indexer == NULL) {

2
aegisub/src/video_provider_yuv4mpeg.cpp
View File

@ -85,7 +85,7 @@ YUV4MPEGVideoProvider::~YUV4MPEGVideoProvider() {
void YUV4MPEGVideoProvider::LoadVideo(const Aegisub::String _filename) { void YUV4MPEGVideoProvider::LoadVideo(const Aegisub::String _filename) {
Close(); Close();
wxString filename = wxFileName(wxString(_filename.c_str(), wxConvFile)).GetShortPath(); wxString filename = wxFileName(wxString(_filename.wc_str(), wxConvFile)).GetShortPath();
#ifdef WIN32 #ifdef WIN32
sf = _wfopen(filename.wc_str(), _T("rb")); sf = _wfopen(filename.wc_str(), _T("rb"));