# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1375739671 -10800
# Node ID d77dd667d9d6b010cf79f22f66b51363616dd8e0
# Parent  27940b5188e04a5fa5d394bb3cd0b74b5f57be26
Fix some warnings.

diff -r 27940b5188e0 -r d77dd667d9d6 src/midifile.c
--- 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;