s/wxString/Aegisub::String/ in many places.

Originally committed to SVN as r1967.
This commit is contained in:
Amar Takhar 2008-03-08 04:27:41 +00:00
parent 0c5d122cc5
commit 6246c3998d
5 changed files with 7 additions and 7 deletions

View file

@ -65,7 +65,7 @@ extern "C" {
/////////////// ///////////////
// Constructor // Constructor
LAVCAudioProvider::LAVCAudioProvider(wxString _filename) LAVCAudioProvider::LAVCAudioProvider(Aegisub::String _filename)
: lavcfile(NULL), codecContext(NULL), rsct(NULL), buffer(NULL) : lavcfile(NULL), codecContext(NULL), rsct(NULL), buffer(NULL)
{ {
try { try {

View file

@ -78,7 +78,7 @@ private:
void Destroy(); void Destroy();
public: public:
LAVCAudioProvider(wxString _filename); LAVCAudioProvider(Aegisub::String _filename);
virtual ~LAVCAudioProvider(); virtual ~LAVCAudioProvider();
virtual void GetAudio(void *buf, int64_t start, int64_t count); virtual void GetAudio(void *buf, int64_t start, int64_t count);
}; };
@ -88,7 +88,7 @@ public:
// Factory // Factory
class LAVCAudioProviderFactory : public AudioProviderFactory { class LAVCAudioProviderFactory : public AudioProviderFactory {
public: public:
AudioProvider *CreateProvider(wxString file) { return new LAVCAudioProvider(file); } AudioProvider *CreateProvider(Aegisub::String file) { return new LAVCAudioProvider(file); }
}; };
#endif #endif

View file

@ -43,7 +43,7 @@
/////////////// ///////////////
// Constructor // Constructor
LAVCKeyFrames::LAVCKeyFrames(const wxString& filename) LAVCKeyFrames::LAVCKeyFrames(const Aegisub::String& filename)
: file(0), codecContext(0), codec(0), stream(0), frame(0), : file(0), codecContext(0), codec(0), stream(0), frame(0),
streamN(-1) { streamN(-1) {
// Open LAVCFile // Open LAVCFile

View file

@ -48,7 +48,7 @@ class LAVCKeyFrames {
int streamN; // Stream index int streamN; // Stream index
public: public:
LAVCKeyFrames(const wxString& filename); LAVCKeyFrames(const Aegisub::String& filename);
~LAVCKeyFrames(); ~LAVCKeyFrames();
wxArrayInt GetKeyFrames(); wxArrayInt GetKeyFrames();
}; };

View file

@ -89,7 +89,7 @@ private:
int buffer2Size; int buffer2Size;
bool GetNextFrame(); bool GetNextFrame();
void LoadVideo(wxString filename, double fps); void LoadVideo(Aegisub::String filename, double fps);
void Close(); void Close();
protected: protected:
@ -117,7 +117,7 @@ public:
// Factory // Factory
class LAVCVideoProviderFactory : public VideoProviderFactory { class LAVCVideoProviderFactory : public VideoProviderFactory {
public: public:
VideoProvider *CreateProvider(wxString video,double fps=0.0) { return new LAVCVideoProvider(video,fps); } VideoProvider *CreateProvider(Aegisub::String video,double fps=0.0) { return new LAVCVideoProvider(video,fps); }
}; };
#endif #endif