[OMPT-svn-commit] SF.net SVN: modplug:[2436] trunk/OpenMPT

[<sag...@us...>]

Revision: 2436
          http://sourceforge.net/p/modplug/code/2436
Author:   saga-games
Date:     2013-06-29 00:07:03 +0000 (Sat, 29 Jun 2013)
Log Message:
-----------
[Ref] Make CMappedFile true RAII style (put Close() in ~CMappedFile)

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Ctrl_ins.cpp
    trunk/OpenMPT/mptrack/Ctrl_smp.cpp
    trunk/OpenMPT/mptrack/MainFrm.cpp
    trunk/OpenMPT/mptrack/Moddoc.cpp
    trunk/OpenMPT/mptrack/Mptrack.cpp
    trunk/OpenMPT/mptrack/View_tre.cpp
    trunk/OpenMPT/mptrack/Vstplug.cpp
    trunk/OpenMPT/soundlib/Dlsbank.cpp
    trunk/OpenMPT/soundlib/Load_itp.cpp

Modified: trunk/OpenMPT/mptrack/Ctrl_ins.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_ins.cpp	2013-06-28 21:49:19 UTC (rev 2435)
+++ trunk/OpenMPT/mptrack/Ctrl_ins.cpp	2013-06-29 00:07:03 UTC (rev 2436)
@@ -1429,11 +1429,8 @@
 			// -! NEW_FEATURE#0023
 			bOk = TRUE;
 		}
-
-		f.Unlock();
 	}
 
-	f.Close();
 	EndWaitCursor();
 	if (bOk)
 	{

Modified: trunk/OpenMPT/mptrack/Ctrl_smp.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_smp.cpp	2013-06-28 21:49:19 UTC (rev 2435)
+++ trunk/OpenMPT/mptrack/Ctrl_smp.cpp	2013-06-29 00:07:03 UTC (rev 2436)
@@ -811,9 +811,7 @@
 			m_modDoc.GetSampleUndo().RemoveLastUndoStep(m_nSample);
 		}
 	}
-	f.Unlock();
 OpenError:
-	f.Close();
 	EndWaitCursor();
 	if (bOk)
 	{

Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp	2013-06-28 21:49:19 UTC (rev 2435)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp	2013-06-29 00:07:03 UTC (rev 2436)
@@ -1583,10 +1583,8 @@
 							ok = m_WaveFile.ReadSampleFromFile(1, p, dwLen);
 							m_WaveFile.AllocateInstrument(1, 1);
 						}
-						f.Unlock();
 					}
 				}
-				f.Close();
 			}
 		}
 		if(ok)

Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp	2013-06-28 21:49:19 UTC (rev 2435)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp	2013-06-29 00:07:03 UTC (rev 2436)
@@ -225,7 +225,6 @@
 					f.Unlock();
 				}
 			}
-			f.Close();
 		}
 	}
 	#endif

Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp	2013-06-28 21:49:19 UTC (rev 2435)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp	2013-06-29 00:07:03 UTC (rev 2436)
@@ -1970,6 +1970,7 @@
 CMappedFile::~CMappedFile()
 //-------------------------
 {
+	Close();
 }
 
 

Modified: trunk/OpenMPT/mptrack/View_tre.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_tre.cpp	2013-06-28 21:49:19 UTC (rev 2435)
+++ trunk/OpenMPT/mptrack/View_tre.cpp	2013-06-29 00:07:03 UTC (rev 2436)
@@ -283,7 +283,6 @@
 					f.Unlock();
 				}
 			}
-			f.Close();
 		}
 	}
 	strcpy(m_szSongName, pszSongName);

Modified: trunk/OpenMPT/mptrack/Vstplug.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Vstplug.cpp	2013-06-28 21:49:19 UTC (rev 2435)
+++ trunk/OpenMPT/mptrack/Vstplug.cpp	2013-06-29 00:07:03 UTC (rev 2436)
@@ -1682,7 +1682,6 @@
 		FileReader file(f.Lock(len), len);
 
 		errorStr = VSTPresets::GetErrorMessage(VSTPresets::LoadFile(file, *this));
-		f.Close();
 	} else
 	{
 		errorStr = "Can't open file.";

Modified: trunk/OpenMPT/soundlib/Dlsbank.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Dlsbank.cpp	2013-06-28 21:49:19 UTC (rev 2435)
+++ trunk/OpenMPT/soundlib/Dlsbank.cpp	2013-06-29 00:07:03 UTC (rev 2436)
@@ -1159,7 +1159,6 @@
 	if (dwMemLength >= 256) lpMemFile = MapFile.Lock();
 	if (!lpMemFile)
 	{
-		MapFile.Close();
 		return FALSE;
 	}
 
@@ -1382,8 +1381,6 @@
 	{
 		ConvertSF2ToDLS(&sf2info);
 	}
-	MapFile.Unlock();
-	MapFile.Close();
 #ifdef DLSBANK_LOG
 	Log("DLS bank closed\n");
 #endif

Modified: trunk/OpenMPT/soundlib/Load_itp.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_itp.cpp	2013-06-28 21:49:19 UTC (rev 2435)
+++ trunk/OpenMPT/soundlib/Load_itp.cpp	2013-06-29 00:07:03 UTC (rev 2436)
@@ -221,7 +221,6 @@
 		if(!lpFile) { f.Close(); continue; }
 
 		ReadInstrumentFromFile(ins + 1, lpFile, size);
-		f.Unlock();
 		f.Close();
 	}
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.