More s/wxString/Aegisub::String/ changes.
Originally committed to SVN as r1972.
This commit is contained in:
parent
96616bf79c
commit
ea8d16dabe
4 changed files with 5 additions and 5 deletions
|
@ -824,7 +824,7 @@ void AudioDisplay::SetScale(float _scale) {
|
|||
|
||||
//////////////////
|
||||
// Load from file
|
||||
void AudioDisplay::SetFile(wxString file) {
|
||||
void AudioDisplay::SetFile(Aegisub::String file) {
|
||||
wxLogDebug(_T("AudioDisplay::SetFile(file=%s)"), file.c_str());
|
||||
// Unload
|
||||
if (file.IsEmpty()) try {
|
||||
|
|
|
@ -165,7 +165,7 @@ public:
|
|||
void CommitChanges(bool nextLine=false);
|
||||
void AddLead(bool in,bool out);
|
||||
|
||||
void SetFile(wxString file);
|
||||
void SetFile(Aegisub::String file);
|
||||
void SetFromVideo();
|
||||
void Reload();
|
||||
|
||||
|
|
|
@ -191,7 +191,7 @@ void AudioProvider::GetAudioWithVolume(void *buf, int64_t start, int64_t count,
|
|||
|
||||
////////////////
|
||||
// Get provider
|
||||
AudioProvider *AudioProviderFactoryManager::GetAudioProvider(wxString filename, int cache) {
|
||||
AudioProvider *AudioProviderFactoryManager::GetAudioProvider(Aegisub::String filename, int cache) {
|
||||
// Prepare provider
|
||||
AudioProvider *provider = NULL;
|
||||
|
||||
|
|
|
@ -50,5 +50,5 @@
|
|||
class AudioProviderFactoryManager : public FactoryManager<AudioProviderFactory> {
|
||||
public:
|
||||
static void RegisterProviders();
|
||||
static AudioProvider *GetAudioProvider(wxString filename, int cache=-1);
|
||||
static AudioProvider *GetAudioProvider(Aegisub::String filename, int cache=-1);
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue