From 045f60da3545424327bbb2497ee308b5279ce86b Mon Sep 17 00:00:00 2001
From: Rodrigo Braz Monteiro <zeratul@cellosoft.com>
Date: Sat, 8 Mar 2008 18:04:51 +0000
Subject: [PATCH] Reverted last commit.
Originally committed to SVN as r1973.
---
aegisub/audio_display.cpp | 4 ++--
aegisub/audio_display.h | 2 +-
aegisub/audio_provider.cpp | 2 +-
aegisub/audio_provider_manager.h | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/aegisub/audio_display.cpp b/aegisub/audio_display.cpp
index eeabf9f83..714f6da6a 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 21e5f4cad..4e9234732 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 2385bca64..c70261499 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 d7f5c4dd7..a5f93f7b3 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);
};
--
GitLab