Skip to content
Extraits de code Groupes Projets
Valider 82279711 rédigé par Rodrigo Braz Monteiro's avatar Rodrigo Braz Monteiro
Parcourir les fichiers

Another battle in the String Hell War

Originally committed to SVN as r1974.
parent 045f60da
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -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;
......
......@@ -49,8 +49,8 @@
//////////////
// Constructor
AvisynthAudioProvider::AvisynthAudioProvider(wxString _filename) {
filename = _filename;
AvisynthAudioProvider::AvisynthAudioProvider(Aegisub::String _filename) {
filename = _filename.c_str();
try {
OpenAVSAudio();
......
......@@ -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
......@@ -83,5 +83,5 @@ public:
// Factory
class AudioProviderFactory {
public:
virtual AudioProvider *CreateProvider(wxString filename)=0;
virtual AudioProvider *CreateProvider(Aegisub::String filename)=0;
};
......@@ -492,41 +492,61 @@
>
</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_provider.cpp"
RelativePath="..\..\aegisub\audio_player_pulse.h"
>
</File>
<File
RelativePath="..\..\aegisub\audio_provider.h"
RelativePath="..\..\aegisub\audio_provider.cpp"
>
</File>
<File
RelativePath="..\..\aegisub\audio_provider_avs.cpp"
>
</File>
<File
RelativePath="..\..\aegisub\audio_provider_avs.h"
>
</File>
<File
RelativePath="..\..\aegisub\audio_provider_convert.cpp"
>
......@@ -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"
>
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter