mirror of https://github.com/odrling/Aegisub
s/wxString/Aegisub::String/ in many places.
Originally committed to SVN as r1967.
This commit is contained in:
parent
0c5d122cc5
commit
6246c3998d
|
@ -65,7 +65,7 @@ extern "C" {
|
|||
|
||||
///////////////
|
||||
// Constructor
|
||||
LAVCAudioProvider::LAVCAudioProvider(wxString _filename)
|
||||
LAVCAudioProvider::LAVCAudioProvider(Aegisub::String _filename)
|
||||
: lavcfile(NULL), codecContext(NULL), rsct(NULL), buffer(NULL)
|
||||
{
|
||||
try {
|
||||
|
|
|
@ -78,7 +78,7 @@ private:
|
|||
void Destroy();
|
||||
|
||||
public:
|
||||
LAVCAudioProvider(wxString _filename);
|
||||
LAVCAudioProvider(Aegisub::String _filename);
|
||||
virtual ~LAVCAudioProvider();
|
||||
virtual void GetAudio(void *buf, int64_t start, int64_t count);
|
||||
};
|
||||
|
@ -88,7 +88,7 @@ public:
|
|||
// Factory
|
||||
class LAVCAudioProviderFactory : public AudioProviderFactory {
|
||||
public:
|
||||
AudioProvider *CreateProvider(wxString file) { return new LAVCAudioProvider(file); }
|
||||
AudioProvider *CreateProvider(Aegisub::String file) { return new LAVCAudioProvider(file); }
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
|
||||
///////////////
|
||||
// Constructor
|
||||
LAVCKeyFrames::LAVCKeyFrames(const wxString& filename)
|
||||
LAVCKeyFrames::LAVCKeyFrames(const Aegisub::String& filename)
|
||||
: file(0), codecContext(0), codec(0), stream(0), frame(0),
|
||||
streamN(-1) {
|
||||
// Open LAVCFile
|
||||
|
|
|
@ -48,7 +48,7 @@ class LAVCKeyFrames {
|
|||
|
||||
int streamN; // Stream index
|
||||
public:
|
||||
LAVCKeyFrames(const wxString& filename);
|
||||
LAVCKeyFrames(const Aegisub::String& filename);
|
||||
~LAVCKeyFrames();
|
||||
wxArrayInt GetKeyFrames();
|
||||
};
|
||||
|
|
|
@ -89,7 +89,7 @@ private:
|
|||
int buffer2Size;
|
||||
|
||||
bool GetNextFrame();
|
||||
void LoadVideo(wxString filename, double fps);
|
||||
void LoadVideo(Aegisub::String filename, double fps);
|
||||
void Close();
|
||||
|
||||
protected:
|
||||
|
@ -117,7 +117,7 @@ public:
|
|||
// Factory
|
||||
class LAVCVideoProviderFactory : public VideoProviderFactory {
|
||||
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
|
||||
|
|
Loading…
Reference in New Issue