diff --git a/aegisub/audio_display.cpp b/aegisub/audio_display.cpp index eeabf9f83a37924d6084b16b38fb8c77c91d5615..714f6da6a051b198faad8b976c664b76bb96adbb 100644 --- a/aegisub/audio_display.cpp +++ b/aegisub/audio_display.cpp @@ -824,7 +824,7 @@ void AudioDisplay::SetScale(float _scale) { ////////////////// // Load from file -void AudioDisplay::SetFile(Aegisub::String file) { +void AudioDisplay::SetFile(wxString file) { wxLogDebug(_T("AudioDisplay::SetFile(file=%s)"), file.c_str()); // Unload if (file.IsEmpty()) try { @@ -2362,4 +2362,4 @@ void AudioDisplay::UpdateTimeEditCtrls() { grid->editBox->StartTime->SetTime(curStartMS,true); grid->editBox->EndTime->SetTime(curEndMS,true); grid->editBox->Duration->SetTime(curEndMS-curStartMS,true); -} +} \ No newline at end of file diff --git a/aegisub/audio_display.h b/aegisub/audio_display.h index 21e5f4cadabb00ed3ddefbfff7979ea6d855b5e9..4e9234732e28022dfbd0781fe2102b85b548eeb1 100644 --- a/aegisub/audio_display.h +++ b/aegisub/audio_display.h @@ -165,7 +165,7 @@ public: void CommitChanges(bool nextLine=false); void AddLead(bool in,bool out); - void SetFile(Aegisub::String file); + void SetFile(wxString file); void SetFromVideo(); void Reload(); diff --git a/aegisub/audio_provider.cpp b/aegisub/audio_provider.cpp index 2385bca64e1d270518cd60884bf9eb5546ee6f3d..c702614993d9ab578a4c1022118bbfd32521a66e 100644 --- a/aegisub/audio_provider.cpp +++ b/aegisub/audio_provider.cpp @@ -191,7 +191,7 @@ void AudioProvider::GetAudioWithVolume(void *buf, int64_t start, int64_t count, //////////////// // Get provider -AudioProvider *AudioProviderFactoryManager::GetAudioProvider(Aegisub::String filename, int cache) { +AudioProvider *AudioProviderFactoryManager::GetAudioProvider(wxString filename, int cache) { // Prepare provider AudioProvider *provider = NULL; diff --git a/aegisub/audio_provider_manager.h b/aegisub/audio_provider_manager.h index d7f5c4dd76ae452718cb4779e467ab8c49588726..a5f93f7b3887a90ad678490e030b409d336ba700 100644 --- a/aegisub/audio_provider_manager.h +++ b/aegisub/audio_provider_manager.h @@ -50,5 +50,5 @@ class AudioProviderFactoryManager : public FactoryManager<AudioProviderFactory> { public: static void RegisterProviders(); - static AudioProvider *GetAudioProvider(Aegisub::String filename, int cache=-1); + static AudioProvider *GetAudioProvider(wxString filename, int cache=-1); };