commit 4a8867f55c09da6a33dcafa92d5f42d7c585cd69
parent 6feb2b139f35c7b2d16ee0649aa7f267d7266701
Author: paulnasca <paulnasca>
Date: Mon, 15 Mar 2004 19:13:35 +0000
*** empty log message ***
Diffstat:
4 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -558,6 +558,6 @@
09 Mar 2004 - Adaugata posibilitatea de stretch la LFO in functie de frecventa notei
12 Mar 2004 - Adaugata modulatie la OscilGen (functia de baza)
13 Mar 2004 - Adaugat HarmonicShift la oscilgen
-
+15 Mar 2004 - Inceput sa scriu partea de incarcare MIDI
diff --git a/src/Seq/Makefile b/src/Seq/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.inc
-objects=Sequencer.o
+objects=MIDIFile.o Sequencer.o
all: $(objects)
diff --git a/src/Seq/Sequencer.C b/src/Seq/Sequencer.C
@@ -57,6 +57,13 @@ Sequencer::~Sequencer(){
};
};
+
+int Sequencer::importmidifile(char *filename){
+ return(0);
+};
+
+
+
void Sequencer::recordnote(char chan, char note, char vel){
if (rec==0) return;
if (chan>=NUM_MIDI_CHANNELS) return;
@@ -126,6 +133,7 @@ void Sequencer::stopplay(){
play=0;
};
+
/************** Player stuff ***************/
int Sequencer::getevent(char chan,int *type,int *par1, int *par2){
diff --git a/src/Seq/Sequencer.h b/src/Seq/Sequencer.h
@@ -24,6 +24,7 @@
#define SEQUENCER_H
#include "../globals.h"
+#include "MIDIFile.h"
class Sequencer{
public:
@@ -39,7 +40,9 @@ class Sequencer{
//it returns 0 if there are no more notes for the current time
//or -1 if there is no note
int getevent(char chan, int *type,int *par1, int *par2);
-
+
+ //returns 0 if ok or -1 if there is a error loading file
+ int importmidifile(char *filename);
//UI controlling functions
void startrec();
@@ -48,10 +51,12 @@ class Sequencer{
void startplay();
void stopplay();
- int rec,play;
+
+ int rec,play;
private:
-
+
+ MIDIFile midifile;
/* Events */
struct event{