diff --git a/C/loaders.cpp b/C/loaders.cpp index 7ebade4..4017795 100644 --- a/C/loaders.cpp +++ b/C/loaders.cpp @@ -31,8 +31,8 @@ int loadBank(int bank) { } -void loadPattern(int pattern) { - printf("\nLoading pattern %d ...\n", pattern); +void loadPattern(int patternNum) { + printf("\nLoading pattern %d ...\n", patternNum); FILE *fp; char *line = NULL; @@ -45,15 +45,12 @@ void loadPattern(int pattern) { int cols = 0; int rows = 0; - int patternArray[10][32]; - - sprintf(patternFile, "patterns/pattern%d", pattern); + sprintf(patternFile, "patterns/pattern%d", patternNum); fp = fopen(patternFile, "r"); if(fp == NULL) {exit(EXIT_FAILURE);} while ((read = getline(&line, &len, fp)) != -1) { //printf("Retrieved line of length %zu:\n", read); - if(lineCount == 0) { bank = line[10]-'0'; } if(lineCount == 1) { rows = line[10]-'0'; } @@ -61,30 +58,26 @@ void loadPattern(int pattern) { if(lineCount == 2) { cols = read-1; } - for(int i=0; i= *step ? 0 : *timer+1; +void playPattern(int *timer, int duration, int *step) { + *timer = *timer >= duration ? 0 : *timer+1; usleep(1000); if(*timer == 0) { - printf("%d\n", *timer); + //printf("%d\n", *timer); Mix_PlayChannel(-1, samples[1], 0); } diff --git a/C/sonquencer b/C/sonquencer index ac76495..6662077 100755 Binary files a/C/sonquencer and b/C/sonquencer differ