Cleaned up libmidi. See the log message

from the libmidi source for details. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1820 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-11-01 16:11:03 +00:00
parent a4e33e10fa
commit 173d0cd769
9 changed files with 618 additions and 569 deletions
@@ -1,76 +1,91 @@
-//-----------------------------------------------------------------------------
-#ifndef _MIDI_STORE_H_
-#define _MIDI_STORE_H_

+#ifndef _MIDI_STORE_H
+#define _MIDI_STORE_H
+
+#include <BeBuild.h>
 #include <Midi.h>
-#include <List.h>

 struct entry_ref;
+
 class BMidiEvent;
-class BFile;
+class BList;

-class BMidiStore : public BMidi {
+class BMidiStore : public BMidi 
+{
 public:
-BMidiStore();
-virtual ~BMidiStore();
+	BMidiStore();
+	virtual ~BMidiStore();

-	virtual void NoteOff(uchar channel, uchar note,
-		uchar velocity, uint32 time = B_NOW);
-	virtual void NoteOn(uchar channel, uchar note,
-		uchar velocity, uint32 time = B_NOW);
-	virtual void KeyPressure(uchar channel, uchar note,
-		uchar pressure, uint32 time = B_NOW);
-	virtual void ControlChange(uchar channel, uchar control_number,
-		uchar control_value, uint32 time = B_NOW);
-	virtual void ProgramChange(uchar channel, uchar program_number,
-		uint32 time = B_NOW);
-	virtual void ChannelPressure(uchar channel, uchar pressure,
-		uint32 time = B_NOW);
-	virtual void PitchBend(uchar channel, uchar lsb,
-		uchar msb, uint32 time = B_NOW);
-	virtual void SystemExclusive(void * data, size_t data_length,
-		uint32 time = B_NOW);
-	virtual void SystemCommon(uchar status_byte, uchar data1,
-		uchar data2, uint32 time = B_NOW);
-	virtual void SystemRealTime(uchar status_byte, uint32 time = B_NOW);
-	virtual void TempoChange(int32 beats_per_minute, uint32 time = B_NOW);
-	virtual void AllNotesOff(bool just_channel = true, uint32 time = B_NOW);
+	virtual void NoteOff(
+		uchar channel, uchar note, uchar velocity, uint32 time = B_NOW);

-	status_t Import(const entry_ref * ref);
-	status_t Export(const entry_ref * ref, int32 format);
+	virtual void NoteOn(
+		uchar channel, uchar note, uchar velocity, uint32 time = B_NOW);
+
+	virtual void KeyPressure(
+		uchar channel, uchar note, uchar pressure, uint32 time = B_NOW);
+
+	virtual void ControlChange(
+		uchar channel, uchar controlNumber, uchar controlValue, 
+		uint32 time = B_NOW);
+
+	virtual void ProgramChange(
+		uchar channel, uchar programNumber, uint32 time = B_NOW);
+
+	virtual void ChannelPressure(
+		uchar channel, uchar pressure, uint32 time = B_NOW);
+
+	virtual void PitchBend(
+		uchar channel, uchar lsb, uchar msb, uint32 time = B_NOW);
+
+	virtual void SystemExclusive(
+		void* data, size_t dataLength, uint32 time = B_NOW);
+
+	virtual void SystemCommon(
+		uchar status, uchar data1, uchar data2, uint32 time = B_NOW);
+
+	virtual void SystemRealTime(uchar status, uint32 time = B_NOW);
+
+	virtual void TempoChange(int32 beatsPerMinute, uint32 time = B_NOW);
+
+ 	virtual void AllNotesOff(bool justChannel = true, uint32 time = B_NOW);
+
+	status_t Import(const entry_ref* ref);
+	status_t Export(const entry_ref* ref, int32 format);

 	void SortEvents(bool force = false);
 	uint32 CountEvents() const;
+
 	uint32 CurrentEvent() const;
-	void SetCurrentEvent(uint32 event_number);
-	uint32 DeltaOfEvent(uint32 event_number) const;
+	void SetCurrentEvent(uint32 eventNumber);
+
+	uint32 DeltaOfEvent(uint32 eventNumber) const;
 	uint32 EventAtDelta(uint32 time) const;
-	uint32 BeginTime() const;    
-	void SetTempo(int32 beats_per_minute);
+
+	uint32 BeginTime() const;
+
+	void SetTempo(int32 beatsPerMinute);
 	int32 Tempo() const;

 private:
-	virtual void Run();
-	void _RunThread();
-	uint8* _DecodeTrack(uint8 *);
-	void _DecodeFormat0Tracks(uint8 *, uint16, uint32);
-	void _DecodeFormat1Tracks(uint8 *, uint16, uint32);
-	void _DecodeFormat2Tracks(uint8 *, uint16, uint32);
-	void _EncodeFormat0Tracks(uint8 *);
-	void _EncodeFormat1Tracks(uint8 *);
-	void _EncodeFormat2Tracks(uint8 *);
-	void _ReadEvent(uint8, uint8 **, uint8 *, BMidiEvent *);
-	void _WriteEvent(BMidiEvent *);
-	uint32 _ReadVarLength(uint8 **, uint8 *);
-	void _WriteVarLength(uint32);
-	static int _CompareEvents(const void *, const void *);

-private:
-	BList * _evt_list;
-	uint32 _tempo;
-	uint32 _cur_evt;
-	uint32 _start_time;
-	uint32 _ticks_per_beat;
+	virtual void _ReservedMidiStore1();
+	virtual void _ReservedMidiStore2();
+
+	virtual void Run();
+
+	BMidiEvent* EventAt(uint32 index) const;
+
+	static int CompareEvents(const void* event1, const void* event2);
+
+	BList* events;
+	uint32 tempo;
+	uint32 curEvent;
+	uint32 startTime;
+	uint32 ticksPerBeat;
+
+	uint32 _reserved[21];
 };

-#endif _MIDI_STORE_H_
+#endif // _MIDI_STORE_H
+