fix compilation of the avs provider

Originally committed to SVN as r4694.

aegisub/src/mkv_wrap.cpp

@@ -123,7 +123,7 @@ void MatroskaWrapper::Close() {
 		file = NULL;
 		delete input;
 	}
-	keyFrames.Clear();
+	keyFrames.clear();
 	timecodes.clear();
 }
 
@@ -132,7 +132,7 @@ void MatroskaWrapper::Close() {
 /// @brief Return keyframes 
 /// @return 
 ///
-wxArrayInt MatroskaWrapper::GetKeyFrames() {
+std::vector<int> MatroskaWrapper::GetKeyFrames() {
 	return keyFrames;
 }
 
@@ -153,7 +153,7 @@ bool operator < (MkvFrame &t1, MkvFrame &t2) {
 ///
 void MatroskaWrapper::Parse() {
 	// Clear keyframes and timecodes
-	keyFrames.Clear();
+	keyFrames.clear();
 	bytePos.Clear();
 	timecodes.clear();
 	frames.clear();
@@ -230,7 +230,7 @@ void MatroskaWrapper::Parse() {
 		int i = 0;
 		for (std::list<MkvFrame>::iterator cur=frames.begin();cur!=frames.end();cur++) {
 			curFrame = *cur;
-			if (curFrame.isKey) keyFrames.Add(i);
+			if (curFrame.isKey) keyFrames.push_back(i);
 			bytePos.Add(curFrame.filePos);
 			timecodes.push_back(curFrame.time);
 			i++;
@@ -243,7 +243,7 @@ void MatroskaWrapper::Parse() {
 		int i = 0;
 		for (std::list<MkvFrame>::iterator cur=frames.begin();cur!=frames.end();cur++) {
 			curFrame = *cur;
-			if (curFrame.isKey) keyFrames.Add(i);
+			if (curFrame.isKey) keyFrames.push_back(i);
 			bytePos.Add(curFrame.filePos);
 			i++;
 		}

aegisub/src/mkv_wrap.h

@@ -117,7 +117,7 @@ class MatroskaWrapper {
 private:
 
 	/// DOCME
-	wxArrayInt keyFrames;
+	std::vector<int> keyFrames;
 
 	/// DOCME
 	std::vector<double> timecodes;
@@ -162,7 +162,7 @@ public:
 	/// @return 
 	///
 	unsigned int GetFrameCount() { return timecodes.size(); }
-	wxArrayInt GetKeyFrames();
+	std::vector<int> GetKeyFrames();
 	void GetSubtitles(AssFile *target);
 	static bool HasSubtitles(wxString const& filename);
 

aegisub/src/vfw_wrap.cpp

@@ -47,8 +47,8 @@
 /// @brief Get keyframe list 
 /// @param filename 
 ///
-wxArrayInt VFWWrapper::GetKeyFrames(wxString filename) {
-	wxArrayInt frames;
+std::vector<int> VFWWrapper::GetKeyFrames(wxString filename) {
+	std::vector<int> frames;
 
 #ifdef __WINDOWS__
 	// Init vfw
@@ -106,7 +106,7 @@ wxArrayInt VFWWrapper::GetKeyFrames(wxString filename) {
 	// Loop through stream
 	for (size_t i=0;i<frame_c;i++) {
 		if (AVIStreamIsKeyFrame(ppavi,(int)i)) {
-			frames.Add(i);
+			frames.push_back(i);
 		}
 	}
 

aegisub/src/vfw_wrap.h

@@ -39,7 +39,9 @@
 
 ///////////
 // Headers
-
+#ifndef AGI_PRE
+#include <vector>
+#endif
 
 
 /// DOCME
@@ -49,7 +51,7 @@
 /// DOCME
 class VFWWrapper {
 public:
-	static wxArrayInt GetKeyFrames(wxString filename);
+	static std::vector<int> GetKeyFrames(wxString filename);
 };