Permalink
Browse files

Merge branch 'master' into fast_lookup_byindex

  • Loading branch information...
saml1er committed Nov 13, 2018
2 parents b6a3254 + 0b230fa commit 6fc393a83d4d43538b6ec99d55274651ca85d8d1
@@ -836,7 +836,7 @@ void CheckDataFiles(void)
const char* szFilename;
} integrityCheckList[] = {
{
"725427593CF994799733A5B4BB74A2F8",
"E370F030BDC5369424FE9BC24068C47D",
"bass.dll",
},
{
@@ -856,15 +856,15 @@ void CheckDataFiles(void)
"bassflac.dll",
},
{
"0F07AA5995BAEF697AD80D8F393EB9AC",
"CC27BE72D0519D8C863F1DAB1BBE5633",
"bassmidi.dll",
},
{
"39613507057827F338CFA4519ACCA7A9",
"bassmix.dll",
},
{
"02C9E8F0288D15FF290DD31EB1C7BFBC",
"A417017D402C542912493A3BE8DBE87F",
"basswma.dll",
},
{
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -732,7 +732,7 @@ int CLuaFileDefs::fileWrite(lua_State* luaVM)
CScriptArgReader argStream(luaVM);
argStream.ReadUserData(pFile);

// Ensure we have atleast one string
// Ensure we have at least one string
if (!argStream.NextIsString())
argStream.SetTypeError("string");

@@ -745,12 +745,14 @@ int CLuaFileDefs::fileWrite(lua_State* luaVM)
while (argStream.NextIsString())
{
// Grab argument and length
SString strData;
argStream.ReadString(strData);
unsigned long ulDataLen = strData.length();
SCharStringRef strData;
argStream.ReadCharStringRef(strData);

if (argStream.HasErrors() || !strData.pData)
continue;

// Write the data
long lArgBytesWritten = pFile->Write(ulDataLen, strData);
long lArgBytesWritten = pFile->Write(strData.uiSize, strData.pData);

// Did the file mysteriously disappear?
if (lArgBytesWritten == -1)
@@ -1016,7 +1016,7 @@ class CScriptArgReader
int iArgument = lua_type(m_luaVM, -1);
if (iArgument == LUA_TNUMBER)
{
outList.push_back(lua_tonumber(m_luaVM, -1));
outList.push_back(static_cast<float>(lua_tonumber(m_luaVM, -1)));
}
}
m_iIndex++;
@@ -1,6 +1,6 @@
/*
BASSWMA 2.4 C/C++ header file
Copyright (c) 2002-2014 Un4seen Developments Ltd.
Copyright (c) 2002-2018 Un4seen Developments Ltd.
See the BASSWMA.CHM file for more detailed documentation
*/
@@ -55,6 +55,8 @@ typedef DWORD HWMENCODE; // WMA encoding handle
#define BASS_WMA_ENCODE_SCRIPT 0x20000 // set script (mid-stream tags) in the WMA encoding
#define BASS_WMA_ENCODE_QUEUE 0x40000 // queue data to feed encoder asynchronously
#define BASS_WMA_ENCODE_SOURCE 0x80000 // use a BASS channel as source
#define BASS_WMA_ENCODE_VOICE 0x100000 // WMA Voice
#define BASS_WMA_ENCODE_VOICE_MIXED 0x300000 // WMA Voice mixed mode

// Additional flag for use with BASS_WMA_EncodeGetRates
#define BASS_WMA_ENCODE_RATES_VBR 0x10000 // get available VBR quality settings

0 comments on commit 6fc393a

Please sign in to comment.