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

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

Revision: 4638
          http://sourceforge.net/p/modplug/code/4638
Author:   saga-games
Date:     2014-12-06 22:52:04 +0000 (Sat, 06 Dec 2014)
Log Message:
-----------
[Fix] Pattern tab: Don't show (00) in the status bar if there is no effect
[Imp] When loading a sample through the instrument tab, also set its path.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Draw_pat.cpp
    trunk/OpenMPT/soundlib/SampleFormats.cpp

Modified: trunk/OpenMPT/mptrack/Draw_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Draw_pat.cpp	2014-12-06 19:54:08 UTC (rev 4637)
+++ trunk/OpenMPT/mptrack/Draw_pat.cpp	2014-12-06 22:52:04 UTC (rev 4638)
@@ -1683,8 +1683,11 @@
 				case PatternCursor::effectColumn:
 				case PatternCursor::paramColumn:
 					// display effect command
-					if(!m->IsPcNote())
+					if(m->IsPcNote())
 					{
+						s.Format(_T("Parameter value: %u"), m->GetValueEffectCol());
+					} else if(m->command != CMD_NONE)
+					{
 						TCHAR sztmp[64] = "";
 						/*LONG fxndx = effectInfo.GetIndexFromEffect(m->command, m->param);
 						if(fxndx >= 0)
@@ -1692,10 +1695,7 @@
 							effectInfo.GetEffectNameEx(sztmp, fxndx, m->param);
 						}*/
 						effectInfo.GetEffectName(sztmp, m->command, m->param, false, nChn);
-						s.Format(_T("%s (%02X)"), sztmp, m->param);
-					} else
-					{
-						s.Format(_T("Parameter value: %u"), m->GetValueEffectCol());
+						if(sztmp[0]) s.Format(_T("%s (%02X)"), sztmp, m->param);
 					}
 					break;
 				}

Modified: trunk/OpenMPT/soundlib/SampleFormats.cpp
===================================================================
--- trunk/OpenMPT/soundlib/SampleFormats.cpp	2014-12-06 19:54:08 UTC (rev 4637)
+++ trunk/OpenMPT/soundlib/SampleFormats.cpp	2014-12-06 22:52:04 UTC (rev 4638)
@@ -171,6 +171,9 @@
 		Instruments[nInstr] = pIns;
 
 		ReadSampleFromFile(nSample, file, mayNormalize);
+#if defined(MPT_WITH_FILEIO)
+		SetSamplePath(nSample, file.GetFileName());
+#endif
 		return true;
 	}
 	return false;
@@ -1824,7 +1827,7 @@
 	}
 };
 
-STATIC_ASSERT(sizeof(AIFFChunk) == 8);
+STATIC_ASSERT(sizeof(IFFChunk) == 8);
 
 
 struct PACKED IFFSampleHeader

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