diff options
Diffstat (limited to 'libtdemid')
| -rw-r--r-- | libtdemid/deviceman.cpp | 2 | ||||
| -rw-r--r-- | libtdemid/midfile.cpp | 2 | ||||
| -rw-r--r-- | libtdemid/player.h | 4 | ||||
| -rw-r--r-- | libtdemid/track.cpp | 21 |
4 files changed, 11 insertions, 18 deletions
diff --git a/libtdemid/deviceman.cpp b/libtdemid/deviceman.cpp index 18bb9fcc2..137bff135 100644 --- a/libtdemid/deviceman.cpp +++ b/libtdemid/deviceman.cpp @@ -66,7 +66,7 @@ #endif #if 1 -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeglobal.h> #include <tdeconfig.h> #endif diff --git a/libtdemid/midfile.cpp b/libtdemid/midfile.cpp index bfeb056f0..f8264dfda 100644 --- a/libtdemid/midfile.cpp +++ b/libtdemid/midfile.cpp @@ -34,7 +34,7 @@ #include "sys/stat.h" #include <config.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tqfile.h> int fsearch(FILE *fh,const char *text,long *ptr); diff --git a/libtdemid/player.h b/libtdemid/player.h index ae33de849..c0ada8b1c 100644 --- a/libtdemid/player.h +++ b/libtdemid/player.h @@ -29,7 +29,7 @@ #include <libtdemid/deviceman.h> #include <libtdemid/track.h> #include <libtdemid/notearray.h> -#include <kdemacros.h> +#include <tdemacros.h> /** * This struct stores text, lyrics and change tempo events among others. @@ -181,7 +181,7 @@ struct PlayerController * @deprecated * Not used */ - volatile int message KDE_DEPRECATED; // set one of the following : + volatile int message TDE_DEPRECATED; // set one of the following : #define PLAYER_DOPAUSE 1 #define PLAYER_DOSTOP 2 diff --git a/libtdemid/track.cpp b/libtdemid/track.cpp index 44375b637..116ddb687 100644 --- a/libtdemid/track.cpp +++ b/libtdemid/track.cpp @@ -30,13 +30,6 @@ #include "midispec.h" #include "midfile.h" -#ifndef TRUE -#define TRUE 1 -#endif -#ifndef FALSE -#define FALSE 0 -#endif - #define T2MS(ticks) (((double)ticks)*(double)60000L)/((double)tempoToMetronomeTempo(tempo)*(double)tPCN) #define MS2T(ms) (((ms)*(double)tempoToMetronomeTempo(tempo)*(double)tPCN)/((double)60000L)) @@ -235,9 +228,9 @@ void MidiTrack::readEvent(MidiEvent *ev) ev->note = *ptrdata;ptrdata++;currentpos++; ev->vel = *ptrdata;ptrdata++;currentpos++; if (ev->vel==0) - note[ev->chn][ev->note]=FALSE; + note[ev->chn][ev->note]=false; else - note[ev->chn][ev->note]=TRUE; + note[ev->chn][ev->note]=true; #ifdef TRACKDEBUG2 if (ev->chn==6) { @@ -252,7 +245,7 @@ void MidiTrack::readEvent(MidiEvent *ev) #endif ev->note = *ptrdata;ptrdata++;currentpos++; ev->vel = *ptrdata;ptrdata++;currentpos++; - note[ev->chn][ev->note]=FALSE; + note[ev->chn][ev->note]=false; break; case (MIDI_KEY_PRESSURE) : @@ -334,7 +327,7 @@ void MidiTrack::readEvent(MidiEvent *ev) case (ME_END_OF_TRACK) : i=0; j=0; - while ((i<16)&&(note[i][j]==FALSE)) + while ((i<16)&&(note[i][j]==false)) { j++; if (j==128) { j=0; i++; }; @@ -346,7 +339,7 @@ void MidiTrack::readEvent(MidiEvent *ev) ev->command=MIDI_NOTEOFF; ev->note = j; ev->vel = 0; - note[ev->chn][ev->note]=FALSE; + note[ev->chn][ev->note]=false; fprintf(stderr,"Note Off(simulated)\n"); return; } @@ -504,7 +497,7 @@ void MidiTrack::clear(void) for (int i=0;i<16;i++) for (int j=0;j<128;j++) - note[i][j]=FALSE; + note[i][j]=false; delta_ticks = wait_ticks = ~0; time_at_previous_tempochange=0; @@ -526,7 +519,7 @@ void MidiTrack::init(void) for (int i=0;i<16;i++) for (int j=0;j<128;j++) - note[i][j]=FALSE; + note[i][j]=false; delta_ticks=readVariableLengthValue(); if (endoftrack) return; |