diff --git a/aegisub/audio_provider_lavc.cpp b/aegisub/audio_provider_lavc.cpp index ff28f0f8be042505b020bb56de0f5797bd6263af..8968439763379d212819bee467861b53b72f9f00 100644 --- a/aegisub/audio_provider_lavc.cpp +++ b/aegisub/audio_provider_lavc.cpp @@ -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 { diff --git a/aegisub/audio_provider_lavc.h b/aegisub/audio_provider_lavc.h index ac9b68870f6dc408ec7d02250d2b1ced7da9c611..942d2d28f6f2618556e3d4a1cad7e9c02ef178b0 100644 --- a/aegisub/audio_provider_lavc.h +++ b/aegisub/audio_provider_lavc.h @@ -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 diff --git a/aegisub/lavc_keyframes.cpp b/aegisub/lavc_keyframes.cpp index a963925e61b51aac39b700609e986c8ad064dfe7..bf9def605c1dd3336efcf58e69038ea02e26138e 100644 --- a/aegisub/lavc_keyframes.cpp +++ b/aegisub/lavc_keyframes.cpp @@ -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 diff --git a/aegisub/lavc_keyframes.h b/aegisub/lavc_keyframes.h index 03d3f8f8813f1b5c95658119825b7d1d4e2ad6bf..843eb3d771241e7f2d1d6b0b435dffea1539883c 100644 --- a/aegisub/lavc_keyframes.h +++ b/aegisub/lavc_keyframes.h @@ -48,7 +48,7 @@ class LAVCKeyFrames { int streamN; // Stream index public: - LAVCKeyFrames(const wxString& filename); + LAVCKeyFrames(const Aegisub::String& filename); ~LAVCKeyFrames(); wxArrayInt GetKeyFrames(); }; diff --git a/aegisub/video_provider_lavc.h b/aegisub/video_provider_lavc.h index 7e99f20f6bcc2b574b2fa5b516cd62bc2eeb4a1d..8bb8e7ce1fb74d546a1f8db238df7a727cf07eb2 100644 --- a/aegisub/video_provider_lavc.h +++ b/aegisub/video_provider_lavc.h @@ -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