From 822797118636c98c9d969299ec25601b51df2a55 Mon Sep 17 00:00:00 2001
From: Rodrigo Braz Monteiro <zeratul@cellosoft.com>
Date: Sat, 8 Mar 2008 18:13:42 +0000
Subject: [PATCH] Another battle in the String Hell War

Originally committed to SVN as r1974.
---
 aegisub/audio_provider.cpp                 |  2 +-
 aegisub/audio_provider_avs.cpp             |  4 +-
 aegisub/audio_provider_avs.h               |  4 +-
 aegisub/include/aegisub/audio_provider.h   |  2 +-
 build/aegisub_vs2005/aegisub_vs2005.vcproj | 60 ++++++++++++++++++++--
 5 files changed, 62 insertions(+), 10 deletions(-)

diff --git a/aegisub/audio_provider.cpp b/aegisub/audio_provider.cpp
index c70261499..161848fde 100644
--- a/aegisub/audio_provider.cpp
+++ b/aegisub/audio_provider.cpp
@@ -212,7 +212,7 @@ AudioProvider *AudioProviderFactoryManager::GetAudioProvider(wxString filename,
 	wxString error;
 	for (unsigned int i=0;i<list.Count();i++) {
 		try {
-			AudioProvider *prov = GetFactory(list[i])->CreateProvider(filename);
+			AudioProvider *prov = GetFactory(list[i])->CreateProvider(filename.c_str());
 			if (prov) {
 				provider = prov;
 				break;
diff --git a/aegisub/audio_provider_avs.cpp b/aegisub/audio_provider_avs.cpp
index fb35856ab..5faa5c16b 100644
--- a/aegisub/audio_provider_avs.cpp
+++ b/aegisub/audio_provider_avs.cpp
@@ -49,8 +49,8 @@
 
 //////////////
 // Constructor
-AvisynthAudioProvider::AvisynthAudioProvider(wxString _filename) {
-	filename = _filename;
+AvisynthAudioProvider::AvisynthAudioProvider(Aegisub::String _filename) {
+	filename = _filename.c_str();
 
 	try {
 		OpenAVSAudio();
diff --git a/aegisub/audio_provider_avs.h b/aegisub/audio_provider_avs.h
index dcc59096d..eb406dc59 100644
--- a/aegisub/audio_provider_avs.h
+++ b/aegisub/audio_provider_avs.h
@@ -56,7 +56,7 @@ private:
 	void Unload();
 
 public:
-	AvisynthAudioProvider(wxString _filename);
+	AvisynthAudioProvider(Aegisub::String _filename);
 	~AvisynthAudioProvider();
 
 	wxString GetFilename();
@@ -70,7 +70,7 @@ public:
 // Factory
 class AvisynthAudioProviderFactory : public AudioProviderFactory {
 public:
-	AudioProvider *CreateProvider(wxString file) { return new AvisynthAudioProvider(file); }
+	AudioProvider *CreateProvider(Aegisub::String file) { return new AvisynthAudioProvider(file); }
 };
 
 #endif
diff --git a/aegisub/include/aegisub/audio_provider.h b/aegisub/include/aegisub/audio_provider.h
index 50d960362..98fa820dc 100644
--- a/aegisub/include/aegisub/audio_provider.h
+++ b/aegisub/include/aegisub/audio_provider.h
@@ -83,5 +83,5 @@ public:
 // Factory
 class AudioProviderFactory {
 public:
-	virtual AudioProvider *CreateProvider(wxString filename)=0;
+	virtual AudioProvider *CreateProvider(Aegisub::String filename)=0;
 };
diff --git a/build/aegisub_vs2005/aegisub_vs2005.vcproj b/build/aegisub_vs2005/aegisub_vs2005.vcproj
index fae1132e3..1c2368239 100644
--- a/build/aegisub_vs2005/aegisub_vs2005.vcproj
+++ b/build/aegisub_vs2005/aegisub_vs2005.vcproj
@@ -492,39 +492,59 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_player.h"
+				RelativePath="..\..\aegisub\audio_player_alsa.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_player_alsa.cpp"
+				RelativePath="..\..\aegisub\audio_player_alsa.h"
 				>
 			</File>
 			<File
 				RelativePath="..\..\aegisub\audio_player_dsound.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\aegisub\audio_player_dsound.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\aegisub\audio_player_manager.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\aegisub\audio_player_openal.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\aegisub\audio_player_openal.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\aegisub\audio_player_portaudio.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\aegisub\audio_player_portaudio.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\aegisub\audio_player_pulse.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\aegisub\audio_player_pulse.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\aegisub\audio_provider.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_provider.h"
+				RelativePath="..\..\aegisub\audio_provider_avs.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_provider_avs.cpp"
+				RelativePath="..\..\aegisub\audio_provider_avs.h"
 				>
 			</File>
 			<File
@@ -555,6 +575,10 @@
 				RelativePath="..\..\aegisub\audio_provider_lavc.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\aegisub\audio_provider_lavc.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\aegisub\audio_provider_pcm.cpp"
 				>
@@ -1864,6 +1888,34 @@
 				</File>
 			</Filter>
 		</Filter>
+		<Filter
+			Name="Include"
+			>
+			<File
+				RelativePath="..\..\aegisub\include\aegisub\aegisub.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\aegisub\include\aegisub\audio_player.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\aegisub\include\aegisub\audio_provider.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\aegisub\include\aegisub\spellchecker.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\aegisub\include\aegisub\subtitles_provider.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\aegisub\include\aegisub\video_provider.h"
+				>
+			</File>
+		</Filter>
 		<File
 			RelativePath="..\..\aegisub\changelog.txt"
 			>