Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[2289] trunk/OpenMPT
|
From: <man...@us...> - 2013-06-02 12:44:15
|
Revision: 2289
http://sourceforge.net/p/modplug/code/2289
Author: manxorist
Date: 2013-06-02 12:44:08 +0000 (Sun, 02 Jun 2013)
Log Message:
-----------
[Ref] Rename mptrack/res/built-inTunings.tc to soundlib/Tunings/built-inTunings.tc.
[Ref] Add a conversion to header file for built-inTunings.tc.
[New] Support builtin tunings in libopenmpt.
Modified Paths:
--------------
trunk/OpenMPT/mptrack/mptrack.rc
trunk/OpenMPT/soundlib/Load_it.cpp
trunk/OpenMPT/soundlib/Sndfile.cpp
trunk/OpenMPT/soundlib/Sndfile.h
Added Paths:
-----------
trunk/OpenMPT/soundlib/Tunings/
trunk/OpenMPT/soundlib/Tunings/built-inTunings.h
trunk/OpenMPT/soundlib/Tunings/built-inTunings.tc
Removed Paths:
-------------
trunk/OpenMPT/mptrack/res/built-inTunings.tc
Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc 2013-06-02 12:27:48 UTC (rev 2288)
+++ trunk/OpenMPT/mptrack/mptrack.rc 2013-06-02 12:44:08 UTC (rev 2289)
@@ -2839,7 +2839,7 @@
// TUNING
//
-IDR_BUILTIN_TUNINGS TUNING "res\\built-inTunings.tc"
+IDR_BUILTIN_TUNINGS TUNING "..\\soundlib\\Tunings\\built-inTunings.tc"
#endif // English (United Kingdom) resources
/////////////////////////////////////////////////////////////////////////////
Deleted: trunk/OpenMPT/mptrack/res/built-inTunings.tc
===================================================================
(Binary files differ)
Modified: trunk/OpenMPT/soundlib/Load_it.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp 2013-06-02 12:27:48 UTC (rev 2288)
+++ trunk/OpenMPT/soundlib/Load_it.cpp 2013-06-02 12:44:08 UTC (rev 2289)
@@ -189,6 +189,7 @@
csf.Instruments[i]->pTuning = csf.GetLocalTunings().GetTuning(str);
if(csf.Instruments[i]->pTuning)
continue;
+#endif
csf.Instruments[i]->pTuning = csf.GetBuiltInTunings().GetTuning(str);
if(csf.Instruments[i]->pTuning)
@@ -196,7 +197,6 @@
if(str == "TET12" && csf.GetBuiltInTunings().GetNumTunings() > 0)
csf.Instruments[i]->pTuning = &csf.GetBuiltInTunings().GetTuning(0);
-#endif
if(csf.Instruments[i]->pTuning)
continue;
Modified: trunk/OpenMPT/soundlib/Sndfile.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp 2013-06-02 12:27:48 UTC (rev 2288)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp 2013-06-02 12:44:08 UTC (rev 2289)
@@ -529,6 +529,10 @@
m_lTotalSampleCount = 0;
m_bPositionChanged = true;
+#ifndef MODPLUG_TRACKER
+ m_pTuningsBuiltIn = new CTuningCollection();
+ LoadBuiltInTunings();
+#endif
m_pTuningsTuneSpecific = new CTuningCollection("Tune specific tunings");
}
@@ -536,8 +540,13 @@
CSoundFile::~CSoundFile()
//-----------------------
{
+ Destroy();
delete m_pTuningsTuneSpecific;
- Destroy();
+ m_pTuningsTuneSpecific = nullptr;
+#ifndef MODPLUG_TRACKER
+ delete m_pTuningsBuiltIn;
+ m_pTuningsBuiltIn = nullptr;
+#endif
}
@@ -1664,6 +1673,15 @@
return false;
}
+#else
+#include "Tunings/built-inTunings.h"
+void CSoundFile::LoadBuiltInTunings()
+//-----------------------------------
+{
+ std::string data(built_inTunings_tc_data, built_inTunings_tc_data + built_inTunings_tc_size);
+ std::istringstream iStrm(data);
+ m_pTuningsBuiltIn->Deserialize(iStrm);
+}
#endif
Modified: trunk/OpenMPT/soundlib/Sndfile.h
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.h 2013-06-02 12:27:48 UTC (rev 2288)
+++ trunk/OpenMPT/soundlib/Sndfile.h 2013-06-02 12:44:08 UTC (rev 2289)
@@ -247,6 +247,9 @@
static void DeleteStaticdata();
static CTuningCollection& GetBuiltInTunings() {return *s_pTuningsSharedBuiltIn;}
static CTuningCollection& GetLocalTunings() {return *s_pTuningsSharedLocal;}
+#else
+ void LoadBuiltInTunings();
+ CTuningCollection& GetBuiltInTunings() {return *m_pTuningsBuiltIn;}
#endif
static CTuning *GetDefaultTuning() {return nullptr;}
CTuningCollection& GetTuneSpecificTunings() {return *m_pTuningsTuneSpecific;}
@@ -257,6 +260,8 @@
#ifdef MODPLUG_TRACKER
static CTuningCollection* s_pTuningsSharedBuiltIn;
static CTuningCollection* s_pTuningsSharedLocal;
+#else
+ CTuningCollection* m_pTuningsBuiltIn;
#endif
//<--Tuning
Index: trunk/OpenMPT/soundlib/Tunings
===================================================================
--- trunk/OpenMPT/soundlib/Tunings 2013-06-02 12:27:48 UTC (rev 2288)
+++ trunk/OpenMPT/soundlib/Tunings 2013-06-02 12:44:08 UTC (rev 2289)
Property changes on: trunk/OpenMPT/soundlib/Tunings
___________________________________________________________________
Added: tsvn:logminsize
## -0,0 +1 ##
+10
\ No newline at end of property
Added: trunk/OpenMPT/soundlib/Tunings/built-inTunings.h
===================================================================
--- trunk/OpenMPT/soundlib/Tunings/built-inTunings.h (rev 0)
+++ trunk/OpenMPT/soundlib/Tunings/built-inTunings.h 2013-06-02 12:44:08 UTC (rev 2289)
@@ -0,0 +1,28 @@
+//file auto-generated from built-inTunings.tc by bin2h.exe
+static const size_t built_inTunings_tc_size = 244;
+static const unsigned char built_inTunings_tc_data[244]=
+{
+ 0x32,0x32,0x38,0x02,0x54,0x43,0x1F,0x08,0x00,0x01,0x0C,
+ 0x01,0x0D,0x00,0x9F,0x03,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x40,0x42,0x75,0x69,0x6C,0x74,0x2D,0x69,0x6E,0x20,0x74,
+ 0x75,0x6E,0x69,0x6E,0x67,0x73,0xFF,0xFF,0x32,0x32,0x38,
+ 0x09,0x43,0x54,0x42,0x32,0x34,0x34,0x52,0x54,0x49,0x1F,
+ 0x08,0x00,0x01,0x12,0x00,0x00,0x10,0x01,0x25,0x00,0x27,
+ 0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x64,0x31,0x32,0x54,
+ 0x45,0x54,0x20,0x5B,0x5B,0x66,0x73,0x31,0x35,0x20,0x31,
+ 0x2E,0x31,0x37,0x2E,0x30,0x32,0x2E,0x34,0x39,0x5D,0x5D,
+ 0x00,0x00,0x03,0x00,0x30,0x00,0x00,0x02,0x43,0x2D,0x01,
+ 0x00,0x02,0x43,0x23,0x02,0x00,0x02,0x44,0x2D,0x03,0x00,
+ 0x02,0x44,0x23,0x04,0x00,0x02,0x45,0x2D,0x05,0x00,0x02,
+ 0x46,0x2D,0x06,0x00,0x02,0x46,0x23,0x07,0x00,0x02,0x47,
+ 0x2D,0x08,0x00,0x02,0x47,0x23,0x09,0x00,0x02,0x41,0x2D,
+ 0x0A,0x00,0x02,0x41,0x23,0x0B,0x00,0x02,0x42,0x2D,0x0F,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x0C,0x00,0x80,0x00,
+ 0xC0,0xFF,0x02,0x30,0x80,0x68,0x02,0x31,0xE8,0x08,0x02,
+ 0x32,0xF0,0x08,0x02,0x33,0xF8,0xF4,0x02,0x34,0xED,0x01,
+ 0x10,0x08,0x52,0x54,0x49,0x33,0xFD,0x01,0x10,0x08,0x52,
+ 0x54,0x49,0x32,0x0D,0x02,0x08,0x08,0x52,0x54,0x49,0x34,
+ 0x15,0x02,0x08,0x08,0x52,0x54,0x49,0x31,0x1D,0x02,0x08,
+ 0x02,0x30,0x58,0x44,0x02,0x31,0x9C,0x08,0x02,0x32,0xA4,
+ 0xF9,0x02
+};
Property changes on: trunk/OpenMPT/soundlib/Tunings/built-inTunings.h
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/x-chdr
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Copied: trunk/OpenMPT/soundlib/Tunings/built-inTunings.tc (from rev 2277, trunk/OpenMPT/mptrack/res/built-inTunings.tc)
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
