Mercurial > hg > forks > bilotrip-mj12

changeset 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 27940b5188e0
children 1efee62c0f96
files src/midifile.c
diffstat 1 files changed, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/midifile.c	Tue Aug 06 00:32:22 2013 +0300
+++ b/src/midifile.c	Tue Aug 06 00:54:31 2013 +0300
@@ -1313,17 +1313,14 @@
             if (*pTrack->ptr & 0x80)
             {
                 /* Do some trendy sign extending in reverse :) */
-                pMsg->MsgData.MetaEvent.Data.KeySig.iKey =
-                    ((256 - *pTrack->ptr) & keyMaskKey);
-                pMsg->MsgData.MetaEvent.Data.KeySig.iKey |= keyMaskNeg;
+                pMsg->MsgData.MetaEvent.Data.KeySig.iKey = (tMIDI_KEYSIG) (((256 - *pTrack->ptr) & keyMaskKey) | keyMaskNeg);
             }
             else
             {
-                pMsg->MsgData.MetaEvent.Data.KeySig.iKey =
-                    (tMIDI_KEYSIG) (*pTrack->ptr & keyMaskKey);
+                pMsg->MsgData.MetaEvent.Data.KeySig.iKey = (tMIDI_KEYSIG) (*pTrack->ptr & keyMaskKey);
             }
             if (*(pTrack->ptr + 1))
-                pMsg->MsgData.MetaEvent.Data.KeySig.iKey |= keyMaskMin;
+                pMsg->MsgData.MetaEvent.Data.KeySig.iKey = (tMIDI_KEYSIG) (pMsg->MsgData.MetaEvent.Data.KeySig.iKey | keyMaskMin);
             break;
         case metaSequencerSpecific:
             pMsg->MsgData.MetaEvent.Data.Sequencer.iSize = pMsg->iMsgSize;