mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Fixed compilation with wxWidgets 2.9.0 again plus removed some unneeded #if's (wc_str is the same as c_str under 2.8)

Browse source 
Originally committed to SVN as r3191.
This commit is contained in:
harukalover 2009-07-22 19:52:59 +00:00
parent ff8c8e1817
commit ac33243a49
3 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
aegisub/src/audio_provider.cpp
View file

@ -229,11 +229,7 @@ AudioProvider *AudioProviderFactoryManager::GetAudioProvider(wxString filename,
wxString error; wxString error;
for (unsigned int i=0;i<list.Count();i++) { for (unsigned int i=0;i<list.Count();i++) {
try { try {
#if wxCHECK_VERSION(2,9,0)
AudioProvider *prov = GetFactory(list[i])->CreateProvider(filename.wc_str()); AudioProvider *prov = GetFactory(list[i])->CreateProvider(filename.wc_str());
#else
AudioProvider *prov = GetFactory(list[i])->CreateProvider(filename.c_str());
#endif
if (prov) { if (prov) {
provider = prov; provider = prov;
break; break;

4
aegisub/src/ffmpegsource_common.cpp
View file

@ -166,11 +166,7 @@ wxString FFmpegSourceProvider::GetCacheFilename(const wxString& filename)
md5_state_t state; md5_state_t state;
md5_byte_t digest[16]; md5_byte_t digest[16];
md5_init(&state); md5_init(&state);
#if wxCHECK_VERSION(2,9,0)
md5_append(&state,(md5_byte_t*)toHash.wc_str(),toHash.Length()*sizeof(wxChar)); md5_append(&state,(md5_byte_t*)toHash.wc_str(),toHash.Length()*sizeof(wxChar));
#else
md5_append(&state,(md5_byte_t*)toHash.c_str(),toHash.Length()*sizeof(wxChar));
#endif
md5_finish(&state,digest); md5_finish(&state,digest);
// Generate the filename // Generate the filename

10
aegisub/src/video_provider_manager.cpp
View file

@ -64,15 +64,11 @@
VideoProvider *VideoProviderFactoryManager::GetProvider(wxString video) { VideoProvider *VideoProviderFactoryManager::GetProvider(wxString video) {
// First check special case of dummy video // First check special case of dummy video
if (video.StartsWith(_T("?dummy:"))) { if (video.StartsWith(_T("?dummy:"))) {
#if wxCHECK_VERSION(2,9,0)
return new DummyVideoProvider(video.wc_str()); return new DummyVideoProvider(video.wc_str());
#else
return new DummyVideoProvider(video.c_str());
#endif
} }
try { try {
VideoProvider *y4m_provider = new YUV4MPEGVideoProvider(video.c_str()); VideoProvider *y4m_provider = new YUV4MPEGVideoProvider(video.wc_str());
if (y4m_provider) if (y4m_provider)
y4m_provider = new VideoProviderCache(y4m_provider); y4m_provider = new VideoProviderCache(y4m_provider);
return y4m_provider; return y4m_provider;
@ -95,11 +91,7 @@ VideoProvider *VideoProviderFactoryManager::GetProvider(wxString video) {
for (unsigned int i=0;i<list.Count();i++) { for (unsigned int i=0;i<list.Count();i++) {
try { try {
// Create provider // Create provider
#if wxCHECK_VERSION(2,9,0)
VideoProvider *provider = GetFactory(list[i])->CreateProvider(video.wc_str()); VideoProvider *provider = GetFactory(list[i])->CreateProvider(video.wc_str());
#else
VideoProvider *provider = GetFactory(list[i])->CreateProvider(video.c_str());
#endif
if (provider) { if (provider) {
// Cache if necessary // Cache if necessary
if (provider->GetDesiredCacheSize()) { if (provider->GetDesiredCacheSize()) {