comparison tools/xm2jss.c @ 2277:026c3aa0e48f

Rename two functions.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 18 Jun 2019 12:11:16 +0300
parents e3f0eaf23f4f
children 40ccc09f09be
comparison
equal deleted inserted replaced
2276:b613715bb57a 2277:026c3aa0e48f
781 } 781 }
782 782
783 783
784 /* Check if two given patterns are dupes 784 /* Check if two given patterns are dupes
785 */ 785 */
786 BOOL comparePattern(const JSSPattern *pat1, const JSSPattern *pat2) 786 BOOL jssComparePattern(const JSSPattern *pat1, const JSSPattern *pat2)
787 { 787 {
788 return 788 return
789 pat1->nrows == pat2->nrows && 789 pat1->nrows == pat2->nrows &&
790 pat1->nchannels == pat2->nchannels && 790 pat1->nchannels == pat2->nchannels &&
791 memcmp(pat1->data, pat2->data, sizeof(JSSNote) * pat1->nrows * pat1->nchannels) == 0; 791 memcmp(pat1->data, pat2->data, sizeof(JSSNote) * pat1->nrows * pat1->nchannels) == 0;
792 } 792 }
793 793
794 794
795 /* Optimize a given module 795 /* Optimize a given module
796 */ 796 */
797 JSSModule *optimizeModule(JSSModule *m) 797 JSSModule *jssOptimizeModule(JSSModule *m)
798 { 798 {
799 BOOL usedPatterns[jsetMaxPatterns + 1], 799 BOOL usedPatterns[jsetMaxPatterns + 1],
800 usedInstruments[jsetMaxInstruments + 1], 800 usedInstruments[jsetMaxInstruments + 1],
801 usedExtInstruments[jsetMaxInstruments + 1], 801 usedExtInstruments[jsetMaxInstruments + 1],
802 usedChannels[jsetMaxChannels]; 802 usedChannels[jsetMaxChannels];
949 949
950 // Check for duplicate patterns of "pat1" and mark them as such 950 // Check for duplicate patterns of "pat1" and mark them as such
951 for (int pat2 = 0; pat2 < m->npatterns; pat2++) 951 for (int pat2 = 0; pat2 < m->npatterns; pat2++)
952 if (pat1 != pat2 && m->patterns[pat2] != NULL && 952 if (pat1 != pat2 && m->patterns[pat2] != NULL &&
953 dupPatterns[pat2] == jsetNotSet && 953 dupPatterns[pat2] == jsetNotSet &&
954 comparePattern(m->patterns[pat1], m->patterns[pat2])) 954 jssComparePattern(m->patterns[pat1], m->patterns[pat2]))
955 { 955 {
956 dmPrint(1, " * %d and %d are dupes.\n", pat1, pat2); 956 dmPrint(1, " * %d and %d are dupes.\n", pat1, pat2);
957 dupPatterns[pat2] = pat1; 957 dupPatterns[pat2] = pat1;
958 ndupes++; 958 ndupes++;
959 } 959 }
1250 1250
1251 // Run the optimization procedure 1251 // Run the optimization procedure
1252 if (optOptimize) 1252 if (optOptimize)
1253 { 1253 {
1254 dmMsg(1, "Optimizing module data...\n"); 1254 dmMsg(1, "Optimizing module data...\n");
1255 dm = optimizeModule(sm); 1255 dm = jssOptimizeModule(sm);
1256 } else 1256 } else
1257 dm = sm; 1257 dm = sm;
1258 1258
1259 // Write output file 1259 // Write output file
1260 if ((outFile = fopen(optOutFilename, "wb")) == NULL) 1260 if ((outFile = fopen(optOutFilename, "wb")) == NULL)