code style update to match ours (kind of)

license header update
minor clean up


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17876 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2006-06-19 13:24:04 +00:00
parent 3639baa4b0
commit 4810cdcdbc
18 changed files with 785 additions and 992 deletions
+5 -5
View File
@@ -109,12 +109,12 @@ private:
virtual void Run();
BMidiLocalProducer* producer;
BMidiLocalConsumer* consumer;
BMidiLocalProducer* fProducer;
BMidiLocalConsumer* fConsumer;
BList* connections;
volatile thread_id threadId;
volatile bool isRunning;
BList* fConnections;
volatile thread_id fThreadId;
volatile bool fIsRunning;
uint32 _reserved2[5];
};
+7 -7
View File
@@ -75,14 +75,14 @@ private:
void ScanDevices();
void EmptyDeviceList();
BMidiLocalProducer* localSource;
BMidiLocalConsumer* localSink;
BMidiProducer* remoteSource;
BMidiConsumer* remoteSink;
BMidiLocalProducer* fLocalSource;
BMidiLocalConsumer* fLocalSink;
BMidiProducer* fRemoteSource;
BMidiConsumer* fRemoteSink;
char* portName;
status_t status;
BList* devices;
char* fPortName;
status_t fStatus;
BList* fDevices;
uint32 _reserved[1];
};
+18 -18
View File
@@ -85,12 +85,12 @@ private:
uint32 TicksToMilliseconds(uint32 ticks) const;
uint32 MillisecondsToTicks(uint32 ms) const;
BList* events;
int32 currentEvent;
uint32 startTime;
int32 beatsPerMinute;
int16 ticksPerBeat;
bool needsSorting;
BList* fEvents;
int32 fCurrentEvent;
uint32 fStartTime;
int32 fBeatsPerMinute;
int16 fTicksPerBeat;
bool fNeedsSorting;
void ReadFourCC(char* fourcc);
uint32 Read32Bit();
@@ -112,21 +112,21 @@ private:
void WriteTrack();
void WriteMetaEvent(BMidiEvent* event);
BFile* file;
uint32 byteCount;
uint32 totalTicks;
uint16 numTracks;
uint16 currTrack;
uint16 format;
BFile* fFile;
uint32 fByteCount;
uint32 fTotalTicks;
uint16 fNumTracks;
uint16 fCurrTrack;
uint16 fFormat;
uint16 _reserved1[1];
bool* instruments;
synth_file_hook hookFunc;
int32 hookArg;
bool looping;
bool paused;
bool finished;
bool* fInstruments;
synth_file_hook fHookFunc;
int32 fHookArg;
bool fLooping;
bool fPaused;
bool fFinished;
uint32 _reserved2[12];
};
+3 -3
View File
@@ -80,9 +80,9 @@ private:
virtual void Run();
bigtime_t creationTime;
int16 transpose;
bool inputEnabled;
bigtime_t fCreationTime;
int16 fTranspose;
bool fInputEnabled;
};
#endif // _MIDI_SYNTH_H
+1 -1
View File
@@ -57,7 +57,7 @@ private:
virtual void _ReservedMidiSynthFile2();
virtual void _ReservedMidiSynthFile3();
BMidiStore* store;
BMidiStore* fStore;
int32 _reserved[3];
};
+2 -2
View File
@@ -53,9 +53,9 @@ private:
virtual void Run();
void WaitAndPrint(uint32 time);
void _WaitAndPrint(uint32 time);
uint32 startTime;
uint32 fStartTime;
uint32 _reserved[4];
};
+4 -4
View File
@@ -95,11 +95,11 @@ private:
virtual void _ReservedSynth3();
virtual void _ReservedSynth4();
void Init();
void _Init();
BPrivate::BSoftSynth* synth;
synth_mode synthMode;
int32 clientCount;
BPrivate::BSoftSynth* fSynth;
synth_mode fSynthMode;
int32 fClientCount;
uint32 _reserved[10];
};