Mercurial > hg > forks > bilotrip-mj12

comparison src/midifile.c @ 48:d77dd667d9d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix some warnings.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 06 Aug 2013 00:54:31 +0300
parents d85542c96791
children 1efee62c0f96
comparison
equal deleted inserted replaced
47:27940b5188e0 48:d77dd667d9d6
1311 break; 1311 break;
1312 case metaKeySig: 1312 case metaKeySig:
1313 if (*pTrack->ptr & 0x80) 1313 if (*pTrack->ptr & 0x80)
1314 { 1314 {
1315 /* Do some trendy sign extending in reverse :) */ 1315 /* Do some trendy sign extending in reverse :) */
1316 pMsg->MsgData.MetaEvent.Data.KeySig.iKey = 1316 pMsg->MsgData.MetaEvent.Data.KeySig.iKey = (tMIDI_KEYSIG) (((256 - *pTrack->ptr) & keyMaskKey) | keyMaskNeg);
1317 ((256 - *pTrack->ptr) & keyMaskKey);
1318 pMsg->MsgData.MetaEvent.Data.KeySig.iKey |= keyMaskNeg;
1319 } 1317 }
1320 else 1318 else
1321 { 1319 {
1322 pMsg->MsgData.MetaEvent.Data.KeySig.iKey = 1320 pMsg->MsgData.MetaEvent.Data.KeySig.iKey = (tMIDI_KEYSIG) (*pTrack->ptr & keyMaskKey);
1323 (tMIDI_KEYSIG) (*pTrack->ptr & keyMaskKey);
1324 } 1321 }
1325 if (*(pTrack->ptr + 1)) 1322 if (*(pTrack->ptr + 1))
1326 pMsg->MsgData.MetaEvent.Data.KeySig.iKey |= keyMaskMin; 1323 pMsg->MsgData.MetaEvent.Data.KeySig.iKey = (tMIDI_KEYSIG) (pMsg->MsgData.MetaEvent.Data.KeySig.iKey | keyMaskMin);
1327 break; 1324 break;
1328 case metaSequencerSpecific: 1325 case metaSequencerSpecific:
1329 pMsg->MsgData.MetaEvent.Data.Sequencer.iSize = pMsg->iMsgSize; 1326 pMsg->MsgData.MetaEvent.Data.Sequencer.iSize = pMsg->iMsgSize;
1330 pMsg->MsgData.MetaEvent.Data.Sequencer.pData = pTrack->ptr; 1327 pMsg->MsgData.MetaEvent.Data.Sequencer.pData = pTrack->ptr;
1331 break; 1328 break;