Mercurial > hg > forks > bilotrip-mj12
comparison src/midifile.c @ 56:79977d487182
Cosmetics.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Tue, 06 Aug 2013 17:32:49 +0300 |
parents | 7fd43d272c93 |
children |
comparison
equal
deleted
inserted
replaced
55:0b9b6739796b | 56:79977d487182 |
---|---|
588 MIDI_END_POINT *p2 = (MIDI_END_POINT *) e2; | 588 MIDI_END_POINT *p2 = (MIDI_END_POINT *) e2; |
589 | 589 |
590 return p1->iEndPos - p2->iEndPos; | 590 return p1->iEndPos - p2->iEndPos; |
591 } | 591 } |
592 | 592 |
593 BOOL midiFileFlushTrack(MIDI_FILE *_pMF, int iTrack, BOOL bFlushToEnd, | 593 BOOL midiFileFlushTrack(MIDI_FILE *_pMF, int iTrack, BOOL bFlushToEnd, Uint32 dwEndTimePos) |
594 Uint32 dwEndTimePos) | |
595 { | 594 { |
596 size_t sz, index; | 595 size_t sz, index; |
597 Uint8 *ptr; | 596 Uint8 *ptr; |
598 MIDI_END_POINT *pEndPoints; | 597 MIDI_END_POINT *pEndPoints; |
599 int num, mx_pts; | 598 int num, mx_pts; |
788 tmp[7] = (Uint8) iFFrames; | 787 tmp[7] = (Uint8) iFFrames; |
789 return midiTrackAddRaw(pMF, iTrack, sizeof(tmp), tmp, FALSE, 0); | 788 return midiTrackAddRaw(pMF, iTrack, sizeof(tmp), tmp, FALSE, 0); |
790 } | 789 } |
791 | 790 |
792 | 791 |
793 BOOL midiSongAddSimpleTimeSig(MIDI_FILE *_pMF, int iTrack, int iNom, | 792 BOOL midiSongAddSimpleTimeSig(MIDI_FILE *_pMF, int iTrack, int iNom, int iDenom) |
794 int iDenom) | |
795 { | 793 { |
796 return midiSongAddTimeSig(_pMF, iTrack, iNom, iDenom, 24, 8); | 794 return midiSongAddTimeSig(_pMF, iTrack, iNom, iDenom, 24, 8); |
797 } | 795 } |
798 | 796 |
799 BOOL midiSongAddTimeSig(MIDI_FILE *_pMF, int iTrack, int iNom, int iDenom, | 797 BOOL midiSongAddTimeSig(MIDI_FILE *_pMF, int iTrack, int iNom, int iDenom, |
908 | 906 |
909 return TRUE; | 907 return TRUE; |
910 } | 908 } |
911 | 909 |
912 | 910 |
913 BOOL midiTrackIncTime(MIDI_FILE *_pMF, int iTrack, int iDeltaTime, | 911 BOOL midiTrackIncTime(MIDI_FILE *_pMF, int iTrack, int iDeltaTime, BOOL bOverridePPQN) |
914 BOOL bOverridePPQN) | |
915 { | 912 { |
916 Uint32 will_end_at; | 913 Uint32 will_end_at; |
917 | 914 |
918 _VAR_CAST; | 915 _VAR_CAST; |
919 if (!IsFilePtrValid(pMF)) | 916 if (!IsFilePtrValid(pMF)) |
927 midiFileFlushTrack(pMF, iTrack, FALSE, will_end_at); | 924 midiFileFlushTrack(pMF, iTrack, FALSE, will_end_at); |
928 | 925 |
929 return TRUE; | 926 return TRUE; |
930 } | 927 } |
931 | 928 |
932 BOOL midiTrackAddText(MIDI_FILE *_pMF, int iTrack, tMIDI_TEXT iType, | 929 BOOL midiTrackAddText(MIDI_FILE *_pMF, int iTrack, tMIDI_TEXT iType, const char *pTxt) |
933 const char *pTxt) | |
934 { | 930 { |
935 Uint8 *ptr; | 931 Uint8 *ptr; |
936 int sz; | 932 int sz; |
937 | 933 |
938 _VAR_CAST; | 934 _VAR_CAST; |
1157 { | 1153 { |
1158 _VAR_CAST; | 1154 _VAR_CAST; |
1159 return pMF->Header.iNumTracks; | 1155 return pMF->Header.iNumTracks; |
1160 } | 1156 } |
1161 | 1157 |
1162 BOOL midiReadGetNextMessage(const MIDI_FILE *_pMF, int iTrack, | 1158 BOOL midiReadGetNextMessage(const MIDI_FILE *_pMF, int iTrack, MIDI_MSG * pMsg) |
1163 MIDI_MSG * pMsg) | |
1164 { | 1159 { |
1165 MIDI_FILE_TRACK *pTrack; | 1160 MIDI_FILE_TRACK *pTrack; |
1166 Uint8 *bptr, *pMsgDataPtr; | 1161 Uint8 *bptr, *pMsgDataPtr; |
1167 int sz; | 1162 int sz; |
1168 | 1163 |
1284 case metaEndSequence: | 1279 case metaEndSequence: |
1285 /* NO DATA */ | 1280 /* NO DATA */ |
1286 break; | 1281 break; |
1287 case metaSetTempo: | 1282 case metaSetTempo: |
1288 { | 1283 { |
1289 Uint32 us = | 1284 Uint32 us = ((*(pTrack->ptr + 0)) << 16) | ((*(pTrack->ptr + 1)) << 8) | (*(pTrack->ptr + 2)); |
1290 ((*(pTrack->ptr + 0)) << 16) | ((*(pTrack->ptr + 1)) << 8) | |
1291 | (*(pTrack->ptr + 2)); | |
1292 pMsg->MsgData.MetaEvent.Data.Tempo.iBPM = 60000000L / us; | 1285 pMsg->MsgData.MetaEvent.Data.Tempo.iBPM = 60000000L / us; |
1293 } | 1286 } |
1294 break; | 1287 break; |
1295 case metaSMPTEOffset: | 1288 case metaSMPTEOffset: |
1296 pMsg->MsgData.MetaEvent.Data.SMPTE.iHours = *(pTrack->ptr + 0); | 1289 pMsg->MsgData.MetaEvent.Data.SMPTE.iHours = *(pTrack->ptr + 0); |