mirror of https://github.com/odrling/Aegisub
Another battle in the String Hell War
Originally committed to SVN as r1974.
This commit is contained in:
parent
045f60da35
commit
8227971186
|
@ -212,7 +212,7 @@ AudioProvider *AudioProviderFactoryManager::GetAudioProvider(wxString filename,
|
||||||
wxString error;
|
wxString error;
|
||||||
for (unsigned int i=0;i<list.Count();i++) {
|
for (unsigned int i=0;i<list.Count();i++) {
|
||||||
try {
|
try {
|
||||||
AudioProvider *prov = GetFactory(list[i])->CreateProvider(filename);
|
AudioProvider *prov = GetFactory(list[i])->CreateProvider(filename.c_str());
|
||||||
if (prov) {
|
if (prov) {
|
||||||
provider = prov;
|
provider = prov;
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -49,8 +49,8 @@
|
||||||
|
|
||||||
//////////////
|
//////////////
|
||||||
// Constructor
|
// Constructor
|
||||||
AvisynthAudioProvider::AvisynthAudioProvider(wxString _filename) {
|
AvisynthAudioProvider::AvisynthAudioProvider(Aegisub::String _filename) {
|
||||||
filename = _filename;
|
filename = _filename.c_str();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
OpenAVSAudio();
|
OpenAVSAudio();
|
||||||
|
|
|
@ -56,7 +56,7 @@ private:
|
||||||
void Unload();
|
void Unload();
|
||||||
|
|
||||||
public:
|
public:
|
||||||
AvisynthAudioProvider(wxString _filename);
|
AvisynthAudioProvider(Aegisub::String _filename);
|
||||||
~AvisynthAudioProvider();
|
~AvisynthAudioProvider();
|
||||||
|
|
||||||
wxString GetFilename();
|
wxString GetFilename();
|
||||||
|
@ -70,7 +70,7 @@ public:
|
||||||
// Factory
|
// Factory
|
||||||
class AvisynthAudioProviderFactory : public AudioProviderFactory {
|
class AvisynthAudioProviderFactory : public AudioProviderFactory {
|
||||||
public:
|
public:
|
||||||
AudioProvider *CreateProvider(wxString file) { return new AvisynthAudioProvider(file); }
|
AudioProvider *CreateProvider(Aegisub::String file) { return new AvisynthAudioProvider(file); }
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -83,5 +83,5 @@ public:
|
||||||
// Factory
|
// Factory
|
||||||
class AudioProviderFactory {
|
class AudioProviderFactory {
|
||||||
public:
|
public:
|
||||||
virtual AudioProvider *CreateProvider(wxString filename)=0;
|
virtual AudioProvider *CreateProvider(Aegisub::String filename)=0;
|
||||||
};
|
};
|
||||||
|
|
|
@ -492,39 +492,59 @@
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\..\aegisub\audio_player.h"
|
RelativePath="..\..\aegisub\audio_player_alsa.cpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\..\aegisub\audio_player_alsa.cpp"
|
RelativePath="..\..\aegisub\audio_player_alsa.h"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\..\aegisub\audio_player_dsound.cpp"
|
RelativePath="..\..\aegisub\audio_player_dsound.cpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\..\aegisub\audio_player_dsound.h"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\..\aegisub\audio_player_manager.h"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\..\aegisub\audio_player_openal.cpp"
|
RelativePath="..\..\aegisub\audio_player_openal.cpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\..\aegisub\audio_player_openal.h"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\..\aegisub\audio_player_portaudio.cpp"
|
RelativePath="..\..\aegisub\audio_player_portaudio.cpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\..\aegisub\audio_player_portaudio.h"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\..\aegisub\audio_player_pulse.cpp"
|
RelativePath="..\..\aegisub\audio_player_pulse.cpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\..\aegisub\audio_player_pulse.h"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\..\aegisub\audio_provider.cpp"
|
RelativePath="..\..\aegisub\audio_provider.cpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\..\aegisub\audio_provider.h"
|
RelativePath="..\..\aegisub\audio_provider_avs.cpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\..\aegisub\audio_provider_avs.cpp"
|
RelativePath="..\..\aegisub\audio_provider_avs.h"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
|
@ -555,6 +575,10 @@
|
||||||
RelativePath="..\..\aegisub\audio_provider_lavc.cpp"
|
RelativePath="..\..\aegisub\audio_provider_lavc.cpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\..\aegisub\audio_provider_lavc.h"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\..\aegisub\audio_provider_pcm.cpp"
|
RelativePath="..\..\aegisub\audio_provider_pcm.cpp"
|
||||||
>
|
>
|
||||||
|
@ -1864,6 +1888,34 @@
|
||||||
</File>
|
</File>
|
||||||
</Filter>
|
</Filter>
|
||||||
</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
|
<File
|
||||||
RelativePath="..\..\aegisub\changelog.txt"
|
RelativePath="..\..\aegisub\changelog.txt"
|
||||||
>
|
>
|
||||||
|
|
Loading…
Reference in New Issue