summaryrefslogtreecommitdiffstats
path: root/libtdemid
diff options
context:
space:
mode:
Diffstat (limited to 'libtdemid')
-rw-r--r--libtdemid/CMakeLists.txt11
-rw-r--r--libtdemid/Makefile.am8
-rw-r--r--libtdemid/alsaout.cpp (renamed from libtdemid/alsaout.cc)2
-rw-r--r--libtdemid/alsaout.h2
-rw-r--r--libtdemid/dattypes.cpp (renamed from libtdemid/dattypes.cc)2
-rw-r--r--libtdemid/deviceman.cpp (renamed from libtdemid/deviceman.cc)4
-rw-r--r--libtdemid/fmout.cpp (renamed from libtdemid/fmout.cc)2
-rw-r--r--libtdemid/gusout.cpp (renamed from libtdemid/gusout.cc)2
-rw-r--r--libtdemid/libtdemid.cpp (renamed from libtdemid/libtdemid.cc)2
-rw-r--r--libtdemid/midfile.cpp (renamed from libtdemid/midfile.cc)4
-rw-r--r--libtdemid/midimapper.cpp (renamed from libtdemid/midimapper.cc)2
-rw-r--r--libtdemid/midiout.cpp (renamed from libtdemid/midiout.cc)2
-rw-r--r--libtdemid/midistat.cpp (renamed from libtdemid/midistat.cc)2
-rw-r--r--libtdemid/mt32togm.cpp (renamed from libtdemid/mt32togm.cc)0
-rw-r--r--libtdemid/notearray.cpp (renamed from libtdemid/notearray.cc)2
-rw-r--r--libtdemid/player.cpp (renamed from libtdemid/player.cc)2
-rw-r--r--libtdemid/player.h4
-rw-r--r--libtdemid/synthout.cpp (renamed from libtdemid/synthout.cc)2
-rw-r--r--libtdemid/tests/Makefile.am4
-rw-r--r--libtdemid/tests/apitest.cpp (renamed from libtdemid/tests/apitest.cc)0
-rw-r--r--libtdemid/tests/notesoff.cpp (renamed from libtdemid/tests/notesoff.cc)0
-rw-r--r--libtdemid/track.cpp (renamed from libtdemid/track.cc)23
-rw-r--r--libtdemid/voiceman.cpp (renamed from libtdemid/voiceman.cc)2
23 files changed, 39 insertions, 45 deletions
diff --git a/libtdemid/CMakeLists.txt b/libtdemid/CMakeLists.txt
index f1fb5c7e3..0cfce2c70 100644
--- a/libtdemid/CMakeLists.txt
+++ b/libtdemid/CMakeLists.txt
@@ -37,15 +37,16 @@ install( FILES
set( target tdemid )
set( ${target}_SRCS
- midiout.cc player.cc track.cc midimapper.cc
- midfile.cc dattypes.cc midistat.cc deviceman.cc
- synthout.cc fmout.cc gusout.cc alsaout.cc voiceman.cc
- mt32togm.cc notearray.cc libtdemid.cc
+ midiout.cpp player.cpp track.cpp midimapper.cpp
+ midfile.cpp dattypes.cpp midistat.cpp deviceman.cpp
+ synthout.cpp fmout.cpp gusout.cpp alsaout.cpp voiceman.cpp
+ mt32togm.cpp notearray.cpp libtdemid.cpp
)
tde_add_library( ${target} SHARED
SOURCES ${${target}_SRCS}
VERSION 0.0.95
- LINK tdecore-shared ${ALSA_LIBRARIES}
+ LINK tdecore-shared
+ LINK_PRIVATE ${ALSA_LIBRARIES}
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/libtdemid/Makefile.am b/libtdemid/Makefile.am
index 8cb347b01..2c1baf726 100644
--- a/libtdemid/Makefile.am
+++ b/libtdemid/Makefile.am
@@ -12,10 +12,10 @@ libtdemidinclude_HEADERS = midiout.h player.h track.h midimapper.h \
midispec.h libtdemid.h
lib_LTLIBRARIES = libtdemid.la
-libtdemid_la_SOURCES = midiout.cc player.cc track.cc midimapper.cc \
- midfile.cc dattypes.cc midistat.cc deviceman.cc synthout.cc \
- fmout.cc gusout.cc alsaout.cc voiceman.cc mt32togm.cc notearray.cc \
- libtdemid.cc
+libtdemid_la_SOURCES = midiout.cpp player.cpp track.cpp midimapper.cpp \
+ midfile.cpp dattypes.cpp midistat.cpp deviceman.cpp synthout.cpp \
+ fmout.cpp gusout.cpp alsaout.cpp voiceman.cpp mt32togm.cpp notearray.cpp \
+ libtdemid.cpp
libtdemid_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 0:95 -no-undefined
libtdemid_la_LIBADD = $(LIBASOUND) ../tdecore/libtdecore.la $(LIB_TQT)
diff --git a/libtdemid/alsaout.cc b/libtdemid/alsaout.cpp
index 517852b25..2e1b769f4 100644
--- a/libtdemid/alsaout.cc
+++ b/libtdemid/alsaout.cpp
@@ -1,6 +1,6 @@
/**************************************************************************
- alsaout.cc - class AlsaOut which represents an alsa client/port pair
+ alsaout.cpp - class AlsaOut which represents an alsa client/port pair
This file is part of LibKMid 0.9.5
Copyright (C) 2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
diff --git a/libtdemid/alsaout.h b/libtdemid/alsaout.h
index 016ca29c6..4dace44ce 100644
--- a/libtdemid/alsaout.h
+++ b/libtdemid/alsaout.h
@@ -1,4 +1,4 @@
-/* alsaout.cc - class AlsaOut which represents an alsa client/port pair
+/* alsaout.cpp - class AlsaOut which represents an alsa client/port pair
This file is part of LibKMid 0.9.5
Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
diff --git a/libtdemid/dattypes.cc b/libtdemid/dattypes.cpp
index 218591fa4..7ae0aba52 100644
--- a/libtdemid/dattypes.cc
+++ b/libtdemid/dattypes.cpp
@@ -1,6 +1,6 @@
/**************************************************************************
- dattypes.cc - Some always useful definitions and functions
+ dattypes.cpp - Some always useful definitions and functions
This file is part of LibKMid 0.9.5
Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
diff --git a/libtdemid/deviceman.cc b/libtdemid/deviceman.cpp
index 82f973d3f..137bff135 100644
--- a/libtdemid/deviceman.cc
+++ b/libtdemid/deviceman.cpp
@@ -1,6 +1,6 @@
/**************************************************************************
- deviceman.cc - The device manager, that hides the use of midiOut
+ deviceman.cpp - The device manager, that hides the use of midiOut
This file is part of LibKMid 0.9.5
Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
@@ -66,7 +66,7 @@
#endif
#if 1
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdeglobal.h>
#include <tdeconfig.h>
#endif
diff --git a/libtdemid/fmout.cc b/libtdemid/fmout.cpp
index 72b3198c9..eb069e51c 100644
--- a/libtdemid/fmout.cc
+++ b/libtdemid/fmout.cpp
@@ -1,6 +1,6 @@
/**************************************************************************
- fmout.cc - class fmOut which handles the /dev/sequencer device
+ fmout.cpp - class fmOut which handles the /dev/sequencer device
for fm synths
This file is part of LibKMid 0.9.5
Copyright (C) 1998,99,2000 Antonio Larrosa Jimenez
diff --git a/libtdemid/gusout.cc b/libtdemid/gusout.cpp
index 69aae3927..96c9fb915 100644
--- a/libtdemid/gusout.cc
+++ b/libtdemid/gusout.cpp
@@ -1,6 +1,6 @@
/**************************************************************************
- gusout.cc - class GUSOut which implements support for Gravis
+ gusout.cpp - class GUSOut which implements support for Gravis
Ultrasound cards through a /dev/sequencer device
This file is part of LibKMid 0.9.5
Copyright (C) 1998,99,2000 Antonio Larrosa Jimenez
diff --git a/libtdemid/libtdemid.cc b/libtdemid/libtdemid.cpp
index 04a0dac0d..fcc75d3e5 100644
--- a/libtdemid/libtdemid.cc
+++ b/libtdemid/libtdemid.cpp
@@ -1,6 +1,6 @@
/**************************************************************************
- libtdemid.cc - class KMidSimpleAPI that makes it easy to use libtdemid
+ libtdemid.cpp - class KMidSimpleAPI that makes it easy to use libtdemid
and a C wrapper.
This file is part of LibKMid 0.9.5
Copyright (C) 2000 Antonio Larrosa Jimenez
diff --git a/libtdemid/midfile.cc b/libtdemid/midfile.cpp
index f8222b3f8..f8264dfda 100644
--- a/libtdemid/midfile.cc
+++ b/libtdemid/midfile.cpp
@@ -1,6 +1,6 @@
/**************************************************************************
- midfile.cc - function which reads a midi file,and creates the track classes
+ midfile.cpp - function which reads a midi file,and creates the track classes
This file is part of LibKMid 0.9.5
Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
@@ -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/midimapper.cc b/libtdemid/midimapper.cpp
index 837728410..157ef864f 100644
--- a/libtdemid/midimapper.cc
+++ b/libtdemid/midimapper.cpp
@@ -1,6 +1,6 @@
/**************************************************************************
- midimapper.cc - The midi mapper object
+ midimapper.cpp - The midi mapper object
This file is part of LibKMid 0.9.5
Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
diff --git a/libtdemid/midiout.cc b/libtdemid/midiout.cpp
index 24a209cce..c4949b03c 100644
--- a/libtdemid/midiout.cc
+++ b/libtdemid/midiout.cpp
@@ -1,6 +1,6 @@
/**************************************************************************
- midiout.cc - class midiOut which handles external midi devices
+ midiout.cpp - class midiOut which handles external midi devices
This file is part of LibKMid 0.9.5
Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
diff --git a/libtdemid/midistat.cc b/libtdemid/midistat.cpp
index 6a6c94b0c..7bd02c95a 100644
--- a/libtdemid/midistat.cc
+++ b/libtdemid/midistat.cpp
@@ -1,6 +1,6 @@
/**************************************************************************
- midistat.cc - class MidiStatus, change it internally and then send it.
+ midistat.cpp - class MidiStatus, change it internally and then send it.
This file is part of LibKMid 0.9.5
Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
diff --git a/libtdemid/mt32togm.cc b/libtdemid/mt32togm.cpp
index a59eb959c..a59eb959c 100644
--- a/libtdemid/mt32togm.cc
+++ b/libtdemid/mt32togm.cpp
diff --git a/libtdemid/notearray.cc b/libtdemid/notearray.cpp
index 9899fd837..d08a5b074 100644
--- a/libtdemid/notearray.cc
+++ b/libtdemid/notearray.cpp
@@ -1,6 +1,6 @@
/**************************************************************************
- notearray.cc - NoteArray class, which holds an array of notes
+ notearray.cpp - NoteArray class, which holds an array of notes
This file is part of LibKMid 0.9.5
Copyright (C) 1998,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
diff --git a/libtdemid/player.cc b/libtdemid/player.cpp
index ff7093496..1596d46f4 100644
--- a/libtdemid/player.cc
+++ b/libtdemid/player.cpp
@@ -1,6 +1,6 @@
/**************************************************************************
- player.cc - class MidiPlayer. Plays a set of tracks
+ player.cpp - class MidiPlayer. Plays a set of tracks
This file is part of LibKMid 0.9.5
Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
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/synthout.cc b/libtdemid/synthout.cpp
index 6d7ef47a1..6d06e17f2 100644
--- a/libtdemid/synthout.cc
+++ b/libtdemid/synthout.cpp
@@ -1,6 +1,6 @@
/**************************************************************************
- synthout.cc - class synthOut which handles the /dev/sequencer device
+ synthout.cpp - class synthOut which handles the /dev/sequencer device
for synths (as AWE32)
This file is part of LibKMid 0.9.5
Copyright (C) 1997,98 Antonio Larrosa Jimenez and P.J.Leonard
diff --git a/libtdemid/tests/Makefile.am b/libtdemid/tests/Makefile.am
index a00018c62..d70e61547 100644
--- a/libtdemid/tests/Makefile.am
+++ b/libtdemid/tests/Makefile.am
@@ -6,9 +6,9 @@ noinst_PROGRAMS = ctest apitest notesoff
ctest_SOURCES = ctest.c
ctest_LDADD = ../libtdemid.la
-apitest_SOURCES = apitest.cc
+apitest_SOURCES = apitest.cpp
apitest_LDADD = ../libtdemid.la
-notesoff_SOURCES = notesoff.cc
+notesoff_SOURCES = notesoff.cpp
notesoff_LDADD = ../libtdemid.la
diff --git a/libtdemid/tests/apitest.cc b/libtdemid/tests/apitest.cpp
index 7f370331e..7f370331e 100644
--- a/libtdemid/tests/apitest.cc
+++ b/libtdemid/tests/apitest.cpp
diff --git a/libtdemid/tests/notesoff.cc b/libtdemid/tests/notesoff.cpp
index 15e00bd6c..15e00bd6c 100644
--- a/libtdemid/tests/notesoff.cc
+++ b/libtdemid/tests/notesoff.cpp
diff --git a/libtdemid/track.cc b/libtdemid/track.cpp
index c7c858919..116ddb687 100644
--- a/libtdemid/track.cc
+++ b/libtdemid/track.cpp
@@ -1,6 +1,6 @@
/**************************************************************************
- track.cc - class track, which has a midi file track and its events
+ track.cpp - class track, which has a midi file track and its events
This file is part of LibKMid 0.9.5
Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
@@ -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;
diff --git a/libtdemid/voiceman.cc b/libtdemid/voiceman.cpp
index 867ee6024..fddf68f0e 100644
--- a/libtdemid/voiceman.cc
+++ b/libtdemid/voiceman.cpp
@@ -1,6 +1,6 @@
/**************************************************************************
- voiceman.cc - The VoiceManager class handles a set of voices for synths
+ voiceman.cpp - The VoiceManager class handles a set of voices for synths
This file is part of LibKMid 0.9.5
Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-26 09:14:28 +0000