- added a few more FileRdr replacements

- fixed: The streaming music player must return the file reader if it fails to open, so that the next player can still use it.
- fixed: Timidity++'s Instruments class did not delete the sound font when it was destroyed.

..-

src/d_dehacked.cpp

@@ -2492,11 +2492,11 @@ bool D_LoadDehLump(int lumpnum)
 
 bool D_LoadDehFile(const char *patchfile)
 {
-	FileReader fr;
+	FileRdr fr;
 
-	if (fr.Open(patchfile))
+	if (fr.OpenFile(patchfile))
 	{
-		PatchSize = fr.GetLength();
+		PatchSize = (int)fr.GetLength();
 
 		PatchName = copystring(patchfile);
 		PatchFile = new char[PatchSize + 1];

src/g_game.cpp

@@ -2801,8 +2801,8 @@ void G_DoPlayDemo (void)
 	{
 		FixPathSeperator (defdemoname);
 		DefaultExtension (defdemoname, ".lmp");
-		FileReader fr;
+		FileRdr fr;
-		if (!fr.Open(defdemoname))
+		if (!fr.OpenFile(defdemoname))
 		{
 			I_Error("Unable to open demo '%s'", defdemoname.GetChars());
 		}

src/m_misc.cpp

@@ -121,15 +121,15 @@ void M_FindResponseFile (void)
 			if (added_stuff < limit)
 			{
 				// READ THE RESPONSE FILE INTO MEMORY
-				FileReader fr;
+				FileRdr fr;
-				if (!fr.Open(Args->GetArg(i) + 1))
+				if (!fr.OpenFile(Args->GetArg(i) + 1))
 				{ // [RH] Make this a warning, not an error.
 					Printf ("No such response file (%s)!\n", Args->GetArg(i) + 1);
 				}
 				else
 				{
 					Printf ("Found response file %s!\n", Args->GetArg(i) + 1);
-					size = fr.GetLength();
+					size = (int)fr.GetLength();
 					file = new char[size+1];
 					fr.Read (file, size);
 					file[size] = 0;

src/sc_man.cpp

@@ -248,8 +248,8 @@ bool FScanner::OpenFile (const char *name)
 {
 	Close ();
 
-	FileReader fr;
+	FileRdr fr;
-	if (!fr.Open(name)) return false;
+	if (!fr.OpenFile(name)) return false;
 	auto filesize = fr.GetLength();
 	auto filebuf = new uint8_t[filesize];
 	if (fr.Read(filebuf, filesize) != filesize)

src/sound/i_soundfont.cpp

@@ -291,8 +291,8 @@ void FSoundFontManager::ProcessOneFile(const FString &fn)
 		if (!sfi.mName.CompareNoCase(fb)) return;
 	}
 	
-	FileReader fr;
+	FileRdr fr;
-	if (fr.Open(fn))
+	if (fr.OpenFile(fn))
 	{
 		// Try to identify. We only accept .sf2 and .zip by content. All other archives are intentionally ignored.
 		char head[16] = { 0};
@@ -433,8 +433,8 @@ FSoundFontReader *FSoundFontManager::OpenSoundFont(const char *name, int allowed
 	// Next check if the file is a .sf file
 	if (allowed & SF_SF2)
 	{
-		FileReader fr;
+		FileRdr fr;
-		if (fr.Open(name))
+		if (fr.OpenFile(name))
 		{
 			char head[16] = { 0};
 			fr.Read(head, 16);
@@ -447,8 +447,8 @@ FSoundFontReader *FSoundFontManager::OpenSoundFont(const char *name, int allowed
 	}
 	if (allowed & SF_GUS)
 	{
-		FileReader fr;
+		FileRdr fr;
-		if (fr.Open(name))
+		if (fr.OpenFile(name))
 		{
 			char head[16] = { 0 };
 			fr.Read(head, 2);

src/sound/mpg123_decoder.cpp

@@ -145,7 +145,8 @@ bool MPG123Decoder::open(FileRdr &reader)
         MPG123 = 0;
     }
 
-    return false;
+	reader = std::move(Reader);	// need to give it back.
+	return false;
 }
 
 void MPG123Decoder::getInfo(int *samplerate, ChannelConfig *chans, SampleType *type)

src/sound/sndfile_decoder.cpp

@@ -127,7 +127,8 @@ bool SndFileDecoder::open(FileRdr &reader)
 		sf_close(SndFile);
 		SndFile = 0;
 	}
-    return false;
+	reader = std::move(Reader);	// need to give it back.
+	return false;
 }
 
 void SndFileDecoder::getInfo(int *samplerate, ChannelConfig *chans, SampleType *type)

src/sound/timiditypp/instrum.cpp

@@ -75,6 +75,8 @@ Instruments::~Instruments()
 
 	free_tone_bank();
 	free_instrument_map();
+
+	if (sfreader != nullptr) delete sfreader;
 }
 
 void Instruments::free_instrument(Instrument *ip)

src/textures/buildtexture.cpp

@@ -306,14 +306,14 @@ int FTextureManager::CountBuildTiles ()
 			FString artpath = rffpath;
 			artpath += artfile;
 
-			FileReader fr;
+			FileRdr fr;
 
-			if (!fr.Open(artpath))
+			if (!fr.OpenFile(artpath))
 			{
 				break;
 			}
 
-			long len = fr.GetLength();
+			auto len = fr.GetLength();
 			uint8_t *art = new uint8_t[len];
 			if (fr.Read (art, len) != len || (numtiles = CountTiles(art)) == 0)
 			{