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

Reverted last commit. 

Originally committed to SVN as r1973.
This commit is contained in:
Rodrigo Braz Monteiro 2008-03-08 18:04:51 +00:00
parent ea8d16dabe
commit 045f60da35
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
aegisub/audio_display.cpp
View File

@ -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);
}
}

2
aegisub/audio_display.h
View File

@ -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();

2
aegisub/audio_provider.cpp
View File

@ -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;

2
aegisub/audio_provider_manager.h
View File

@ -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);
};