Make FileAccess and DirAccess classes reference counted.

2 files changed, 9 insertions, 21 deletions

diff --git a/modules/theora/video_stream_theora.cpp b/modules/theora/video_stream_theora.cpp
index 94f60a7d9d..441fc8edbd 100644
--- a/modules/theora/video_stream_theora.cpp
+++ b/modules/theora/video_stream_theora.cpp
@@ -114,7 +114,7 @@ void VideoStreamPlaybackTheora::video_write() {
 }
 
 void VideoStreamPlaybackTheora::clear() {
-	if (!file) {
+	if (file.is_null()) {
 		return;
 	}
 
@@ -152,10 +152,7 @@ void VideoStreamPlaybackTheora::clear() {
 	theora_eos = false;
 	vorbis_eos = false;
 
-	if (file) {
-		memdelete(file);
-	}
-	file = nullptr;
+	file = Ref<FileAccess>();
 	playing = false;
 };
 
@@ -165,11 +162,8 @@ void VideoStreamPlaybackTheora::set_file(const String &p_file) {
 	th_setup_info *ts = nullptr;
 
 	file_name = p_file;
-	if (file) {
-		memdelete(file);
-	}
 	file = FileAccess::open(p_file, FileAccess::READ);
-	ERR_FAIL_COND_MSG(!file, "Cannot open file '" + p_file + "'.");
+	ERR_FAIL_COND_MSG(file.is_null(), "Cannot open file '" + p_file + "'.");
 
 #ifdef THEORA_USE_THREAD_STREAMING
 	thread_exit = false;
@@ -375,7 +369,7 @@ Ref<Texture2D> VideoStreamPlaybackTheora::get_texture() const {
 }
 
 void VideoStreamPlaybackTheora::update(float p_delta) {
-	if (!file) {
+	if (file.is_null()) {
 		return;
 	}
 
@@ -506,9 +500,9 @@ void VideoStreamPlaybackTheora::update(float p_delta) {
 		}
 
 #ifdef THEORA_USE_THREAD_STREAMING
-		if (file && thread_eof && no_theora && theora_eos && ring_buffer.data_left() == 0) {
+		if (file.is_valid() && thread_eof && no_theora && theora_eos && ring_buffer.data_left() == 0) {
 #else
-		if (file && /*!videobuf_ready && */ no_theora && theora_eos) {
+		if (file.is_valid() && /*!videobuf_ready && */ no_theora && theora_eos) {
 #endif
 			//printf("video done, stopping\n");
 			stop();
@@ -664,10 +658,6 @@ VideoStreamPlaybackTheora::~VideoStreamPlaybackTheora() {
 	memdelete(thread_sem);
 #endif
 	clear();
-
-	if (file) {
-		memdelete(file);
-	}
 };
 
 void VideoStreamTheora::_bind_methods() {
@@ -680,8 +670,8 @@ void VideoStreamTheora::_bind_methods() {
 ////////////
 
 RES ResourceFormatLoaderTheora::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, CacheMode p_cache_mode) {
-	FileAccess *f = FileAccess::open(p_path, FileAccess::READ);
-	if (!f) {
+	Ref<FileAccess> f = FileAccess::open(p_path, FileAccess::READ);
+	if (f.is_null()) {
 		if (r_error) {
 			*r_error = ERR_CANT_OPEN;
 		}
@@ -697,8 +687,6 @@ RES ResourceFormatLoaderTheora::load(const String &p_path, const String &p_origi
 		*r_error = OK;
 	}
 
-	f->close();
-	memdelete(f);
 	return ogv_stream;
 }
 
diff --git a/modules/theora/video_stream_theora.h b/modules/theora/video_stream_theora.h
index b61412e665..6fa7313fad 100644
--- a/modules/theora/video_stream_theora.h
+++ b/modules/theora/video_stream_theora.h
@@ -56,7 +56,7 @@ class VideoStreamPlaybackTheora : public VideoStreamPlayback {
 	Image::Format format = Image::Format::FORMAT_L8;
 	Vector<uint8_t> frame_data;
 	int frames_pending = 0;
-	FileAccess *file = nullptr;
+	Ref<FileAccess> file;
 	String file_name;
 	int audio_frames_wrote = 0;
 	Point2i size;