From cb68a7857c80661d242ee5527ec6f99dc3f79fa7 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:17:43 -0600 Subject: [PATCH] Rename a number of libraries and executables to avoid conflicts with KDE4 --- README | 4 +- arts/builder/Makefile.am | 2 +- arts/gui/kde/Makefile.am | 4 +- arts/midi/artsmidi.idl | 2 +- doc/artsbuilder/apis.docbook | 4 +- doc/artsbuilder/faq.docbook | 6 +- doc/{kmid => tdemid}/Makefile.am | 0 doc/{kmid => tdemid}/index.docbook | 100 +++---- juk/Makefile.am | 4 +- kaboodle/Makefile.am | 10 +- kaboodle/engine.h | 2 +- kaboodle/kaboodle_factory.h | 2 +- kaboodle/player.h | 4 +- kaboodle/userinterface.h | 2 +- kaboodle/view.h | 4 +- kaudiocreator/Makefile.am | 4 +- kfile-plugins/au/Makefile.am | 2 +- kfile-plugins/avi/Makefile.am | 2 +- kfile-plugins/flac/Makefile.am | 2 +- kfile-plugins/m3u/Makefile.am | 2 +- kfile-plugins/mp3/Makefile.am | 2 +- kfile-plugins/mpc/Makefile.am | 2 +- kfile-plugins/mpeg/Makefile.am | 2 +- kfile-plugins/ogg/Makefile.am | 2 +- kfile-plugins/sid/Makefile.am | 2 +- kfile-plugins/theora/Makefile.am | 2 +- kfile-plugins/wav/Makefile.am | 2 +- kmid/configure.in.in | 5 - kmid/kmid.spec | 62 ---- kmid/pics/Makefile.am | 3 - krec/Makefile.am | 10 +- krec/krecglobal.cpp | 2 +- kscd/Makefile.am | 4 +- kscd/kscdmagic/Makefile.am | 2 +- noatun/Makefile.am | 2 +- {kmid => tdemid}/ChangeLog | 6 +- {kmid => tdemid}/Makefile.am | 48 +-- {kmid => tdemid}/PEOPLE | 0 {kmid => tdemid}/README | 14 +- {kmid => tdemid}/audiomidi.desktop | 0 {kmid => tdemid}/button1.xpm | 0 {kmid => tdemid}/button2.xpm | 0 {kmid => tdemid}/channel.cpp | 2 +- {kmid => tdemid}/channel.h | 0 {kmid => tdemid}/channel3d.cpp | 0 {kmid => tdemid}/channel3d.h | 0 {kmid => tdemid}/channel4d.cpp | 0 {kmid => tdemid}/channel4d.h | 0 {kmid => tdemid}/channelcfgdlg.cpp | 0 {kmid => tdemid}/channelcfgdlg.h | 0 {kmid => tdemid}/channelview.cpp | 6 +- {kmid => tdemid}/channelview.h | 2 +- {kmid => tdemid}/collectdlg.cpp | 0 {kmid => tdemid}/collectdlg.h | 0 tdemid/configure.in.in | 5 + {kmid => tdemid}/drums.o3 | Bin {kmid => tdemid}/drums.sb | Bin {kmid => tdemid}/examples/DiesIrae.kar | Bin {kmid => tdemid}/examples/Guantanamera.kar | Bin {kmid => tdemid}/examples/Makefile.am | 2 +- .../examples/MariaDeLasMercedes.kar | Bin {kmid => tdemid}/examples/OFortuna.kar | Bin .../hi16-app-tdemid.png | Bin .../hi32-app-tdemid.png | Bin .../hi48-app-tdemid.png | Bin {kmid => tdemid}/history.txt | 76 ++--- {kmid => tdemid}/instrfilter.awk | 0 {kmid => tdemid}/instrname.cpp | 0 {kmid => tdemid}/instrname.h | 0 {kmid => tdemid}/instrname.i18n | 0 {kmid => tdemid}/kdisptext.cpp | 0 {kmid => tdemid}/kdisptext.h | 2 +- {kmid => tdemid}/keyboard.xpm | 0 {kmid => tdemid}/klcdnumber.cpp | 0 {kmid => tdemid}/klcdnumber.h | 0 {kmid => tdemid}/ktrianglebutton.cpp | 0 {kmid => tdemid}/ktrianglebutton.h | 0 {kmid => tdemid}/main.cpp | 20 +- {kmid => tdemid}/maps/Makefile.am | 2 +- {kmid => tdemid}/maps/YamahaPSR500.map | 0 {kmid => tdemid}/maps/YamahaPSS790.map | 0 {kmid => tdemid}/maps/YamahaQY10.map | 0 {kmid => tdemid}/maps/gm.map | 0 {kmid => tdemid}/midicfgdlg.cpp | 2 +- {kmid => tdemid}/midicfgdlg.h | 0 tdemid/pics/Makefile.am | 3 + {kmid => tdemid}/pics/cr16-action-piano.png | Bin {kmid => tdemid}/pics/cr16-action-volume.png | Bin {kmid => tdemid}/pics/cr22-action-piano.png | Bin {kmid => tdemid}/pics/cr22-action-volume.png | Bin {kmid => tdemid}/pics/cr32-action-piano.png | Bin {kmid => tdemid}/pics/cr32-action-volume.png | Bin {kmid => tdemid}/qslidertime.cpp | 0 {kmid => tdemid}/qslidertime.h | 0 {kmid => tdemid}/randomlist.cpp | 0 {kmid => tdemid}/randomlist.h | 0 {kmid => tdemid}/rhythmview.cpp | 0 {kmid => tdemid}/rhythmview.h | 0 {kmid => tdemid}/slman.cpp | 0 {kmid => tdemid}/slman.h | 0 {kmid => tdemid}/songlist.cpp | 0 {kmid => tdemid}/songlist.h | 0 {kmid => tdemid}/std.o3 | Bin {kmid => tdemid}/std.sb | Bin kmid/kmid.desktop => tdemid/tdemid.desktop | 8 +- kmid/kmid.lsm => tdemid/tdemid.lsm | 6 +- tdemid/tdemid.spec | 62 ++++ kmid/kmidIface.h => tdemid/tdemidIface.h | 0 kmid/kmid_part.cpp => tdemid/tdemid_part.cpp | 18 +- kmid/kmid_part.h => tdemid/tdemid_part.h | 8 +- .../kmid_partui.rc => tdemid/tdemid_partui.rc | 2 +- kmid/kmidbutton.h => tdemid/tdemidbutton.h | 0 .../kmidclient.cpp => tdemid/tdemidclient.cpp | 150 +++++----- kmid/kmidclient.h => tdemid/tdemidclient.h | 20 +- kmid/kmidframe.cpp => tdemid/tdemidframe.cpp | 282 +++++++++--------- kmid/kmidframe.h => tdemid/tdemidframe.h | 18 +- kmid/kmidui.rc => tdemid/tdemidui.rc | 2 +- {kmid => tdemid}/version.h | 4 +- {kmid => tdemid}/x-karaoke.desktop | 0 119 files changed, 518 insertions(+), 518 deletions(-) rename doc/{kmid => tdemid}/Makefile.am (100%) rename doc/{kmid => tdemid}/index.docbook (92%) delete mode 100644 kmid/configure.in.in delete mode 100644 kmid/kmid.spec delete mode 100644 kmid/pics/Makefile.am rename {kmid => tdemid}/ChangeLog (92%) rename {kmid => tdemid}/Makefile.am (52%) rename {kmid => tdemid}/PEOPLE (100%) rename {kmid => tdemid}/README (91%) rename {kmid => tdemid}/audiomidi.desktop (100%) rename {kmid => tdemid}/button1.xpm (100%) rename {kmid => tdemid}/button2.xpm (100%) rename {kmid => tdemid}/channel.cpp (99%) rename {kmid => tdemid}/channel.h (100%) rename {kmid => tdemid}/channel3d.cpp (100%) rename {kmid => tdemid}/channel3d.h (100%) rename {kmid => tdemid}/channel4d.cpp (100%) rename {kmid => tdemid}/channel4d.h (100%) rename {kmid => tdemid}/channelcfgdlg.cpp (100%) rename {kmid => tdemid}/channelcfgdlg.h (100%) rename {kmid => tdemid}/channelview.cpp (96%) rename {kmid => tdemid}/channelview.h (98%) rename {kmid => tdemid}/collectdlg.cpp (100%) rename {kmid => tdemid}/collectdlg.h (100%) create mode 100644 tdemid/configure.in.in rename {kmid => tdemid}/drums.o3 (100%) rename {kmid => tdemid}/drums.sb (100%) rename {kmid => tdemid}/examples/DiesIrae.kar (100%) rename {kmid => tdemid}/examples/Guantanamera.kar (100%) rename {kmid => tdemid}/examples/Makefile.am (76%) rename {kmid => tdemid}/examples/MariaDeLasMercedes.kar (100%) rename {kmid => tdemid}/examples/OFortuna.kar (100%) rename kmid/hi16-app-kmid.png => tdemid/hi16-app-tdemid.png (100%) rename kmid/hi32-app-kmid.png => tdemid/hi32-app-tdemid.png (100%) rename kmid/hi48-app-kmid.png => tdemid/hi48-app-tdemid.png (100%) rename {kmid => tdemid}/history.txt (89%) rename {kmid => tdemid}/instrfilter.awk (100%) rename {kmid => tdemid}/instrname.cpp (100%) rename {kmid => tdemid}/instrname.h (100%) rename {kmid => tdemid}/instrname.i18n (100%) rename {kmid => tdemid}/kdisptext.cpp (100%) rename {kmid => tdemid}/kdisptext.h (99%) rename {kmid => tdemid}/keyboard.xpm (100%) rename {kmid => tdemid}/klcdnumber.cpp (100%) rename {kmid => tdemid}/klcdnumber.h (100%) rename {kmid => tdemid}/ktrianglebutton.cpp (100%) rename {kmid => tdemid}/ktrianglebutton.h (100%) rename {kmid => tdemid}/main.cpp (84%) rename {kmid => tdemid}/maps/Makefile.am (72%) rename {kmid => tdemid}/maps/YamahaPSR500.map (100%) rename {kmid => tdemid}/maps/YamahaPSS790.map (100%) rename {kmid => tdemid}/maps/YamahaQY10.map (100%) rename {kmid => tdemid}/maps/gm.map (100%) rename {kmid => tdemid}/midicfgdlg.cpp (99%) rename {kmid => tdemid}/midicfgdlg.h (100%) create mode 100644 tdemid/pics/Makefile.am rename {kmid => tdemid}/pics/cr16-action-piano.png (100%) rename {kmid => tdemid}/pics/cr16-action-volume.png (100%) rename {kmid => tdemid}/pics/cr22-action-piano.png (100%) rename {kmid => tdemid}/pics/cr22-action-volume.png (100%) rename {kmid => tdemid}/pics/cr32-action-piano.png (100%) rename {kmid => tdemid}/pics/cr32-action-volume.png (100%) rename {kmid => tdemid}/qslidertime.cpp (100%) rename {kmid => tdemid}/qslidertime.h (100%) rename {kmid => tdemid}/randomlist.cpp (100%) rename {kmid => tdemid}/randomlist.h (100%) rename {kmid => tdemid}/rhythmview.cpp (100%) rename {kmid => tdemid}/rhythmview.h (100%) rename {kmid => tdemid}/slman.cpp (100%) rename {kmid => tdemid}/slman.h (100%) rename {kmid => tdemid}/songlist.cpp (100%) rename {kmid => tdemid}/songlist.h (100%) rename {kmid => tdemid}/std.o3 (100%) rename {kmid => tdemid}/std.sb (100%) rename kmid/kmid.desktop => tdemid/tdemid.desktop (97%) rename kmid/kmid.lsm => tdemid/tdemid.lsm (71%) create mode 100644 tdemid/tdemid.spec rename kmid/kmidIface.h => tdemid/tdemidIface.h (100%) rename kmid/kmid_part.cpp => tdemid/tdemid_part.cpp (87%) rename kmid/kmid_part.h => tdemid/tdemid_part.h (91%) rename kmid/kmid_partui.rc => tdemid/tdemid_partui.rc (90%) rename kmid/kmidbutton.h => tdemid/tdemidbutton.h (100%) rename kmid/kmidclient.cpp => tdemid/tdemidclient.cpp (92%) rename kmid/kmidclient.h => tdemid/tdemidclient.h (93%) rename kmid/kmidframe.cpp => tdemid/tdemidframe.cpp (69%) rename kmid/kmidframe.h => tdemid/tdemidframe.h (91%) rename kmid/kmidui.rc => tdemid/tdemidui.rc (97%) rename {kmid => tdemid}/version.h (88%) rename {kmid => tdemid}/x-karaoke.desktop (100%) diff --git a/README b/README index 4e8b3ce7..4f3c94c2 100644 --- a/README +++ b/README @@ -13,8 +13,8 @@ What it is * aktion: a player specialiced on movies, needs xanim * kaudiocreator: CD ripper and audio encoder frontend. * kaboodle: light media player -* kmid: A standalone and embeddable midi player, includes a karaoke-mode -* kmidi: midi player, can use sound patch files and create a WAV file +* tdemid: A standalone and embeddable midi player, includes a karaoke-mode +* tdemidi: midi player, can use sound patch files and create a WAV file * kmix: the audio mixer as a standalone program and Kicker applet * kscd: A CD player with an interface to the internet CDDB database * krec: A recording frontend using aRts diff --git a/arts/builder/Makefile.am b/arts/builder/Makefile.am index 52682a56..fb4af798 100644 --- a/arts/builder/Makefile.am +++ b/arts/builder/Makefile.am @@ -21,7 +21,7 @@ noinst_HEADERS = qttableview.h METASOURCES = AUTO -artsbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl +artsbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lmcop -lartsflow_idl # the libraries to link against. Be aware of the order. First the libraries, # that depend on the following ones. diff --git a/arts/gui/kde/Makefile.am b/arts/gui/kde/Makefile.am index 78003d15..d772e884 100644 --- a/arts/gui/kde/Makefile.am +++ b/arts/gui/kde/Makefile.am @@ -23,12 +23,12 @@ libartsgui_kde_la_COMPILE_FIRST = ../common/artsgui.h artstestgui_SOURCES = artstestgui.cpp artstestgui_LDADD = -lqtmcop -ltdecore -lartsflow \ $(top_builddir)/arts/gui/common/libartsgui_idl.la -artstestgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +artstestgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor dbtest_SOURCES = dbtest.cpp dbtest_LDADD = -lqtmcop -ltdecore -lartsflow \ $(top_builddir)/arts/gui/kde/libartsgui_kde.la -dbtest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +dbtest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor libartsgui_kde_la_METASOURCES = AUTO diff --git a/arts/midi/artsmidi.idl b/arts/midi/artsmidi.idl index 70157d95..ce1c5891 100644 --- a/arts/midi/artsmidi.idl +++ b/arts/midi/artsmidi.idl @@ -36,7 +36,7 @@ module Arts { /* This is modelled somewhat after - the AudioManager concept - the aRts-0.3.4.1 MidiPort concept - - libkmid + - libtdemid It adds timing as new feature compared to older implementation, and also tries to do the full set of midi operations. diff --git a/doc/artsbuilder/apis.docbook b/doc/artsbuilder/apis.docbook index fcc036e2..8227f35f 100644 --- a/doc/artsbuilder/apis.docbook +++ b/doc/artsbuilder/apis.docbook @@ -203,8 +203,8 @@ Not yet written - -libkmid + +libtdemid Not yet written diff --git a/doc/artsbuilder/faq.docbook b/doc/artsbuilder/faq.docbook index 31590286..8bb7ae4c 100644 --- a/doc/artsbuilder/faq.docbook +++ b/doc/artsbuilder/faq.docbook @@ -198,7 +198,7 @@ you need to do is add the users to this group. -This helps for &artsd;, but what about &kmix;, &kmid;, &kscd;,&etc;? +This helps for &artsd;, but what about &kmix;, &tdemid;, &kscd;,&etc;? @@ -443,8 +443,8 @@ Obviously, all of the applications included with &kde; are &noatun; &arts-builder; &aktion; -&kmid; -&kmidi; +&tdemid; +&tdemidi; &kmix; &kscd; &kde; games such as &kpoker; and diff --git a/doc/kmid/Makefile.am b/doc/tdemid/Makefile.am similarity index 100% rename from doc/kmid/Makefile.am rename to doc/tdemid/Makefile.am diff --git a/doc/kmid/index.docbook b/doc/tdemid/index.docbook similarity index 92% rename from doc/kmid/index.docbook rename to doc/tdemid/index.docbook index bcfaecb1..b08a1d9a 100644 --- a/doc/kmid/index.docbook +++ b/doc/tdemid/index.docbook @@ -1,6 +1,6 @@ + @@ -9,7 +9,7 @@ -The &kmid; Handbook +The &tdemid; Handbook Antonio @@ -31,7 +31,7 @@ -&kmid; is a midi/karaoke multimedia player +&tdemid; is a midi/karaoke multimedia player @@ -55,40 +55,40 @@ Introduction -&kmid; is &kde;'s midi and karaoke multimedia player. It features some +&tdemid; is &kde;'s midi and karaoke multimedia player. It features some features not found in any other &UNIX; midi player, such as realtime graphics and karaoke text highlighting among others. -&kmid; has been reported to run on &Linux; and FreeBSD operating +&tdemid; has been reported to run on &Linux; and FreeBSD operating systems. It uses the OSS sound driver, so it should run on every system where &kde; and OSS -compile. &kmid; also supports the &Linux; Ultrasound Project Driver , +compile. &tdemid; also supports the &Linux; Ultrasound Project Driver , which is required to get sound in GUS cards. I plan to support the ALSA driver as soon as it supports a sequencer device. -&kmid; shows the lyrics in the screen changing its color at the same +&tdemid; shows the lyrics in the screen changing its color at the same time the music is playing, so it is very easy to follow the tune of the songs. -Hope you find &kmid; as fun to use as I found developing it. +Hope you find &tdemid; as fun to use as I found developing it. Antonio Larrosa Jiménez larrosa@kde.org - -&kmid;'s features + +&tdemid;'s features -These are some of &kmid;'s main features: +These are some of &tdemid;'s main features: @@ -200,12 +200,12 @@ open dialog, with which you can select the song you wish to open. -You can drag a file from a &konqueror; window and drop it in the &kmid; window. +You can drag a file from a &konqueror; window and drop it in the &tdemid; window. You can also Drag & Drop multiple songs at the same time. -If you specify a song in the command line when running &kmid;, it will also be +If you specify a song in the command line when running &tdemid;, it will also be opened. @@ -227,13 +227,13 @@ menu, or just press the Space key. -Note that when you open a file using Drag & Drop, &kmid; will start +Note that when you open a file using Drag & Drop, &tdemid; will start playing it automatically (if you drop more than one file, they will be added to a collection and they will be played sequentially). -Once &kmid; is playing a song, you can move the time slider, by pressing +Once &tdemid; is playing a song, you can move the time slider, by pressing with the &MMB; mouse button, to go to a specified position. @@ -250,7 +250,7 @@ playing, and you press the Space key, it will act as when you press on the pause button or the Pause entry of the Song menu, that is, it will pause music. If you press the -Space key when no music is being played, &kmid; will +Space key when no music is being played, &tdemid; will play it. @@ -267,7 +267,7 @@ use both of them, and some don't include lyrics :-) -&kmid; lets you choose which events to display, and even better, it has +&tdemid; lets you choose which events to display, and even better, it has an option to automatically select the type of events that a song uses, so that you don't have to change the type manually . That way, if you activate the Automatic Text Chooser entry of @@ -403,7 +403,7 @@ collection. -When you select Shuffle mode, &kmid; will +When you select Shuffle mode, &tdemid; will generate a random variable with a discrete uniform distribution to really play randomly the songs in the collection . It will give values to that random variable while generating the list in which order the @@ -456,7 +456,7 @@ on Delete. Easy, it isn't? Please keep in mind that you cannot delete the Temporary Collection, but -it doesn't matter as it is not saved when you quit &kmid;. +it doesn't matter as it is not saved when you quit &tdemid;. @@ -526,7 +526,7 @@ when you finish it, because then you will find all the hidden possibilities of your keyboard. For example, I have a low-cost Yamaha PSS-790, which is not GM compatible, and doesn't has as many instruments as a GM synthesizer, but with -&kmid;'s midi mapper, it sounds even better than many soundcards +&tdemid;'s midi mapper, it sounds even better than many soundcards (including AWE :-)), due to the sound quality found in external synths (even on non GM compliant ones). @@ -596,7 +596,7 @@ You can put comments by starting the line with a Please, don't forget to send me your map file by email, so that future -releases of &kmid; will include support for more non General Midi +releases of &tdemid; will include support for more non General Midi compliant keyboards. @@ -926,7 +926,7 @@ playing. &Ctrl;Q -Quit &kmid; +Quit &tdemid; F1 @@ -962,12 +962,12 @@ given staff can be played very differently by two different musicians. -I can get better sound with a mp3/wav player, why should I use &kmid;? +I can get better sound with a mp3/wav player, why should I use &tdemid;? -Well, I cannot force anyone to use &kmid;, but a typical midi file +Well, I cannot force anyone to use &tdemid;, but a typical midi file occupies 50 Kb. while a typical mp3 file occupies 4 Mb. (and that is a 1:80 compression ratio :-) . And with a good synthesizer device, you can get a comparable sound quality. Even more, with a midi file, you can @@ -985,10 +985,10 @@ I can't get my AWE card to work with KMid, what can I do? -This can happen when you get a binary distribution (rpm, deb) of &kmid;. It -happens because &kmid; was compiled without awe support. If it doesn't +This can happen when you get a binary distribution (rpm, deb) of &tdemid;. It +happens because &tdemid; was compiled without awe support. If it doesn't work, then you must download a source code distribution (for example, from -&kmid;'s homepage) +&tdemid;'s homepage) @@ -1003,9 +1003,9 @@ files one by one is not funny. -I agree, that's why &kmid; supports Drag & Drop. Just open, in &konqueror;, +I agree, that's why &tdemid; supports Drag & Drop. Just open, in &konqueror;, the folder you want to add, select all the files, drag them and drop them in -&kmid;. +&tdemid;. Be sure to set the AutoAdd to Collection option before, so that the @@ -1041,7 +1041,7 @@ get the default tempo. I will include some tips so that you can take fully advantage from all -the features of &kmid;: +the features of &tdemid;: @@ -1049,11 +1049,11 @@ the features of &kmid;: Opening files I always keep a &kde; desktop with a &konqueror; window in my root -midi folder, and &kmid; in this desktop (if playing a midi file) or +midi folder, and &tdemid; in this desktop (if playing a midi file) or sticky (if playing a karaoke file :-)). This way, when the active collection finishes, or I want to play some file, I just go to the konqueror; window, select the desired files and Drag & Drop to the -&kmid;'s window. +&tdemid;'s window. @@ -1091,7 +1091,7 @@ point, you can open the Organize Collections dialog, select the Temporary Collection, and click on the Copy button, enter the name of the new collection, and you are done . You already have a new collection, which holds the -A,B and C midi files, and that is not deleted when you close &kmid;. +A,B and C midi files, and that is not deleted when you close &tdemid;. @@ -1099,13 +1099,13 @@ A,B and C midi files, and that is not deleted when you close &kmid;. - -Hall of &kmid;'s friends + +Hall of &tdemid;'s friends These are some folks who have sent me midi files or a postcard, thanks to everyone! Hearing those songs and watching those postcards will keep -me programming more and more on &kmid;. +me programming more and more on &tdemid;. @@ -1135,7 +1135,7 @@ Turner Overdrive) About the author -&kmid; has been made by Antonio Larrosa Jiménez, in Málaga +&tdemid; has been made by Antonio Larrosa Jiménez, in Málaga (Spain). I am a student of Mathematics at the University of Málaga, currently I'm doing the third course, so I don't have much free time for my hobbies, but I always try to get some :-) . My @@ -1146,7 +1146,7 @@ proving theorems ;-). If you want to know where to download midi/karaoke files, you have any question, a bug to report, an idea or a feature you'd like to see in -&kmid; or just want to make me happy, feel free to send me an email to: +&tdemid; or just want to make me happy, feel free to send me an email to: larrosa@kde.org or antlarr@arrakis.es @@ -1162,13 +1162,13 @@ Malaga (Spain) You will really make me happy if you send me a postcard from where you live, or a midi/karaoke file from a local music group of your country . Everyone who sends me a postcard or a midi file will have his/her name -in the Hall of &kmid;'s friends of this file (provided they don't oppose +in the Hall of &tdemid;'s friends of this file (provided they don't oppose to this). Please contact me before sending me any midi files because I may have it already. -I'd like stress that &kmid; has been done completely on free time, +I'd like stress that &tdemid; has been done completely on free time, without any monetary support from any company nor particular. So please keep in mind when you use it, that the only think that keep me working on this is getting some feedback from its users (a postcard, or just an @@ -1176,7 +1176,7 @@ email). -I would like to thanks the following persons their help in developing &kmid;: +I would like to thanks the following persons their help in developing &tdemid;: @@ -1250,7 +1250,7 @@ us those wonderful midi and karaoke files. Copyrights and License -&kmid; is copyright Antonio Larrosa Jiménez, 1999-2001 +&tdemid; is copyright Antonio Larrosa Jiménez, 1999-2001 Documentation is copyright Antonio Larrosa Jiménez 1999, 2001 @@ -1265,15 +1265,15 @@ us those wonderful midi and karaoke files. Installation - -How to obtain &kmid; + +How to obtain &tdemid; &install.intro.documentation; -Additionally, &kmid; can be found on its homepage, which is at -http://www.arrakis.es/~rlarrosa/kmid.html. In the homepage, you can +Additionally, &tdemid; can be found on its homepage, which is at +http://www.arrakis.es/~rlarrosa/tdemid.html. In the homepage, you can follow its development, see some information about it, some screenshots, a list of sites from where you can download more karaoke songs, &etc; @@ -1283,7 +1283,7 @@ of sites from where you can download more karaoke songs, &etc; Requirements -&kmid; requires to work: +&tdemid; requires to work: @@ -1300,7 +1300,7 @@ AWE card. -If you don't have a soundcard, you can still compile &kmid; with +If you don't have a soundcard, you can still compile &tdemid; with MODE_DEMO_ONLYVISUAL defined and it will run as if you had one (but you'll get no music, of course :-( ). @@ -1316,7 +1316,7 @@ you had one (but you'll get no music, of course :-( ). I've included some examples that are installed in $dollar;TDEDIR/share/apps/kmid +class="directory">$dollar;TDEDIR/share/apps/tdemid diff --git a/juk/Makefile.am b/juk/Makefile.am index 2422be5d..ff1ceb64 100644 --- a/juk/Makefile.am +++ b/juk/Makefile.am @@ -85,12 +85,12 @@ endif ################################################## juk_LDADD = -lm $(LDADD_GST) $(mblibs) $(LIB_KIO) $(taglib_libs) $(akode_libs) $(LIB_KHTML) $(LIB_ARTS) -juk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDFLAGS_GST) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl $(akode_libs) +juk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDFLAGS_GST) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl $(akode_libs) KDE_CXXFLAGS = $(USE_EXCEPTIONS) tagguessertest_LDADD = $(LIB_TDECORE) -tagguessertest_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl +tagguessertest_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl SUBDIRS = pics diff --git a/kaboodle/Makefile.am b/kaboodle/Makefile.am index 0c1a0cee..1f39c8f4 100644 --- a/kaboodle/Makefile.am +++ b/kaboodle/Makefile.am @@ -12,11 +12,11 @@ libkaboodle_noinst_la_SOURCES = conf.cpp \ view.cpp \ kaboodle_factory.cpp -libs = $(LIB_KPARTS) -lqtmcop -lkmedia2_idl -lsoundserver_idl -lartskde -lkmediaplayer +libs = $(LIB_KPARTS) -lqtmcop -lkmedia2_idl -lsoundserver_idl -lartskde -ltdemediaplayer libkaboodlepart_la_SOURCES = dummy.cpp -libkaboodlepart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -libkaboodlepart_la_LIBADD = libkaboodle_noinst.la $(libs) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl +libkaboodlepart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl +libkaboodlepart_la_LIBADD = libkaboodle_noinst.la $(libs) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl kaboodle_SOURCES = main.cpp \ kaboodleapp.cpp \ @@ -27,8 +27,8 @@ dummy.cpp: CLEANFILES = dummy.cpp -kaboodle_LDADD = libkaboodle_noinst.la $(libs) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -kaboodle_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl +kaboodle_LDADD = libkaboodle_noinst.la $(libs) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl +kaboodle_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl bin_PROGRAMS = kaboodle diff --git a/kaboodle/engine.h b/kaboodle/engine.h index b4d1b24b..974a8541 100644 --- a/kaboodle/engine.h +++ b/kaboodle/engine.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include #include namespace Arts diff --git a/kaboodle/kaboodle_factory.h b/kaboodle/kaboodle_factory.h index 7a85afb8..ca00c084 100644 --- a/kaboodle/kaboodle_factory.h +++ b/kaboodle/kaboodle_factory.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include namespace Kaboodle { diff --git a/kaboodle/player.h b/kaboodle/player.h index 67bc2e65..f269dbbf 100644 --- a/kaboodle/player.h +++ b/kaboodle/player.h @@ -25,8 +25,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define PLAYER_H #include -#include -#include +#include +#include #include #include #include diff --git a/kaboodle/userinterface.h b/kaboodle/userinterface.h index 90a18ad0..f786ad81 100644 --- a/kaboodle/userinterface.h +++ b/kaboodle/userinterface.h @@ -27,7 +27,7 @@ #include "kaboodleapp.h" #include -#include +#include #include #include "player.h" diff --git a/kaboodle/view.h b/kaboodle/view.h index 59c26358..9b4e8fba 100644 --- a/kaboodle/view.h +++ b/kaboodle/view.h @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef KABOODLEVIEW_H #define KABOODLEVIEW_H -#include -#include +#include +#include #include #include #include diff --git a/kaudiocreator/Makefile.am b/kaudiocreator/Makefile.am index aa30ce8a..ba0f65ad 100644 --- a/kaudiocreator/Makefile.am +++ b/kaudiocreator/Makefile.am @@ -12,7 +12,7 @@ kaudiocreator_SOURCES = main.cpp kaudiocreator.cpp encoder.cpp \ EXTRA_DIST = encoder.h kaudiocreator.h kaudiocreator.desktop encoderconfigimp.h \ obqueimp.h ripper.h tracksimp.h encodefileimp.h -kaudiocreator_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lkutils $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kaudiocreator_LDFLAGS = $(all_libraries) $(KDE_RPATH) -ltdeutils $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor METASOURCES = AUTO @@ -20,7 +20,7 @@ messages: rc.cpp $(XGETTEXT) *.cpp *.h -o $(podir)/kaudiocreator.pot kaudiocreator_LDADD = $(LIB_KIO) $(top_builddir)/libkcddb/libkcddb.la \ - $(top_builddir)/kscd/libkcompactdisc.la $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor + $(top_builddir)/kscd/libkcompactdisc.la $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor KDE_ICON = AUTO diff --git a/kfile-plugins/au/Makefile.am b/kfile-plugins/au/Makefile.am index 77647de3..f9a1649b 100644 --- a/kfile-plugins/au/Makefile.am +++ b/kfile-plugins/au/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = kfile_au.h kde_module_LTLIBRARIES = kfile_au.la kfile_au_la_SOURCES = kfile_au.cpp -kfile_au_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -module $(KDE_PLUGIN) +kfile_au_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -module $(KDE_PLUGIN) kfile_au_la_LIBADD = $(LIB_KIO) # let automoc handle all of the meta source files (moc) diff --git a/kfile-plugins/avi/Makefile.am b/kfile-plugins/avi/Makefile.am index 0577f2fe..43590f82 100644 --- a/kfile-plugins/avi/Makefile.am +++ b/kfile-plugins/avi/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = kfile_avi.h kde_module_LTLIBRARIES = kfile_avi.la kfile_avi_la_SOURCES = kfile_avi.cpp -kfile_avi_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -module $(KDE_PLUGIN) +kfile_avi_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -module $(KDE_PLUGIN) kfile_avi_la_LIBADD = $(LIB_KIO) # let automoc handle all of the meta source files (moc) diff --git a/kfile-plugins/flac/Makefile.am b/kfile-plugins/flac/Makefile.am index 2b091517..34a0ffb3 100644 --- a/kfile-plugins/flac/Makefile.am +++ b/kfile-plugins/flac/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = kfile_flac.h kde_module_LTLIBRARIES = kfile_flac.la kfile_flac_la_SOURCES = kfile_flac.cpp -kfile_flac_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(taglib_libs) -module $(KDE_PLUGIN) +kfile_flac_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(taglib_libs) -module $(KDE_PLUGIN) kfile_flac_la_LIBADD = $(LIB_KIO) # let automoc handle all of the meta source files (moc) diff --git a/kfile-plugins/m3u/Makefile.am b/kfile-plugins/m3u/Makefile.am index a6289c6b..11b59685 100644 --- a/kfile-plugins/m3u/Makefile.am +++ b/kfile-plugins/m3u/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = kfile_m3u.h kde_module_LTLIBRARIES = kfile_m3u.la kfile_m3u_la_SOURCES = kfile_m3u.cpp -kfile_m3u_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -module $(KDE_PLUGIN) +kfile_m3u_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -module $(KDE_PLUGIN) kfile_m3u_la_LIBADD = $(LIB_KSYCOCA) # let automoc handle all of the meta source files (moc) diff --git a/kfile-plugins/mp3/Makefile.am b/kfile-plugins/mp3/Makefile.am index 71f8239b..0c238b67 100644 --- a/kfile-plugins/mp3/Makefile.am +++ b/kfile-plugins/mp3/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = kfile_mp3.h kde_module_LTLIBRARIES = kfile_mp3.la kfile_mp3_la_SOURCES = kfile_mp3.cpp -kfile_mp3_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(taglib_libs) -module $(KDE_PLUGIN) +kfile_mp3_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(taglib_libs) -module $(KDE_PLUGIN) kfile_mp3_la_LIBADD = $(LIB_KIO) # let automoc handle all of the meta source files (moc) diff --git a/kfile-plugins/mpc/Makefile.am b/kfile-plugins/mpc/Makefile.am index 89b04866..11a639e7 100644 --- a/kfile-plugins/mpc/Makefile.am +++ b/kfile-plugins/mpc/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = kfile_mpc.h kde_module_LTLIBRARIES = kfile_mpc.la kfile_mpc_la_SOURCES = kfile_mpc.cpp -kfile_mpc_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(taglib_libs) -module $(KDE_PLUGIN) +kfile_mpc_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(taglib_libs) -module $(KDE_PLUGIN) kfile_mpc_la_LIBADD = $(LIB_KIO) # let automoc handle all of the meta source files (moc) diff --git a/kfile-plugins/mpeg/Makefile.am b/kfile-plugins/mpeg/Makefile.am index 7b5392b6..00b40647 100644 --- a/kfile-plugins/mpeg/Makefile.am +++ b/kfile-plugins/mpeg/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = kfile_mpeg.h kde_module_LTLIBRARIES = kfile_mpeg.la kfile_mpeg_la_SOURCES = kfile_mpeg.cpp -kfile_mpeg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -module $(KDE_PLUGIN) +kfile_mpeg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -module $(KDE_PLUGIN) kfile_mpeg_la_LIBADD = $(LIB_KIO) # let automoc handle all of the meta source files (moc) diff --git a/kfile-plugins/ogg/Makefile.am b/kfile-plugins/ogg/Makefile.am index a5080db7..b53709a8 100644 --- a/kfile-plugins/ogg/Makefile.am +++ b/kfile-plugins/ogg/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = kfile_ogg.h kde_module_LTLIBRARIES = kfile_ogg.la kfile_ogg_la_SOURCES = kfile_ogg.cpp vcedit.c -kfile_ogg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -module $(KDE_PLUGIN) +kfile_ogg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -module $(KDE_PLUGIN) kfile_ogg_la_LIBADD = $(LIB_KIO) -logg -lvorbis -lvorbisfile # let automoc handle all of the meta source files (moc) diff --git a/kfile-plugins/sid/Makefile.am b/kfile-plugins/sid/Makefile.am index 834236b4..8f7d59be 100644 --- a/kfile-plugins/sid/Makefile.am +++ b/kfile-plugins/sid/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = kfile_sid.h kde_module_LTLIBRARIES = kfile_sid.la kfile_sid_la_SOURCES = kfile_sid.cpp -kfile_sid_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -module $(KDE_PLUGIN) +kfile_sid_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -module $(KDE_PLUGIN) kfile_sid_la_LIBADD = $(LIB_KIO) # let automoc handle all of the meta source files (moc) diff --git a/kfile-plugins/theora/Makefile.am b/kfile-plugins/theora/Makefile.am index 9b0d73d3..a2495cec 100644 --- a/kfile-plugins/theora/Makefile.am +++ b/kfile-plugins/theora/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = kfile_theora.h kde_module_LTLIBRARIES = kfile_theora.la kfile_theora_la_SOURCES = kfile_theora.cpp -kfile_theora_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -module $(KDE_PLUGIN) +kfile_theora_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -module $(KDE_PLUGIN) kfile_theora_la_LIBADD = $(LIB_KIO) -logg -lvorbis -ltheora # let automoc handle all of the meta source files (moc) diff --git a/kfile-plugins/wav/Makefile.am b/kfile-plugins/wav/Makefile.am index 05843fb3..5254d014 100644 --- a/kfile-plugins/wav/Makefile.am +++ b/kfile-plugins/wav/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = kfile_wav.h kde_module_LTLIBRARIES = kfile_wav.la kfile_wav_la_SOURCES = kfile_wav.cpp -kfile_wav_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -module $(KDE_PLUGIN) +kfile_wav_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -module $(KDE_PLUGIN) kfile_wav_la_LIBADD = $(LIB_KIO) # let automoc handle all of the meta source files (moc) diff --git a/kmid/configure.in.in b/kmid/configure.in.in deleted file mode 100644 index f1e1d100..00000000 --- a/kmid/configure.in.in +++ /dev/null @@ -1,5 +0,0 @@ -KDE_CHECK_HEADER([libkmid/libkmid.h], [kde_mid_compiles=yes], [kde_mid_compiles=no]) -if test $kde_mid_compiles = no; then - DO_NOT_COMPILE="$DO_NOT_COMPILE kmid" -fi - diff --git a/kmid/kmid.spec b/kmid/kmid.spec deleted file mode 100644 index 1c178c1a..00000000 --- a/kmid/kmid.spec +++ /dev/null @@ -1,62 +0,0 @@ -Summary: Play midi/karaoke files and show lyrics. Support External synths, AWE, GUS, and FM devices. For X11/KDE -Name: kmid -Version: 1.2 -Release: 1 -Copyright: GPL -Group: X11/K Desktop Environment/Multimedia -Source: kmid-1.2.tar.gz -Requires: qt >= 1.3 , tdelibs - -%description -KMid is a midi/karaoke file player, with configurable midi mapper, -real Session Management, drag & drop, customizable fonts, etc. -It has a very nice interface which let you easily follow the tune while -changing the color of the lyrics. -It supports output through external synthesizers, AWE, FM and GUS cards. -It also has a keyboard view to see the notes played by each instrument - -%prep -%setup - -%build -export TDEDIR=/opt/kde -./configure -make all - -%install -export TDEDIR=/opt/kde -make install - -%files -%doc kmid/README kmid/COPYING kmid/PEOPLE kmid/kmid.lsm kmid/ChangeLog - -/opt/kde/bin/kmid -/opt/kde/share/doc/tde/HTML/en/kmid -/opt/kde/share/doc/tde/HTML/es/kmid -/opt/kde/share/icons/kmid.xpm -/opt/kde/share/icons/mini/kmid.xpm -/opt/kde/share/applnk/Multimedia/kmid.kdelnk -/opt/kde/share/mimelnk/audio/x-karaoke.kdelnk -/opt/kde/share/apps/kmid/toolbar -/opt/kde/share/apps/kmid/fm -/opt/kde/share/apps/kmid/maps/gm.map -/opt/kde/share/apps/kmid/maps/YamahaPSS790.map -/opt/kde/share/apps/kmid/maps/YamahaPSR500.map -/opt/kde/share/apps/kmid/OFortuna.kar -/opt/kde/share/apps/kmid/StopInTheNameOfLove.kar -/opt/kde/share/apps/kmid/TheGirlFromIpanema.kar -/opt/kde/share/apps/kmid/AnotherGlitchInTheCall.kar -/opt/kde/share/locale/es/LC_MESSAGES/kmid.mo -/opt/kde/share/locale/cs/LC_MESSAGES/kmid.mo -/opt/kde/share/locale/de/LC_MESSAGES/kmid.mo -/opt/kde/share/locale/fi/LC_MESSAGES/kmid.mo -/opt/kde/share/locale/hr/LC_MESSAGES/kmid.mo -/opt/kde/share/locale/pl/LC_MESSAGES/kmid.mo -/opt/kde/share/locale/pt/LC_MESSAGES/kmid.mo -/opt/kde/share/locale/sk/LC_MESSAGES/kmid.mo -/opt/kde/share/locale/eo/LC_MESSAGES/kmid.mo -/opt/kde/share/locale/no/LC_MESSAGES/kmid.mo -/opt/kde/share/locale/sv/LC_MESSAGES/kmid.mo -/opt/kde/share/locale/pt_BR/LC_MESSAGES/kmid.mo -/opt/kde/share/locale/zh_CN.GB2312/LC_MESSAGES/kmid.mo -/opt/kde/share/locale/zh_TW.Big5/LC_MESSAGES/kmid.mo diff --git a/kmid/pics/Makefile.am b/kmid/pics/Makefile.am deleted file mode 100644 index 4bf75950..00000000 --- a/kmid/pics/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -kmidicondir = $(kde_datadir)/kmid/icons -kmidicon_ICON = AUTO - diff --git a/krec/Makefile.am b/krec/Makefile.am index a8091776..87c36f78 100644 --- a/krec/Makefile.am +++ b/krec/Makefile.am @@ -42,7 +42,7 @@ krec_la_SOURCES = \ main.cpp \ krecord.cpp -krec_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects +krec_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects krec_la_LIBADD = \ lib_krec_common.la \ $(top_builddir)/arts/gui/kde/libartsgui_kde.la \ @@ -50,12 +50,12 @@ krec_la_LIBADD = \ -lartskde $(LIBDL) $(LIB_KIO) $(LIB_TDEUI) $(LIB_KUTILS) kcm_krec_la_SOURCES = krecconfigure.cpp -kcm_krec_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects +kcm_krec_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects kcm_krec_la_LIBADD = lib_krec_common.la $(LIB_KUTILS) kcm_krec_files_la_SOURCES = krecconfig_files.cpp -kcm_krec_files_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects +kcm_krec_files_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects kcm_krec_files_la_LIBADD = lib_krec_common.la $(LIB_KUTILS) @@ -64,12 +64,12 @@ lib_krec_common_la_SOURCES = \ krecexport_template.cpp \ krecconfig_fileswidget.cpp -lib_krec_common_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects +lib_krec_common_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects lib_krec_common_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) libkrecexport_wave_la_SOURCES = krecexport_wave.cpp -libkrecexport_wave_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects +libkrecexport_wave_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects libkrecexport_wave_la_LIBADD = lib_krec_common.la diff --git a/krec/krecglobal.cpp b/krec/krecglobal.cpp index 6b55a075..984048d2 100644 --- a/krec/krecglobal.cpp +++ b/krec/krecglobal.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include diff --git a/kscd/Makefile.am b/kscd/Makefile.am index d782683a..952aae9a 100644 --- a/kscd/Makefile.am +++ b/kscd/Makefile.am @@ -23,9 +23,9 @@ libkcompactdisc_la_LDFLAGS = $(all_libraries) -lpthread kde_kcfg_DATA = kscd.kcfg -kscd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kscd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kscd_LDADD = $(LIBCDROM) $(LIBCDAUDIO) \ - $(LIBFPE) $(LIB_KIO) -lkutils $(top_builddir)/libkcddb/libkcddb.la \ + $(LIBFPE) $(LIB_KIO) -ltdeutils $(top_builddir)/libkcddb/libkcddb.la \ libkcompactdisc.la -lpthread profiledata_DATA = kscd.profile.xml diff --git a/kscd/kscdmagic/Makefile.am b/kscd/kscdmagic/Makefile.am index 27c9454d..cf24f2bf 100644 --- a/kscd/kscdmagic/Makefile.am +++ b/kscd/kscdmagic/Makefile.am @@ -26,7 +26,7 @@ bin_PROGRAMS = kscdmagic kscdmagic_SOURCES = core.cpp main.cpp sound.cpp xlibwrap.cpp xlib.c # the library search path. -kscdmagic_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kscdmagic_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor # the libraries to link against. Be aware of the order. First the libraries, # that depend on the following ones. diff --git a/noatun/Makefile.am b/noatun/Makefile.am index f64f6d5e..91b80b87 100644 --- a/noatun/Makefile.am +++ b/noatun/Makefile.am @@ -16,7 +16,7 @@ kconfdir = $(libdir)/kconf_update_bin kconf_PROGRAMS = noatun20update noatun20update_SOURCES = noatun20update.cpp -noatun20update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +noatun20update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor noatun20update_LDADD = $(LIB_QT) messages: diff --git a/kmid/ChangeLog b/tdemid/ChangeLog similarity index 92% rename from kmid/ChangeLog rename to tdemid/ChangeLog index 6914c1d0..46db02d8 100644 --- a/kmid/ChangeLog +++ b/tdemid/ChangeLog @@ -50,7 +50,7 @@ More keys binded to functions (arrows, space, backspace, etc.) ----- ------- Improved Synchronization between gui and player Some bug fixes: - - One which caused kmid to freeze when playing a collection with only 1 song + - One which caused tdemid to freeze when playing a collection with only 1 song in aleatory mode and changing to next song (reported by Jose Luis Sanchez) - It was not possible to play a gzipped file that have spaces in its name @@ -77,7 +77,7 @@ It also has some bug fixes and support for really broken midi files. 1.6 27-11-98 ----- -------- -This version fix a bug that made kmid totally unusable to many users +This version fix a bug that made tdemid totally unusable to many users because it played music at different tempos (sometimes faster and sometimes slower), without any rhythm. Anyway, this isn't a public version yet, it's only available from CVS. @@ -90,7 +90,7 @@ continue playing music for a while (up to a few minutes !) after the user had pressed the stop button. Fixed a problem with AWE cards that made it play files with the pitch bender raised. -Fixed a problem that made kmid not to play the last few milliseconds of +Fixed a problem that made tdemid not to play the last few milliseconds of some songs (sometimes up to half a second) Another usual fixes (better support for kernel modules, workarounds for compiler bugs, etc.) diff --git a/kmid/Makefile.am b/tdemid/Makefile.am similarity index 52% rename from kmid/Makefile.am rename to tdemid/Makefile.am index 6ac77820..fe582e8b 100644 --- a/kmid/Makefile.am +++ b/tdemid/Makefile.am @@ -1,38 +1,38 @@ INCLUDES = $(all_includes) -kde_module_LTLIBRARIES = libkmidpart.la -lib_LTLIBRARIES = libkmidlib.la +kde_module_LTLIBRARIES = libtdemidpart.la +lib_LTLIBRARIES = libtdemidlib.la -libkmidlib_la_LDFLAGS = $(all_libraries) -libkmidlib_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KIO) -lkmid $(LIB_QT) $(LIB_TDEUI) -lDCOP $(LIB_TDECORE) +libtdemidlib_la_LDFLAGS = $(all_libraries) +libtdemidlib_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KIO) -ltdemid $(LIB_QT) $(LIB_TDEUI) -lDCOP $(LIB_TDECORE) -libkmidpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -libkmidpart_la_LIBADD = libkmidlib.la +libtdemidpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +libtdemidpart_la_LIBADD = libtdemidlib.la -libkmidlib_la_SOURCES = kmidframe.cpp kmidclient.cpp kdisptext.cpp \ +libtdemidlib_la_SOURCES = tdemidframe.cpp tdemidclient.cpp kdisptext.cpp \ qslidertime.cpp klcdnumber.cpp ktrianglebutton.cpp \ midicfgdlg.cpp collectdlg.cpp randomlist.cpp \ channelview.cpp channel.cpp channel3d.cpp channel4d.cpp \ channelcfgdlg.cpp instrname.cpp rhythmview.cpp \ - songlist.cpp slman.cpp kmid_part.cpp kmidIface.skel + songlist.cpp slman.cpp tdemid_part.cpp tdemidIface.skel -libkmidpart_la_SOURCES = part_dummy.cpp +libtdemidpart_la_SOURCES = part_dummy.cpp part_dummy.cpp: touch part_dummy.cpp -noinst_HEADERS = kmidframe.h kmidclient.h kdisptext.h \ +noinst_HEADERS = tdemidframe.h tdemidclient.h kdisptext.h \ qslidertime.h klcdnumber.h ktrianglebutton.h \ midicfgdlg.h collectdlg.h randomlist.h \ channelview.h channel.h channel3d.h channel4d.h \ channelcfgdlg.h instrname.h rhythmview.h \ - songlist.h slman.h kmid_part.h + songlist.h slman.h tdemid_part.h -kmid_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -kmid_SOURCES = main.cpp -kmid_LDADD = libkmidlib.la +tdemid_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +tdemid_SOURCES = main.cpp +tdemid_LDADD = libtdemidlib.la -bin_PROGRAMS = kmid +bin_PROGRAMS = tdemid METASOURCES = AUTO servicetype_DATA = audiomidi.desktop @@ -40,24 +40,24 @@ servicetypedir = $(kde_servicetypesdir) SUBDIRS = maps examples pics -xdg_apps_DATA = kmid.desktop +xdg_apps_DATA = tdemid.desktop mime_DATA = x-karaoke.desktop mimedir = $(kde_mimedir)/audio -rc_DATA = kmidui.rc -rcdir = $(kde_datadir)/kmid +rc_DATA = tdemidui.rc +rcdir = $(kde_datadir)/tdemid -KDE_ICON = kmid +KDE_ICON = tdemid fmpatches_DATA = std.sb drums.sb std.o3 drums.o3 -fmpatchesdir = $(kde_datadir)/kmid/fm +fmpatchesdir = $(kde_datadir)/tdemid/fm -partdir = $(kde_datadir)/kmid -part_DATA = kmid_partui.rc +partdir = $(kde_datadir)/tdemid +part_DATA = tdemid_partui.rc channelview_DATA = keyboard.xpm button1.xpm button2.xpm -channelviewdir = $(kde_datadir)/kmid/icons +channelviewdir = $(kde_datadir)/tdemid/icons EXTRA_DIST = $(xdg_apps_DATA) $(mime_DATA) $(fmpatches_DATA) $(part_DATA) @@ -71,4 +71,4 @@ instrname.i18n: instrname.cpp messages: instrname.i18n rc.cpp - $(XGETTEXT) *.cpp instrname.i18n -o $(podir)/kmid.pot + $(XGETTEXT) *.cpp instrname.i18n -o $(podir)/tdemid.pot diff --git a/kmid/PEOPLE b/tdemid/PEOPLE similarity index 100% rename from kmid/PEOPLE rename to tdemid/PEOPLE diff --git a/kmid/README b/tdemid/README similarity index 91% rename from kmid/README rename to tdemid/README index 52c5f759..c391c24c 100644 --- a/kmid/README +++ b/tdemid/README @@ -36,7 +36,7 @@ Index player engine of KMid. Of course it doesn't have the same friendly interface of KMid but it works to play midi files. - If you have the rpm distribution, you will not find the consolekmid program + If you have the rpm distribution, you will not find the consoletdemid program unless you have compiled it from the src.rpm distribution @@ -67,7 +67,7 @@ Index one (fm, awe, or anything else), edit the file main.cc and change the value of DEFAULT_DEVICE to the one you want, or specify the -d option as in : - consolekmid -d 1 mymidifile.mid + consoletdemid -d 1 mymidifile.mid 4. Installing ----------------- @@ -78,7 +78,7 @@ Index 5. Running -------------- - Well, it's quite easy, just type "consolekmid" and it should run :-) + Well, it's quite easy, just type "consoletdemid" and it should run :-) 6. How do I use a Midi Mapper ? ------------------------------- @@ -87,14 +87,14 @@ Index computer as General Midi compliant. Thus, a GM synth is emulated with a nonGM. Look the KMid docs for more info on creating/using a midi map. - If you want to use one with consolekmid, you can use the -M option, + If you want to use one with consoletdemid, you can use the -M option, use it like this example : - consolekmid -M /opt/kde/share/apps/kmid/maps/YamahaPSS790.map mymidifile + consoletdemid -M /opt/kde/share/apps/tdemid/maps/YamahaPSS790.map mymidifile You can also edit main.cc in the player directory and change the value of DEFAULT_MAP to whatever you want, so that you don't need to specify the - -M option each time you run consolekmid. + -M option each time you run consoletdemid. If you want to define a new map for your midi keyboard, I recommend you to start by copying the file yamaha790.map and modifying it. And remember to @@ -105,7 +105,7 @@ Index --------------------------------------------------- KMid's homepage is at : - http://developer.kde.org/~larrosa/kmid.html + http://developer.kde.org/~larrosa/tdemid.html From there you can download latest versions as well as know the latest changes and improvements of KMid and consoleKMid diff --git a/kmid/audiomidi.desktop b/tdemid/audiomidi.desktop similarity index 100% rename from kmid/audiomidi.desktop rename to tdemid/audiomidi.desktop diff --git a/kmid/button1.xpm b/tdemid/button1.xpm similarity index 100% rename from kmid/button1.xpm rename to tdemid/button1.xpm diff --git a/kmid/button2.xpm b/tdemid/button2.xpm similarity index 100% rename from kmid/button2.xpm rename to tdemid/button2.xpm diff --git a/kmid/channel.cpp b/tdemid/channel.cpp similarity index 99% rename from kmid/channel.cpp rename to tdemid/channel.cpp index 214dcc18..97fc5133 100644 --- a/kmid/channel.cpp +++ b/tdemid/channel.cpp @@ -33,7 +33,7 @@ #include #include #include -#include "kmidbutton.h" +#include "tdemidbutton.h" #include "channel.h" #include "instrname.h" diff --git a/kmid/channel.h b/tdemid/channel.h similarity index 100% rename from kmid/channel.h rename to tdemid/channel.h diff --git a/kmid/channel3d.cpp b/tdemid/channel3d.cpp similarity index 100% rename from kmid/channel3d.cpp rename to tdemid/channel3d.cpp diff --git a/kmid/channel3d.h b/tdemid/channel3d.h similarity index 100% rename from kmid/channel3d.h rename to tdemid/channel3d.h diff --git a/kmid/channel4d.cpp b/tdemid/channel4d.cpp similarity index 100% rename from kmid/channel4d.cpp rename to tdemid/channel4d.cpp diff --git a/kmid/channel4d.h b/tdemid/channel4d.h similarity index 100% rename from kmid/channel4d.h rename to tdemid/channel4d.h diff --git a/kmid/channelcfgdlg.cpp b/tdemid/channelcfgdlg.cpp similarity index 100% rename from kmid/channelcfgdlg.cpp rename to tdemid/channelcfgdlg.cpp diff --git a/kmid/channelcfgdlg.h b/tdemid/channelcfgdlg.h similarity index 100% rename from kmid/channelcfgdlg.h rename to tdemid/channelcfgdlg.h diff --git a/kmid/channelview.cpp b/tdemid/channelview.cpp similarity index 96% rename from kmid/channelview.cpp rename to tdemid/channelview.cpp index fe9043f0..bf1ebf55 100644 --- a/kmid/channelview.cpp +++ b/tdemid/channelview.cpp @@ -40,7 +40,7 @@ ChannelView::ChannelView(void) : KMainWindow(0, "ChannelView") Channel[i]=new KMidChannel3D(i+1,this); else Channel[i]=new KMidChannel4D(i+1,this); - connect(Channel[i],TQT_SIGNAL(signalToKMidClient(int *)),this,TQT_SLOT(slottokmidclient(int *))); + connect(Channel[i],TQT_SIGNAL(signalToKMidClient(int *)),this,TQT_SLOT(slottotdemidclient(int *))); Channel[i]->setGeometry(5,5+i*CHANNELHEIGHT,width()-20,CHANNELHEIGHT); Channel[i]->show(); } @@ -150,7 +150,7 @@ void ChannelView::lookMode(int i) else Channel[i]=new KMidChannel4D(i+1,this); - connect(Channel[i],TQT_SIGNAL(signalToKMidClient(int *)),this,TQT_SLOT(slottokmidclient(int *))); + connect(Channel[i],TQT_SIGNAL(signalToKMidClient(int *)),this,TQT_SLOT(slottotdemidclient(int *))); Channel[i]->setGeometry(5,5+(i-(scrollbar->value()-1))*CHANNELHEIGHT,width()-20,CHANNELHEIGHT); Channel[i]->loadState(tmp,&pgm); Channel[i]->show(); @@ -158,7 +158,7 @@ void ChannelView::lookMode(int i) } -void ChannelView::slottokmidclient(int *data) +void ChannelView::slottotdemidclient(int *data) { emit signalToKMidClient(data); } diff --git a/kmid/channelview.h b/tdemid/channelview.h similarity index 98% rename from kmid/channelview.h rename to tdemid/channelview.h index a1789467..9ef7301e 100644 --- a/kmid/channelview.h +++ b/tdemid/channelview.h @@ -60,7 +60,7 @@ public: public slots: void ScrollChn(int i); - void slottokmidclient(int *data); + void slottotdemidclient(int *data); signals: void destroyMe(); diff --git a/kmid/collectdlg.cpp b/tdemid/collectdlg.cpp similarity index 100% rename from kmid/collectdlg.cpp rename to tdemid/collectdlg.cpp diff --git a/kmid/collectdlg.h b/tdemid/collectdlg.h similarity index 100% rename from kmid/collectdlg.h rename to tdemid/collectdlg.h diff --git a/tdemid/configure.in.in b/tdemid/configure.in.in new file mode 100644 index 00000000..af6e24d2 --- /dev/null +++ b/tdemid/configure.in.in @@ -0,0 +1,5 @@ +KDE_CHECK_HEADER([libtdemid/libtdemid.h], [kde_mid_compiles=yes], [kde_mid_compiles=no]) +if test $kde_mid_compiles = no; then + DO_NOT_COMPILE="$DO_NOT_COMPILE tdemid" +fi + diff --git a/kmid/drums.o3 b/tdemid/drums.o3 similarity index 100% rename from kmid/drums.o3 rename to tdemid/drums.o3 diff --git a/kmid/drums.sb b/tdemid/drums.sb similarity index 100% rename from kmid/drums.sb rename to tdemid/drums.sb diff --git a/kmid/examples/DiesIrae.kar b/tdemid/examples/DiesIrae.kar similarity index 100% rename from kmid/examples/DiesIrae.kar rename to tdemid/examples/DiesIrae.kar diff --git a/kmid/examples/Guantanamera.kar b/tdemid/examples/Guantanamera.kar similarity index 100% rename from kmid/examples/Guantanamera.kar rename to tdemid/examples/Guantanamera.kar diff --git a/kmid/examples/Makefile.am b/tdemid/examples/Makefile.am similarity index 76% rename from kmid/examples/Makefile.am rename to tdemid/examples/Makefile.am index b53f7c54..637f39ea 100644 --- a/kmid/examples/Makefile.am +++ b/tdemid/examples/Makefile.am @@ -1,6 +1,6 @@ example_DATA = OFortuna.kar DiesIrae.kar Guantanamera.kar \ MariaDeLasMercedes.kar -exampledir = $(kde_datadir)/kmid +exampledir = $(kde_datadir)/tdemid EXTRA_DIST = $(example_DATA) diff --git a/kmid/examples/MariaDeLasMercedes.kar b/tdemid/examples/MariaDeLasMercedes.kar similarity index 100% rename from kmid/examples/MariaDeLasMercedes.kar rename to tdemid/examples/MariaDeLasMercedes.kar diff --git a/kmid/examples/OFortuna.kar b/tdemid/examples/OFortuna.kar similarity index 100% rename from kmid/examples/OFortuna.kar rename to tdemid/examples/OFortuna.kar diff --git a/kmid/hi16-app-kmid.png b/tdemid/hi16-app-tdemid.png similarity index 100% rename from kmid/hi16-app-kmid.png rename to tdemid/hi16-app-tdemid.png diff --git a/kmid/hi32-app-kmid.png b/tdemid/hi32-app-tdemid.png similarity index 100% rename from kmid/hi32-app-kmid.png rename to tdemid/hi32-app-tdemid.png diff --git a/kmid/hi48-app-kmid.png b/tdemid/hi48-app-tdemid.png similarity index 100% rename from kmid/hi48-app-kmid.png rename to tdemid/hi48-app-tdemid.png diff --git a/kmid/history.txt b/tdemid/history.txt similarity index 89% rename from kmid/history.txt rename to tdemid/history.txt index b6ed3407..896bdeb1 100644 --- a/kmid/history.txt +++ b/tdemid/history.txt @@ -23,7 +23,7 @@ Monday 15-9-97 Tuesday 16-9-97 - I have made a small program to test the threads and forks, threads apparently are faster, but it seems to have a problem with libqt or anyone, and I get -core dumpes what I run kmid even if I only link libpthread but don't use it. +core dumpes what I run tdemid even if I only link libpthread but don't use it. So I've decided to make a fork, in the other way, I've learned to share memory Wednesday 17-9-97 @@ -51,7 +51,7 @@ and using a timer to process the next event at the right time, but that doesn't work perfectly, because the text appears a moment after or before the note is played. The second method is a while loop, which calls processEvents, but that isn't a very good option, because, though text appears just at the same -time of the note is played, top tells me that kmid is consuming up to 98% of +time of the note is played, top tells me that tdemid is consuming up to 98% of CPU time, and I don't want to make such a monster. Monday 22-9-97 @@ -82,7 +82,7 @@ lyrics. By the way, StarTrek : First Contact is a very recommended film Wednesday 1-10-97 - I have fixed pause and stop, which were broken during the karaoke syncro -By the way, kmid consumes 0.0% CPU and 00:00 time while playing a 6 minute song +By the way, tdemid consumes 0.0% CPU and 00:00 time while playing a 6 minute song (and I think that even in longer songs !) Thursday 2-10-97 @@ -107,10 +107,10 @@ some parts slower than they should (thanks to Christian Esken for reporting the bug!) Tuesday 21-10-97 -- WOE, KDE-Beta-ONE is even better than before. But now kmid doesn't compile (?) +- WOE, KDE-Beta-ONE is even better than before. But now tdemid doesn't compile (?) Wednesday 22-10-97 -- After compiling the kde libs, kmid compiles ok. KSlider has changed and its +- After compiling the kde libs, tdemid compiles ok. KSlider has changed and its behaviour (Arrrgh!), so I have trickered a little the code. Thursday 23-10-97 @@ -130,7 +130,7 @@ Sunday 26-10-97 Monday 27-10-97 - After 10 hours in the university, I have made the final touches to send -kmid 0.1 to the internet. +tdemid 0.1 to the internet. ??? 7-11-97 - Finally, there's an impossible-better syncro between the program @@ -139,7 +139,7 @@ is inmediatly paused !!! Saturday 8-11-97 - So I suppose yesterday was Friday, but I should demostrate it :-) -I have added drag & drop support in kmid to load files by dropping them from kfm +I have added drag & drop support in tdemid to load files by dropping them from kfm Also made the slider show the time played at resizeable steps Sunday 9-11-97 @@ -153,36 +153,36 @@ songs. Friday 14-11-97 - Automatic text event chooser is done ! -- Fixed a bug that could freeze kmid under very rare circunstances. +- Fixed a bug that could freeze tdemid under very rare circunstances. - Added more support for incomplete/broken files Saturday 15-11-97 - I have changed the exit-behaviour for a messagebox-behaviour -- Fixed a bug that could leave the children running when closing kmid +- Fixed a bug that could leave the children running when closing tdemid Sunday 16-11-97 - KMid adds a mime entry for karaoke files in audio/x-karaoke - Real Session Management. -- Made the first rpm of kmid. +- Made the first rpm of tdemid. Monday 17-11-97 - Release version 0.3 in tgz and rpm Friday 28-11-97 - I've been quite busy this week, but I have had reports and patches :-) on -how to make kmid to work with an AWE, a GUS, and in FreeBSD :-)))) +how to make tdemid to work with an AWE, a GUS, and in FreeBSD :-)))) Monday 8-12-97 - I have fixed a small bug with which the time that a song longs was not well reported. -- Also a tiny bug in consolekmid +- Also a tiny bug in consoletdemid Tuesday 9-12-97 - I've made the first feature that I've been asked for. Another thing to map with the midi mapper for Dietmar's PSR500 Friday 12-12-97 -- Nearly done the map chooser so that there will no be needed to edit the kmidrc +- Nearly done the map chooser so that there will no be needed to edit the tdemidrc for anything. Now when you choose a new map or change GM/MT32 mode, the music is automatically changed while playing !. @@ -213,12 +213,12 @@ Monday 9-2-98 Friday 20-2-98 - I've finished exams, have installed the yesterday snapshots and have updated the configure scripts to add rpath and all that stuff to my copy -of kmid (thanks to Kulow, who added it to kmid in tdemultimedia) +of tdemid (thanks to Kulow, who added it to tdemid in tdemultimedia) Saturday 21-2-98 - Fixed the not-a-feature problem with FM, next time I will not let the option for the user to select something that doesn't work. -Final touches to release kmid 0.41 tomorrow morning. +Final touches to release tdemid 0.41 tomorrow morning. Monday 23-2-98 - I've started working on FM support (and it goes very fast) @@ -274,7 +274,7 @@ Friday 13-3-98 of Stephan Kulow which look much better. Saturday 14-3-98 -- Finished deleting printf's to upload kmid tomorrow :-) +- Finished deleting printf's to upload tdemid tomorrow :-) Sunday 15-3-98 - Upload it, but as I forgot to delete some printf messages :-( , I had @@ -296,7 +296,7 @@ Thursday 2-4-98 Monday 6-4-98 - I've found and fixed a memory leakage bug, I forgot to delete the -SpecialEvents from each song, so kmid was using more and more memory with +SpecialEvents from each song, so tdemid was using more and more memory with each opened song. Tuesday 7-4-98 @@ -311,7 +311,7 @@ Friday 24-4-98 - At last, I have had some free time and have done some things: 1. Finally fixed the synchronization between gui and player (hopefully forever) 2. Fixed a problem openning a gzipped file with spaces in its name - 3. Fixed a bug which caused kmid to freeze if collection has only 1 song, and + 3. Fixed a bug which caused tdemid to freeze if collection has only 1 song, and trying to play next song in aleatory mode. 4. Fixed the problem which made some songs to play at a lower volume when moving the slider, but no if playing from the beginning @@ -330,7 +330,7 @@ Sunday 10-5-98 got the time slider very desynchronized after pausing for a long time. Monday 25-5-98 -- Applied a patch submitted by Kevin Street, to compile kmid on FreeBSD 3.0 +- Applied a patch submitted by Kevin Street, to compile tdemid on FreeBSD 3.0 systems with awe support (directory settings has changed since 2.2) Saturday 20-6-98 @@ -350,7 +350,7 @@ and released, it's very nice :-) Monday 6-7-98 - Using the (still hot) shutDown signal (the most awaited thing for -kmid) +tdemid) Monday 13-7-98 - I've restructured the Channel view, it's much nicer and allows for easier @@ -360,11 +360,11 @@ Saturday 15-8-98 - Wow, I haven't updated this file for so long ... I've finished the changing instrument feature and so the channel view. I've also improved speed a little by supressing some parses to the midi file. - I have improved consolekmid, now it is much more usuable. + I have improved consoletdemid, now it is much more usuable. Finally, I've changed the sources to use the KAccel class. Monday 31-8-98 -- I've fixed some bugs, the most important one being that kmid left its player +- I've fixed some bugs, the most important one being that tdemid left its player processes as zombies after stopping playing (it worked ok, but now it doesn't, dunno why). That problem made to appear some weird dialogs telling "song is already playing" at each moment @@ -420,7 +420,7 @@ Sunday 8-11-98 - Some small changes Wednesday 25-11-98 -- I've finally fixed the bug that made kmid play music sometimes +- I've finally fixed the bug that made tdemid play music sometimes faster and sometimes slower on some machines (i.e. mine, since I installed kernel 2.0.36) This bug was there since the real beginning, and now, it is FIXED. @@ -445,7 +445,7 @@ Friday 18-12-98 Sunday 20-12-98 - Fixed a problem when [un]installing midi devices (not such a mad idea if you -use kernel modules) that made kmid segfault because it couldn't found +use kernel modules) that made tdemid segfault because it couldn't found the device. Saturday 16-1-99 @@ -457,16 +457,16 @@ checked for songs which didn't contain any spev (songs which use absolute 0 spev are extremely rare to find, as any song must include at least a tempo event) Tuesday 26-1-99 -- Removed ; after QOBJECT and fixed default midi map in consolekmid (not kmid) +- Removed ; after QOBJECT and fixed default midi map in consoletdemid (not tdemid) Sunday 21-2-99 -- Made a quick hack (no more than 15 lines) and kmid uses TDEIOJob to be +- Made a quick hack (no more than 15 lines) and tdemid uses TDEIOJob to be net transparent (now it can download files using an http or ftp protocol just using dnd from a kfm window or using the open file dialog) Saturday 6-3-99 - The sound driver in Linux kernels from the 2.2.x series work very different -than the ones in 2.0.x so kmid was severely damaged. After several days of +than the ones in 2.0.x so tdemid was severely damaged. After several days of hacking (and after getting from A.Cox that this wasn't going to be fixed in the kernel) I've found a fix that even works in the 2.0.x kernels. @@ -477,12 +477,12 @@ Sunday 21-3-99 Friday 2-4-99 - Did a workaround for a bug in egcs which doesn't seem to optimize simple -return-a-value function as an inline function when using -O2 and it made kmid +return-a-value function as an inline function when using -O2 and it made tdemid freeze under certain conditions when parsing some midi files. - Removed a comparison of double variables which is very dangerous (_even_ after storing in one of them the value of the other one) -- Fixed a problem by which kmid didn't play the last half second or so of some songs. +- Fixed a problem by which tdemid didn't play the last half second or so of some songs. Thursday 8-4-99 - Fixed a problem that made Kmid consume 99% of CPU since a month ago. Now it's back @@ -523,17 +523,17 @@ Tuesday 11-1-2000 - Added LOTS of documentation to the MIDI library. Anyway, there's a lot more to come. - Also fixed a few problems in the lyrics display, and added a new option -to consolekmid +to consoletdemid Sunday 27-2-2000 - Ported KMid to use the "official" LibKMid and KXMLGUI, with the following result : - # wc kmidframe.cpp - Before: 769 1450 24820 kmidframe.cpp - After : 622 1171 19045 kmidframe.cpp + # wc tdemidframe.cpp + Before: 769 1450 24820 tdemidframe.cpp + After : 622 1171 19045 tdemidframe.cpp Monday 28-2-2000 -- Added ALSA support to libkmid +- Added ALSA support to libtdemid Tuesday 29-2-2000 - I'm making KMid a part @@ -543,20 +543,20 @@ It took me : exactly 13 minutes to port the app 5:14 to compile it and see that kbrowser.h doesn't exist now :( Sunday 5-3-2000 -- Now libkmid does build and run on systems where OSS is not installed. -- Updated the code to simplify it a bit due to libkmid changes. +- Now libtdemid does build and run on systems where OSS is not installed. +- Updated the code to simplify it a bit due to libtdemid changes. - I still have to search for a bug that makes KMid (and the part!) to crash when destroying KDisplayText (the curious thing is that it crashes on QScrollView) Sunday 2-4-2000 -- Now Libkmid links with tdecore and qt in order to use a TDEConfig object to +- Now Libtdemid links with tdecore and qt in order to use a TDEConfig object to read the default settings as saved by the user with the midi kcontrol module. - It creates a "dummy" TDEInstance in case of the application being a non-KDE application. - Fixed compilation of KMid, as 1) someone renamed klinedit.h to klineedit.h and 2) now we have to include qiconset.h when creating an action with pictures -as in kmid_part.cpp +as in tdemid_part.cpp - Now I just have to find why KMid doesn't show any interface except the standard actions diff --git a/kmid/instrfilter.awk b/tdemid/instrfilter.awk similarity index 100% rename from kmid/instrfilter.awk rename to tdemid/instrfilter.awk diff --git a/kmid/instrname.cpp b/tdemid/instrname.cpp similarity index 100% rename from kmid/instrname.cpp rename to tdemid/instrname.cpp diff --git a/kmid/instrname.h b/tdemid/instrname.h similarity index 100% rename from kmid/instrname.h rename to tdemid/instrname.h diff --git a/kmid/instrname.i18n b/tdemid/instrname.i18n similarity index 100% rename from kmid/instrname.i18n rename to tdemid/instrname.i18n diff --git a/kmid/kdisptext.cpp b/tdemid/kdisptext.cpp similarity index 100% rename from kmid/kdisptext.cpp rename to tdemid/kdisptext.cpp diff --git a/kmid/kdisptext.h b/tdemid/kdisptext.h similarity index 99% rename from kmid/kdisptext.h rename to tdemid/kdisptext.h index 9b99e7fa..04a25f27 100644 --- a/kmid/kdisptext.h +++ b/tdemid/kdisptext.h @@ -26,7 +26,7 @@ #include #include -#include +#include struct kdispt_ev { diff --git a/kmid/keyboard.xpm b/tdemid/keyboard.xpm similarity index 100% rename from kmid/keyboard.xpm rename to tdemid/keyboard.xpm diff --git a/kmid/klcdnumber.cpp b/tdemid/klcdnumber.cpp similarity index 100% rename from kmid/klcdnumber.cpp rename to tdemid/klcdnumber.cpp diff --git a/kmid/klcdnumber.h b/tdemid/klcdnumber.h similarity index 100% rename from kmid/klcdnumber.h rename to tdemid/klcdnumber.h diff --git a/kmid/ktrianglebutton.cpp b/tdemid/ktrianglebutton.cpp similarity index 100% rename from kmid/ktrianglebutton.cpp rename to tdemid/ktrianglebutton.cpp diff --git a/kmid/ktrianglebutton.h b/tdemid/ktrianglebutton.h similarity index 100% rename from kmid/ktrianglebutton.h rename to tdemid/ktrianglebutton.h diff --git a/kmid/main.cpp b/tdemid/main.cpp similarity index 84% rename from kmid/main.cpp rename to tdemid/main.cpp index 21b0198a..a35647e0 100644 --- a/kmid/main.cpp +++ b/tdemid/main.cpp @@ -34,8 +34,8 @@ #include #include -#include "kmidframe.h" -#include "kmid_part.h" +#include "tdemidframe.h" +#include "tdemid_part.h" #include "version.h" int main(int argc, char **argv) @@ -67,30 +67,30 @@ int main(int argc, char **argv) TDEApplication app; - kmidFrame *kmidframe=new kmidFrame("KMid"); + tdemidFrame *tdemidframe=new tdemidFrame("KMid"); - app.setMainWidget ( kmidframe ); + app.setMainWidget ( tdemidframe ); - TQObject::connect(&app,TQT_SIGNAL(shutDown()),kmidframe,TQT_SLOT(shuttingDown())); + TQObject::connect(&app,TQT_SIGNAL(shutDown()),tdemidframe,TQT_SLOT(shuttingDown())); if (app.isRestored()) { - if (kmidframe->canBeRestored(1)) kmidframe->restore(1); + if (tdemidframe->canBeRestored(1)) tdemidframe->restore(1); } - kmidframe->show(); + tdemidframe->show(); //CT TDEIOJob::initStatic(); /* if (app->isRestored()) { - RESTORE(kmidFrame); + RESTORE(tdemidFrame); } else { - kmidFrame *kmidframe=new kmidFrame("KMid"); - kmidframe->show(); + tdemidFrame *tdemidframe=new tdemidFrame("KMid"); + tdemidframe->show(); }; */ diff --git a/kmid/maps/Makefile.am b/tdemid/maps/Makefile.am similarity index 72% rename from kmid/maps/Makefile.am rename to tdemid/maps/Makefile.am index d276e13e..7ee025c9 100644 --- a/kmid/maps/Makefile.am +++ b/tdemid/maps/Makefile.am @@ -1,5 +1,5 @@ maps_DATA = gm.map YamahaPSS790.map YamahaPSR500.map YamahaQY10.map -mapsdir = $(kde_datadir)/kmid/maps +mapsdir = $(kde_datadir)/tdemid/maps EXTRA_DIST = $(maps_DATA) diff --git a/kmid/maps/YamahaPSR500.map b/tdemid/maps/YamahaPSR500.map similarity index 100% rename from kmid/maps/YamahaPSR500.map rename to tdemid/maps/YamahaPSR500.map diff --git a/kmid/maps/YamahaPSS790.map b/tdemid/maps/YamahaPSS790.map similarity index 100% rename from kmid/maps/YamahaPSS790.map rename to tdemid/maps/YamahaPSS790.map diff --git a/kmid/maps/YamahaQY10.map b/tdemid/maps/YamahaQY10.map similarity index 100% rename from kmid/maps/YamahaQY10.map rename to tdemid/maps/YamahaQY10.map diff --git a/kmid/maps/gm.map b/tdemid/maps/gm.map similarity index 100% rename from kmid/maps/gm.map rename to tdemid/maps/gm.map diff --git a/kmid/midicfgdlg.cpp b/tdemid/midicfgdlg.cpp similarity index 99% rename from kmid/midicfgdlg.cpp rename to tdemid/midicfgdlg.cpp index 481c4922..46577c28 100644 --- a/kmid/midicfgdlg.cpp +++ b/tdemid/midicfgdlg.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include "midicfgdlg.h" #include "version.h" diff --git a/kmid/midicfgdlg.h b/tdemid/midicfgdlg.h similarity index 100% rename from kmid/midicfgdlg.h rename to tdemid/midicfgdlg.h diff --git a/tdemid/pics/Makefile.am b/tdemid/pics/Makefile.am new file mode 100644 index 00000000..b9dc09f0 --- /dev/null +++ b/tdemid/pics/Makefile.am @@ -0,0 +1,3 @@ +tdemidicondir = $(kde_datadir)/tdemid/icons +tdemidicon_ICON = AUTO + diff --git a/kmid/pics/cr16-action-piano.png b/tdemid/pics/cr16-action-piano.png similarity index 100% rename from kmid/pics/cr16-action-piano.png rename to tdemid/pics/cr16-action-piano.png diff --git a/kmid/pics/cr16-action-volume.png b/tdemid/pics/cr16-action-volume.png similarity index 100% rename from kmid/pics/cr16-action-volume.png rename to tdemid/pics/cr16-action-volume.png diff --git a/kmid/pics/cr22-action-piano.png b/tdemid/pics/cr22-action-piano.png similarity index 100% rename from kmid/pics/cr22-action-piano.png rename to tdemid/pics/cr22-action-piano.png diff --git a/kmid/pics/cr22-action-volume.png b/tdemid/pics/cr22-action-volume.png similarity index 100% rename from kmid/pics/cr22-action-volume.png rename to tdemid/pics/cr22-action-volume.png diff --git a/kmid/pics/cr32-action-piano.png b/tdemid/pics/cr32-action-piano.png similarity index 100% rename from kmid/pics/cr32-action-piano.png rename to tdemid/pics/cr32-action-piano.png diff --git a/kmid/pics/cr32-action-volume.png b/tdemid/pics/cr32-action-volume.png similarity index 100% rename from kmid/pics/cr32-action-volume.png rename to tdemid/pics/cr32-action-volume.png diff --git a/kmid/qslidertime.cpp b/tdemid/qslidertime.cpp similarity index 100% rename from kmid/qslidertime.cpp rename to tdemid/qslidertime.cpp diff --git a/kmid/qslidertime.h b/tdemid/qslidertime.h similarity index 100% rename from kmid/qslidertime.h rename to tdemid/qslidertime.h diff --git a/kmid/randomlist.cpp b/tdemid/randomlist.cpp similarity index 100% rename from kmid/randomlist.cpp rename to tdemid/randomlist.cpp diff --git a/kmid/randomlist.h b/tdemid/randomlist.h similarity index 100% rename from kmid/randomlist.h rename to tdemid/randomlist.h diff --git a/kmid/rhythmview.cpp b/tdemid/rhythmview.cpp similarity index 100% rename from kmid/rhythmview.cpp rename to tdemid/rhythmview.cpp diff --git a/kmid/rhythmview.h b/tdemid/rhythmview.h similarity index 100% rename from kmid/rhythmview.h rename to tdemid/rhythmview.h diff --git a/kmid/slman.cpp b/tdemid/slman.cpp similarity index 100% rename from kmid/slman.cpp rename to tdemid/slman.cpp diff --git a/kmid/slman.h b/tdemid/slman.h similarity index 100% rename from kmid/slman.h rename to tdemid/slman.h diff --git a/kmid/songlist.cpp b/tdemid/songlist.cpp similarity index 100% rename from kmid/songlist.cpp rename to tdemid/songlist.cpp diff --git a/kmid/songlist.h b/tdemid/songlist.h similarity index 100% rename from kmid/songlist.h rename to tdemid/songlist.h diff --git a/kmid/std.o3 b/tdemid/std.o3 similarity index 100% rename from kmid/std.o3 rename to tdemid/std.o3 diff --git a/kmid/std.sb b/tdemid/std.sb similarity index 100% rename from kmid/std.sb rename to tdemid/std.sb diff --git a/kmid/kmid.desktop b/tdemid/tdemid.desktop similarity index 97% rename from kmid/kmid.desktop rename to tdemid/tdemid.desktop index d51087ac..beda97b9 100644 --- a/kmid/kmid.desktop +++ b/tdemid/tdemid.desktop @@ -75,14 +75,14 @@ GenericName[zh_CN]=Midi/卡拉 OK 播放器 GenericName[zh_HK]=Midi/卡拉OK 播放器 GenericName[zh_TW]=Midi/卡拉OK播放器 GenericName[zu]=Umdlali weMidi/Karaoke -Exec=kmid %u -Icon=kmid +Exec=tdemid %u +Icon=tdemid Path= -DocPath=kmid/index.html +DocPath=tdemid/index.html Type=Application Terminal=false ServiceTypes=Browser/View -X-TDE-Library=libkmidpart +X-TDE-Library=libtdemidpart X-TDE-StartupNotify=true X-DCOP-ServiceType=Multi Categories=Qt;TDE;AudioVideo; diff --git a/kmid/kmid.lsm b/tdemid/tdemid.lsm similarity index 71% rename from kmid/kmid.lsm rename to tdemid/tdemid.lsm index 36f0f119..b94976d4 100644 --- a/kmid/kmid.lsm +++ b/tdemid/tdemid.lsm @@ -1,14 +1,14 @@ Begin4 -Title: kmid +Title: tdemid Version: R14.0.0 Entered-date: 2010-05-10 Description: A midi/karaoke player with a friendly interface. -Keywords: mid kar player midi karaoke TDE X11 Qt kmid fm awe gus synth +Keywords: mid kar player midi karaoke TDE X11 Qt tdemid fm awe gus synth Author: larrosa@kde.org (Antonio Larrosa Jimenez) Maintained-by: The Trinity Desktop Environment (TDE) http://www.trinitydesktop.org/ Primary-site: http://git.trinitydesktop.org/cgit/ Alternate-site: -Original-site: http://perso.wanadoo.es/antlarr/kmid.html +Original-site: http://perso.wanadoo.es/antlarr/tdemid.html Platforms: Linux and other Unices running TDE Copying-policy: GPL End diff --git a/tdemid/tdemid.spec b/tdemid/tdemid.spec new file mode 100644 index 00000000..7305dfe1 --- /dev/null +++ b/tdemid/tdemid.spec @@ -0,0 +1,62 @@ +Summary: Play midi/karaoke files and show lyrics. Support External synths, AWE, GUS, and FM devices. For X11/KDE +Name: tdemid +Version: 1.2 +Release: 1 +Copyright: GPL +Group: X11/K Desktop Environment/Multimedia +Source: tdemid-1.2.tar.gz +Requires: qt >= 1.3 , tdelibs + +%description +KMid is a midi/karaoke file player, with configurable midi mapper, +real Session Management, drag & drop, customizable fonts, etc. +It has a very nice interface which let you easily follow the tune while +changing the color of the lyrics. +It supports output through external synthesizers, AWE, FM and GUS cards. +It also has a keyboard view to see the notes played by each instrument + +%prep +%setup + +%build +export TDEDIR=/opt/kde +./configure +make all + +%install +export TDEDIR=/opt/kde +make install + +%files +%doc tdemid/README tdemid/COPYING tdemid/PEOPLE tdemid/tdemid.lsm tdemid/ChangeLog + +/opt/kde/bin/tdemid +/opt/kde/share/doc/tde/HTML/en/tdemid +/opt/kde/share/doc/tde/HTML/es/tdemid +/opt/kde/share/icons/tdemid.xpm +/opt/kde/share/icons/mini/tdemid.xpm +/opt/kde/share/applnk/Multimedia/tdemid.kdelnk +/opt/kde/share/mimelnk/audio/x-karaoke.kdelnk +/opt/kde/share/apps/tdemid/toolbar +/opt/kde/share/apps/tdemid/fm +/opt/kde/share/apps/tdemid/maps/gm.map +/opt/kde/share/apps/tdemid/maps/YamahaPSS790.map +/opt/kde/share/apps/tdemid/maps/YamahaPSR500.map +/opt/kde/share/apps/tdemid/OFortuna.kar +/opt/kde/share/apps/tdemid/StopInTheNameOfLove.kar +/opt/kde/share/apps/tdemid/TheGirlFromIpanema.kar +/opt/kde/share/apps/tdemid/AnotherGlitchInTheCall.kar +/opt/kde/share/locale/es/LC_MESSAGES/tdemid.mo +/opt/kde/share/locale/cs/LC_MESSAGES/tdemid.mo +/opt/kde/share/locale/de/LC_MESSAGES/tdemid.mo +/opt/kde/share/locale/fi/LC_MESSAGES/tdemid.mo +/opt/kde/share/locale/hr/LC_MESSAGES/tdemid.mo +/opt/kde/share/locale/pl/LC_MESSAGES/tdemid.mo +/opt/kde/share/locale/pt/LC_MESSAGES/tdemid.mo +/opt/kde/share/locale/sk/LC_MESSAGES/tdemid.mo +/opt/kde/share/locale/eo/LC_MESSAGES/tdemid.mo +/opt/kde/share/locale/no/LC_MESSAGES/tdemid.mo +/opt/kde/share/locale/sv/LC_MESSAGES/tdemid.mo +/opt/kde/share/locale/pt_BR/LC_MESSAGES/tdemid.mo +/opt/kde/share/locale/zh_CN.GB2312/LC_MESSAGES/tdemid.mo +/opt/kde/share/locale/zh_TW.Big5/LC_MESSAGES/tdemid.mo diff --git a/kmid/kmidIface.h b/tdemid/tdemidIface.h similarity index 100% rename from kmid/kmidIface.h rename to tdemid/tdemidIface.h diff --git a/kmid/kmid_part.cpp b/tdemid/tdemid_part.cpp similarity index 87% rename from kmid/kmid_part.cpp rename to tdemid/tdemid_part.cpp index 11e2d405..d6e22474 100644 --- a/kmid/kmid_part.cpp +++ b/tdemid/tdemid_part.cpp @@ -1,4 +1,4 @@ -#include "kmid_part.h" +#include "tdemid_part.h" #include #include @@ -7,13 +7,13 @@ #include #include -#include +#include -#include "kmidclient.h" +#include "tdemidclient.h" #include #include -K_EXPORT_COMPONENT_FACTORY( libkmidpart, KMidFactory ) +K_EXPORT_COMPONENT_FACTORY( libtdemidpart, KMidFactory ) /** * We need one static instance of the factory for our C 'main' @@ -47,10 +47,10 @@ KParts::Part *KMidFactory::createPartObject(TQWidget *parentWidget, const char * TDEAboutData *KMidFactory::aboutData() { - TDEAboutData *aboutdata = new TDEAboutData("kmid", "KMid", "2.0", + TDEAboutData *aboutdata = new TDEAboutData("tdemid", "KMid", "2.0", I18N_NOOP("MIDI/Karaoke file player"), TDEAboutData::License_GPL, I18N_NOOP("(c) 1997,98,99,2000, Antonio Larrosa Jimenez"),"", - "http://perso.wanadoo.es/antlarr/kmid.html"); + "http://perso.wanadoo.es/antlarr/tdemid.html"); aboutdata->addAuthor("Antonio Larrosa Jimenez", I18N_NOOP("Original Developer/Maintainer"),"larrosa@kde.org", "http://perso.wanadoo.es/antlarr/index.html"); @@ -71,7 +71,7 @@ TDEInstance *KMidFactory::instance() { setInstance(KMidFactory::instance()); - widget = new kmidClient(parentWidget, actionCollection()); + widget = new tdemidClient(parentWidget, actionCollection()); widget->show(); widget->setFocusPolicy(TQ_ClickFocus); setWidget(widget); @@ -97,7 +97,7 @@ TDEInstance *KMidFactory::instance() m_extension = new KMidBrowserExtension(this); - setXMLFile("kmid_partui.rc"); + setXMLFile("tdemid_partui.rc"); } @@ -141,4 +141,4 @@ KMidBrowserExtension::KMidBrowserExtension(KMidPart *parent) KMidBrowserExtension::~KMidBrowserExtension() { } -#include "kmid_part.moc" +#include "tdemid_part.moc" diff --git a/kmid/kmid_part.h b/tdemid/tdemid_part.h similarity index 91% rename from kmid/kmid_part.h rename to tdemid/tdemid_part.h index 7e26ae14..e2f07af1 100644 --- a/kmid/kmid_part.h +++ b/tdemid/tdemid_part.h @@ -1,13 +1,13 @@ #ifndef __KMIDPART_H__ #define __KMIDPART_H__ -#include -#include +#include +#include #include class TDEAboutData; class TDEInstance; class KMidBrowserExtension; -class kmidClient; +class tdemidClient; class KDE_EXPORT KMidFactory : public KParts::Factory { @@ -49,7 +49,7 @@ class KMidPart: public KParts::ReadOnlyPart void slotStop(); private: - kmidClient *widget; + tdemidClient *widget; KMidBrowserExtension *m_extension; }; diff --git a/kmid/kmid_partui.rc b/tdemid/tdemid_partui.rc similarity index 90% rename from kmid/kmid_partui.rc rename to tdemid/tdemid_partui.rc index aad5c6b2..2490c4c7 100644 --- a/kmid/kmid_partui.rc +++ b/tdemid/tdemid_partui.rc @@ -1,5 +1,5 @@ - + diff --git a/kmid/kmidbutton.h b/tdemid/tdemidbutton.h similarity index 100% rename from kmid/kmidbutton.h rename to tdemid/tdemidbutton.h diff --git a/kmid/kmidclient.cpp b/tdemid/tdemidclient.cpp similarity index 92% rename from kmid/kmidclient.cpp rename to tdemid/tdemidclient.cpp index 284aa40e..ba85e438 100644 --- a/kmid/kmidclient.cpp +++ b/tdemid/tdemidclient.cpp @@ -1,6 +1,6 @@ /************************************************************************** - kmidclient.cpp - The main client widget of KMid + tdemidclient.cpp - The main client widget of KMid Copyright (C) 1997,98 Antonio Larrosa Jimenez This program is free software; you can redistribute it and/or modify @@ -48,13 +48,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include "kmidclient.h" +#include +#include +#include +#include +#include +#include +#include "tdemidclient.h" #include "klcdnumber.h" #include "randomlist.h" #include "channelview.h" @@ -65,7 +65,7 @@ //#define TEMPHACK -kmidClient::kmidClient(TQWidget *parent, KActionCollection *ac, const char *name) +tdemidClient::tdemidClient(TQWidget *parent, KActionCollection *ac, const char *name) : DCOPObject("KMidIface"), TQWidget(parent,name) { actionCollection=ac; @@ -213,7 +213,7 @@ kmidClient::kmidClient(TQWidget *parent, KActionCollection *ac, const char *name lh2->addWidget( kdispt ); } -/*void kmidClient::resizeEvent(TQResizeEvent *) +/*void tdemidClient::resizeEvent(TQResizeEvent *) { //timebar->resize(width()-5,timebar->height()); timebar->setGeometry(5,10,width()-5,timebar->height()); @@ -225,7 +225,7 @@ kmidClient::kmidClient(TQWidget *parent, KActionCollection *ac, const char *name } */ -kmidClient::~kmidClient() +tdemidClient::~tdemidClient() { if (m_kMid.pctl->playing==1) { @@ -278,7 +278,7 @@ char *extractFilename(const char *in,char *out) return result; } -int kmidClient::openFile(const char *filename) +int tdemidClient::openFile(const char *filename) { m_kMid.pctl->message|=PLAYER_HALT; stop(); @@ -360,7 +360,7 @@ int kmidClient::openFile(const char *filename) return 0; } -int kmidClient::openURL(const TQString _url) +int tdemidClient::openURL(const TQString _url) { KURL u(_url); if (!u.isValid()) {printf("Malformed URL\n");return -1;}; @@ -399,7 +399,7 @@ int kmidClient::openURL(const TQString _url) return r; } -ulong kmidClient::timeOfNextEvent(int *type) +ulong tdemidClient::timeOfNextEvent(int *type) { int t=0; ulong x=0; @@ -502,7 +502,7 @@ ulong kmidClient::timeOfNextEvent(int *type) */ } -void kmidClient::slotPlay() +void tdemidClient::slotPlay() { if (!player->isSongLoaded()) { @@ -541,7 +541,7 @@ void kmidClient::slotPlay() #ifdef KMidDEBUG printf("PlayerProcessID: %d\n",getpid()); #endif - player->play(0,(void (*)(void))kmidOutput); + player->play(0,(void (*)(void))tdemidOutput); #ifdef KMidDEBUG printf("End of child process\n"); #endif @@ -575,7 +575,7 @@ void kmidClient::slotPlay() #endif } -void kmidClient::timebarUpdate() +void tdemidClient::timebarUpdate() { itsme=1; if (m_kMid.pctl->playing==0) @@ -603,7 +603,7 @@ void kmidClient::timebarUpdate() } } -void kmidClient::slotSeek(int i) +void tdemidClient::slotSeek(int i) { if (itsme) return; @@ -652,7 +652,7 @@ void kmidClient::slotSeek(int i) printf("Player_ProcessID: %d\n",getpid()); #endif - player->play(0,(void (*)(void))kmidOutput); + player->play(0,(void (*)(void))tdemidOutput); #ifdef KMidDEBUG printf("End of child process\n"); @@ -685,7 +685,7 @@ void kmidClient::slotSeek(int i) */ } -void kmidClient::moveEventPointersTo(ulong ms) +void tdemidClient::moveEventPointersTo(ulong ms) { #ifdef KMidDEBUG printf("Move To: %lu\n",ms); @@ -739,7 +739,7 @@ void kmidClient::moveEventPointersTo(ulong ms) */ } -void kmidClient::slotSetVolume(int i) +void tdemidClient::slotSetVolume(int i) { int autochangemap=0; if ((m_kMid.pctl->playing==1)&&(m_kMid.pctl->paused==0)) autochangemap=1; @@ -758,7 +758,7 @@ void kmidClient::slotSetVolume(int i) } -void kmidClient::slotPrevSong() +void tdemidClient::slotPrevSong() { if (currentsl==NULL) return; if (collectionplaylist==NULL) generateCPL(); @@ -796,7 +796,7 @@ void kmidClient::slotPrevSong() } -void kmidClient::slotNextSong() +void tdemidClient::slotNextSong() { if (currentsl==NULL) return; if (collectionplaylist==NULL) generateCPL(); @@ -835,7 +835,7 @@ void kmidClient::slotNextSong() play(); } -void kmidClient::slotPause() +void tdemidClient::slotPause() { if (m_kMid.pctl->playing==0) return; #ifdef KMidDEBUG @@ -872,7 +872,7 @@ void kmidClient::slotPause() #ifdef KMidDEBUG printf("PlayerProcessID: %d\n",getpid()); #endif - player->play(0,(void (*)(void))kmidOutput); + player->play(0,(void (*)(void))tdemidOutput); #ifdef KMidDEBUG printf("End of child process\n"); #endif @@ -913,13 +913,13 @@ void kmidClient::slotPause() } } -void kmidClient::shuttingDown(void) +void tdemidClient::shuttingDown(void) { shuttingdown=true; stop(); } -void kmidClient::slotStop() +void tdemidClient::slotStop() { if (!m_kMid.pctl) return; @@ -965,7 +965,7 @@ void kmidClient::slotStop() ////////while (m_kMid.pctl->OK==0) ; } -void kmidClient::slotRewind() +void tdemidClient::slotRewind() { if ((m_kMid.pctl->playing)&&(!m_kMid.pctl->paused)) { @@ -974,7 +974,7 @@ void kmidClient::slotRewind() } } -void kmidClient::slotForward() +void tdemidClient::slotForward() { if ((m_kMid.pctl->playing)&&(!m_kMid.pctl->paused)) { @@ -984,7 +984,7 @@ void kmidClient::slotForward() } -void kmidClient::allNotesOff() +void tdemidClient::allNotesOff() { bool done=false; m_kMid.pctl->isSendingAllNotesOff=true; @@ -998,7 +998,7 @@ void kmidClient::allNotesOff() m_kMid.pctl->isSendingAllNotesOff=false; } -void kmidClient::kmidOutput(void) +void tdemidClient::tdemidOutput(void) { // Should do nothing /* @@ -1030,7 +1030,7 @@ void kmidClient::kmidOutput(void) } -void kmidClient::processSpecialEvent() +void tdemidClient::processSpecialEvent() { /* if (spev==NULL) @@ -1125,19 +1125,19 @@ void kmidClient::processSpecialEvent() } -void kmidClient::repaintText(int type) +void tdemidClient::repaintText(int type) { kdispt->ChangeTypeOfTextEvents(type); typeoftextevents=type; kdispt->repaint(TRUE); } -int kmidClient::ChooseTypeOfTextEvents(void) +int tdemidClient::ChooseTypeOfTextEvents(void) { return kdispt->ChooseTypeOfTextEvents(); } -void kmidClient::setSongType(int i) +void tdemidClient::setSongType(int i) { int autochangetype=0; if ((m_kMid.pctl->playing==1)&&(m_kMid.pctl->paused==0)) autochangetype=1; @@ -1156,22 +1156,22 @@ void kmidClient::setSongType(int i) } -TQFont * kmidClient::getFont(void) +TQFont * tdemidClient::getFont(void) { return kdispt->getFont(); } -void kmidClient::fontChanged(void) +void tdemidClient::fontChanged(void) { kdispt->fontChanged(); } -void kmidClient::setMidiDevice(int i) +void tdemidClient::setMidiDevice(int i) { midi->setDefaultDevice(i); } -void kmidClient::setMidiMapFilename(const char *mapfilename) +void tdemidClient::setMidiMapFilename(const char *mapfilename) { MidiMapper *map=new MidiMapper(mapfilename); if (map->ok()==-1) @@ -1199,13 +1199,13 @@ void kmidClient::setMidiMapFilename(const char *mapfilename) } } -void kmidClient::setSLManager(SLManager *slm) +void tdemidClient::setSLManager(SLManager *slm) { if (slman!=NULL) delete slman; slman=slm; } -void kmidClient::setActiveCollection(int i) +void tdemidClient::setActiveCollection(int i) { activecollection=i; TDEConfig *kconf=TDEGlobal::instance()->config(); @@ -1219,7 +1219,7 @@ void kmidClient::setActiveCollection(int i) initializing_songs=0; } -void kmidClient::fillInComboSongs(void) +void tdemidClient::fillInComboSongs(void) { //int oldselected=comboSongs->currentItem(); comboSongs->clear(); @@ -1249,7 +1249,7 @@ void kmidClient::fillInComboSongs(void) slotSelectSong(currentsl->getActiveSongID()-1); } -void kmidClient::slotSelectSong(int i) +void tdemidClient::slotSelectSong(int i) { if (currentsl==NULL) return; i++; @@ -1287,20 +1287,20 @@ void kmidClient::slotSelectSong(int i) } -int kmidClient::getSelectedSong(void) +int tdemidClient::getSelectedSong(void) { if (currentsl==NULL) return -1; return currentsl->getActiveSongID(); } -void kmidClient::setSongLoop(int i) +void tdemidClient::setSongLoop(int i) { loopsong=i; } -void kmidClient::generateCPL(void) +void tdemidClient::generateCPL(void) { delete [] collectionplaylist; collectionplaylist=0; @@ -1314,13 +1314,13 @@ void kmidClient::generateCPL(void) } -void kmidClient::setCollectionPlayMode(int i) +void tdemidClient::setCollectionPlayMode(int i) { collectionplaymode=i; generateCPL(); } -void kmidClient::saveCollections(void) +void tdemidClient::saveCollections(void) { if (slman==NULL) return; #ifdef KMidDEBUG @@ -1329,12 +1329,12 @@ void kmidClient::saveCollections(void) slman->saveConfig(TQFile::encodeName(collectionsfile)); } -void kmidClient::saveLyrics(FILE *fh) +void tdemidClient::saveLyrics(FILE *fh) { if (kdispt!=NULL) kdispt->saveLyrics(fh); } -int kmidClient::searchInCPL(int song) +int tdemidClient::searchInCPL(int song) { if (currentsl==NULL) return -1; int i=0; @@ -1344,7 +1344,7 @@ int kmidClient::searchInCPL(int song) return -1; } -void kmidClient::visibleVolumeBar(int i) +void tdemidClient::visibleVolumeBar(int i) { #ifndef TEMPHACK visiblevolumebar=i; @@ -1356,7 +1356,7 @@ void kmidClient::visibleVolumeBar(int i) #endif } -void kmidClient::visibleChannelView(int i) +void tdemidClient::visibleChannelView(int i) { if ((channelView==NULL)&&(i==1)) { @@ -1386,14 +1386,14 @@ void kmidClient::visibleChannelView(int i) rethinkNextEvent(); } -void kmidClient::channelViewDestroyed() +void tdemidClient::channelViewDestroyed() { channelView=NULL; rethinkNextEvent(); } -void kmidClient::rethinkNextEvent(void) +void tdemidClient::rethinkNextEvent(void) { if (m_kMid.pctl->playing==0) return; timer4events->stop(); @@ -1413,7 +1413,7 @@ void kmidClient::rethinkNextEvent(void) timer4events->start(delaymillisec,TRUE); } -void kmidClient::communicationFromChannelView(int *i) +void tdemidClient::communicationFromChannelView(int *i) { if (i==NULL) return; int autocontplaying=0; @@ -1440,7 +1440,7 @@ void kmidClient::communicationFromChannelView(int *i) } -void kmidClient::slotSetTempo(double value) +void tdemidClient::slotSetTempo(double value) { if (!player->isSongLoaded()) { @@ -1516,91 +1516,91 @@ void kmidClient::slotSetTempo(double value) } -void kmidClient::downloadFinished(TDEIO::Job *) +void tdemidClient::downloadFinished(TDEIO::Job *) { downloaded=true; kapp->exit_loop(); } -TQSize kmidClient::sizeHint() const +TQSize tdemidClient::sizeHint() const { TQSize sh = TQWidget::sizeHint(); return sh.expandedTo(TQSize(560,420)); } -TQSizePolicy kmidClient::sizePolicy() +TQSizePolicy tdemidClient::sizePolicy() { return TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); } -void kmidClient::play() +void tdemidClient::play() { slotPlay(); } -void kmidClient::pause() +void tdemidClient::pause() { slotPause(); } -void kmidClient::stop() +void tdemidClient::stop() { slotStop(); } -void kmidClient::rewind() +void tdemidClient::rewind() { slotRewind(); } -void kmidClient::forward() +void tdemidClient::forward() { slotForward(); } -void kmidClient::seek(int ms) +void tdemidClient::seek(int ms) { slotSeek(ms); } -void kmidClient::prevSong() +void tdemidClient::prevSong() { slotPrevSong(); } -void kmidClient::nextSong() +void tdemidClient::nextSong() { slotNextSong(); } -void kmidClient::setVolume(int i) +void tdemidClient::setVolume(int i) { slotSetVolume(200-i); } -void kmidClient::setTempo(int i) +void tdemidClient::setTempo(int i) { slotSetTempo(i); } -void kmidClient::setSongEncoding( int i ) +void tdemidClient::setSongEncoding( int i ) { KListAction *tmplistaction= ((KListAction*)actionCollection->action("file_type")); tmplistaction->setCurrentItem(i); } -void kmidClient::setLyricEvents( int i ) +void tdemidClient::setLyricEvents( int i ) { KListAction *tmplistaction= ((KListAction*)actionCollection->action("display_events")); tmplistaction->setCurrentItem(i); } -void kmidClient::setCurrentSong(int i) +void tdemidClient::setCurrentSong(int i) { getComboSongs()->setCurrentItem(i-1); slotSelectSong(i-1); } -void kmidClient::setPlayListMode(int i) +void tdemidClient::setPlayListMode(int i) { ((KListAction*)actionCollection->action("play_order"))->setCurrentItem(i); } -void kmidClient::slotSelectEncoding(int i) +void tdemidClient::slotSelectEncoding(int i) { if (i == 0) kdispt->setLyricsEncoding(TQString()); // Default else kdispt->setLyricsEncoding(TDEGlobal::charsets()->encodingForName(comboEncodings->text(i))); } -#include "kmidclient.moc" +#include "tdemidclient.moc" diff --git a/kmid/kmidclient.h b/tdemid/tdemidclient.h similarity index 93% rename from kmid/kmidclient.h rename to tdemid/tdemidclient.h index 18bef039..526b0656 100644 --- a/kmid/kmidclient.h +++ b/tdemid/tdemidclient.h @@ -1,6 +1,6 @@ /************************************************************************** - kmidclient.h - The main client widget of KMid + tdemidclient.h - The main client widget of KMid Copyright (C) 1997,98 Antonio Larrosa Jimenez This program is free software; you can redistribute it and/or modify @@ -25,10 +25,10 @@ #define _KMIDCLIENT_H #include "qslidertime.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include @@ -36,7 +36,7 @@ #include "kdisptext.h" #include "slman.h" #include "version.h" -#include "kmidIface.h" +#include "tdemidIface.h" #include @@ -52,7 +52,7 @@ class RhythmView; class ChannelView; class TQString; -class kmidClient : public TQWidget, virtual public KMidIface +class tdemidClient : public TQWidget, virtual public KMidIface { Q_OBJECT @@ -106,8 +106,8 @@ private: int openFile(const char *filename); void allNotesOff(void); public: - kmidClient(TQWidget *parent, KActionCollection *ac, const char *name=0); - ~kmidClient(); + tdemidClient(TQWidget *parent, KActionCollection *ac, const char *name=0); + ~tdemidClient(); char *midiFileName(void) {return midifile_opened;}; // If it returns NULL then there isn't any file opened @@ -118,7 +118,7 @@ public: int openURL(const TQString s); void repaintText(int typeoftextevents); - static void kmidOutput(void); + static void tdemidOutput(void); int ChooseTypeOfTextEvents(void); diff --git a/kmid/kmidframe.cpp b/tdemid/tdemidframe.cpp similarity index 69% rename from kmid/kmidframe.cpp rename to tdemid/tdemidframe.cpp index 44a7157d..cbadbc73 100644 --- a/kmid/kmidframe.cpp +++ b/tdemid/tdemidframe.cpp @@ -1,6 +1,6 @@ /************************************************************************** - kmidframe.cpp - The main widget of KMid + tdemidframe.cpp - The main widget of KMid Copyright (C) 1997,98 Antonio Larrosa Jimenez This program is free software; you can redistribute it and/or modify @@ -50,39 +50,39 @@ #include #include -#include "kmidframe.h" -#include "kmidclient.h" +#include "tdemidframe.h" +#include "tdemidclient.h" #include "midicfgdlg.h" #include "collectdlg.h" #include "channelcfgdlg.h" #include "channelview.h" #include "version.h" -kmidFrame::kmidFrame(const char *name) +tdemidFrame::tdemidFrame(const char *name) :KMainWindow(0, name) { - kmidclient=new kmidClient(this,actionCollection(), "KMidClient"); - kmidclient->setSongType(1); - kmidclient->show(); - setCentralWidget( kmidclient ); + tdemidclient=new tdemidClient(this,actionCollection(), "KMidClient"); + tdemidclient->setSongType(1); + tdemidclient->show(); + setCentralWidget( tdemidclient ); /* kKeysAccel=new KAccel(this); kKeysAccel->insertItem(i18n("Play/Pause"),"Play/Pause", Key_Space); kKeysAccel->connectItem("Play/Pause", TQT_TQOBJECT(this), TQT_SLOT(spacePressed())); kKeysAccel->insertItem(i18n("Stop"),"Stop", Key_Backspace); - kKeysAccel->connectItem("Stop",kmidclient,TQT_SLOT(song_Stop())); + kKeysAccel->connectItem("Stop",tdemidclient,TQT_SLOT(song_Stop())); kKeysAccel->insertItem(i18n("Previous Song"),"Previous Song", Key_Left); - kKeysAccel->connectItem("Previous Song",kmidclient,TQT_SLOT(song_PlayPrevSong())); + kKeysAccel->connectItem("Previous Song",tdemidclient,TQT_SLOT(song_PlayPrevSong())); kKeysAccel->insertItem(i18n("Next Song"),"Next Song", Key_Right); - kKeysAccel->connectItem("Next Song",kmidclient,TQT_SLOT(song_PlayNextSong())); + kKeysAccel->connectItem("Next Song",tdemidclient,TQT_SLOT(song_PlayNextSong())); kKeysAccel->insertItem(i18n("Scroll Down Karaoke"),"Scroll down karaoke",Key_Down); - kKeysAccel->connectItem("Scroll Down karaoke",kmidclient->getKDisplayText(),TQT_SLOT(ScrollDown())); + kKeysAccel->connectItem("Scroll Down karaoke",tdemidclient->getKDisplayText(),TQT_SLOT(ScrollDown())); kKeysAccel->insertItem(i18n("Scroll Up Karaoke"),"Scroll up karaoke",Key_Up); - kKeysAccel->connectItem("Scroll Up Karaoke",kmidclient->getKDisplayText(),TQT_SLOT(ScrollUp())); + kKeysAccel->connectItem("Scroll Up Karaoke",tdemidclient->getKDisplayText(),TQT_SLOT(ScrollUp())); kKeysAccel->insertItem(i18n("Scroll Page Down Karaoke"),"Scroll page down karaoke",Key_PageDown); - kKeysAccel->connectItem("Scroll Page Down Karaoke",kmidclient->getKDisplayText(),TQT_SLOT(ScrollPageDown())); + kKeysAccel->connectItem("Scroll Page Down Karaoke",tdemidclient->getKDisplayText(),TQT_SLOT(ScrollPageDown())); kKeysAccel->insertItem(i18n("Scroll Page Up Karaoke"),"Scroll page up karaoke",Key_PageUp); - kKeysAccel->connectItem("Scroll Page Up Karaoke",kmidclient->getKDisplayText(),TQT_SLOT(ScrollPageUp())); + kKeysAccel->connectItem("Scroll Page Up Karaoke",tdemidclient->getKDisplayText(),TQT_SLOT(ScrollPageUp())); kKeysAccel->readSettings(); */ @@ -92,25 +92,25 @@ kmidFrame::kmidFrame(const char *name) KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); (void)new KAction(i18n("&Play"), "player_play", TQt::Key_Space, - TQT_TQOBJECT(kmidclient), TQT_SLOT(slotPlay()), actionCollection(), "song_play"); - (void)new KAction(i18n("P&ause"), "player_pause", TQt::Key_P, TQT_TQOBJECT(kmidclient), + TQT_TQOBJECT(tdemidclient), TQT_SLOT(slotPlay()), actionCollection(), "song_play"); + (void)new KAction(i18n("P&ause"), "player_pause", TQt::Key_P, TQT_TQOBJECT(tdemidclient), TQT_SLOT(slotPause()), actionCollection(), "song_pause"); (void)new KAction(i18n("&Stop"), "player_stop", TQt::Key_Backspace, - TQT_TQOBJECT(kmidclient), TQT_SLOT(slotStop()), actionCollection(), "song_stop"); + TQT_TQOBJECT(tdemidclient), TQT_SLOT(slotStop()), actionCollection(), "song_stop"); (void)new KAction(i18n("P&revious Song"), "player_start", Key_Left, - TQT_TQOBJECT(kmidclient), TQT_SLOT(slotPrevSong()), actionCollection(), + TQT_TQOBJECT(tdemidclient), TQT_SLOT(slotPrevSong()), actionCollection(), "song_previous"); (void)new KAction(i18n("&Next Song"), "player_end", Key_Right, - TQT_TQOBJECT(kmidclient), TQT_SLOT(slotNextSong()), actionCollection(), + TQT_TQOBJECT(tdemidclient), TQT_SLOT(slotNextSong()), actionCollection(), "song_next"); (void)new KToggleAction(i18n("&Loop"), 0, TQT_TQOBJECT(this), TQT_SLOT(song_Loop()), actionCollection(), "song_loop"); - (void)new KAction(i18n("Rewind"), "2leftarrow", 0, TQT_TQOBJECT(kmidclient), + (void)new KAction(i18n("Rewind"), "2leftarrow", 0, TQT_TQOBJECT(tdemidclient), TQT_SLOT(slotRewind()), actionCollection(), "song_rewind"); - (void)new KAction(i18n("Forward"), "2rightarrow", 0, TQT_TQOBJECT(kmidclient), + (void)new KAction(i18n("Forward"), "2rightarrow", 0, TQT_TQOBJECT(tdemidclient), TQT_SLOT(slotForward()), actionCollection(), "song_forward"); (void)new KAction(i18n("&Organize..."), 0, TQT_TQOBJECT(this), TQT_SLOT(collect_organize()), @@ -173,7 +173,7 @@ kmidFrame::kmidFrame(const char *name) TQT_SLOT(options_MidiSetup()), actionCollection(), "midi_setup"); - setupGUI((ToolBar | Keys | StatusBar | Save | Create ), "kmidui.rc" ); + setupGUI((ToolBar | Keys | StatusBar | Save | Create ), "tdemidui.rc" ); TDEConfig *cfg=kapp->config(); cfg->setGroup("KMid"); @@ -212,13 +212,13 @@ kmidFrame::kmidFrame(const char *name) setAcceptDrops(true); - connect( kmidclient, TQT_SIGNAL( mustRechooseTextEvent() ), + connect( tdemidclient, TQT_SIGNAL( mustRechooseTextEvent() ), this, TQT_SLOT( rechooseTextEvent() ) ); - connect( kmidclient, TQT_SIGNAL( stopPause() ), + connect( tdemidclient, TQT_SIGNAL( stopPause() ), this, TQT_SLOT( song_stopPause() ) ); -// connect( kmidclient, TQT_SIGNAL( channelView_Destroyed() ), +// connect( tdemidclient, TQT_SIGNAL( channelView_Destroyed() ), // this, TQT_SLOT( channelViewDestroyed() ) ); TDECmdLineArgs * args = TDECmdLineArgs::parsedArgs(); @@ -240,17 +240,17 @@ kmidFrame::kmidFrame(const char *name) i++; } - kmidclient->setActiveCollection(c); + tdemidclient->setActiveCollection(c); - /// kmidclient->openURL((kapp->argv())[1]); + /// tdemidclient->openURL((kapp->argv())[1]); /* if ((cfg->readNumEntry("AutomaticTextEventChooser",1))==1) { - if (kmidclient->ChooseTypeOfTextEvents()==1) + if (tdemidclient->ChooseTypeOfTextEvents()==1) options_Text(); else options_Lyrics(); }*/ - if (kmidclient->midiFileName()!=NULL) kmidclient->play(); + if (tdemidclient->midiFileName()!=NULL) tdemidclient->play(); cfg->writeEntry("AutoAddToCollection",backautoadd); } @@ -266,15 +266,15 @@ kmidFrame::kmidFrame(const char *name) if (!client->isRegistered()) // just in case we're embeeded { client->attach(); - client->registerAs("kmid"); + client->registerAs("tdemid"); } } -kmidFrame::~kmidFrame() +tdemidFrame::~tdemidFrame() { } -void kmidFrame::file_Open() +void tdemidFrame::file_Open() { KURL url = KFileDialog::getOpenURL(TQString(), "*.kar *.mid *.kar.gz *.mid.gz\n*.kar *.kar.gz\n*.mid *.mid.gz\n*",this); @@ -292,55 +292,55 @@ void kmidFrame::file_Open() -void kmidFrame::song_stopPause() +void tdemidFrame::song_stopPause() { - if (kmidclient->isPaused()) + if (tdemidclient->isPaused()) { // song_Pause(); ((KToggleAction*)actionCollection()->action("song_pause"))->setChecked(false); - kmidclient->pause(); + tdemidclient->pause(); } } -void kmidFrame::options_FileType(int i) +void tdemidFrame::options_FileType(int i) { TDEConfig *cfg=kapp->config(); cfg->setGroup("KMid"); cfg->writeEntry("TypeOfMidiFile",i); - kmidclient->setSongType(1-i); + tdemidclient->setSongType(1-i); } -void kmidFrame::options_DisplayEvents(int i) +void tdemidFrame::options_DisplayEvents(int i) { TDEConfig *cfg=kapp->config(); cfg->setGroup("KMid"); cfg->writeEntry("TypeOfTextEvents",(i==0)?1:5); cfg->sync(); - kmidclient->repaintText((i==0)?1:5); + tdemidclient->repaintText((i==0)?1:5); } -void kmidFrame::options_AutomaticText() +void tdemidFrame::options_AutomaticText() { TDEConfig *cfg=kapp->config(); cfg->setGroup("KMid"); cfg->writeEntry("AutomaticTextEventChooser",1-cfg->readNumEntry("AutomaticTextEventChooser",1)); } -void kmidFrame::options_FontChange() +void tdemidFrame::options_FontChange() { KFontDialog *kfd=new KFontDialog(this); TQFont font; - font=*kmidclient->getFont(); + font=*tdemidclient->getFont(); kfd->getFont(font); delete kfd; TDEConfig *cfg=kapp->config(); cfg->setGroup("KMid"); cfg->writeEntry("KaraokeFont",font); cfg->sync(); - kmidclient->fontChanged(); + tdemidclient->fontChanged(); } -int kmidFrame::autoAddSongToCollection(const TQString& filename,int setactive) +int tdemidFrame::autoAddSongToCollection(const TQString& filename,int setactive) { int r; SLManager *slman; @@ -350,20 +350,20 @@ int kmidFrame::autoAddSongToCollection(const TQString& filename,int setactive) if (cfg->readNumEntry("AutoAddToCollection",0)==0) { r=0; - slman=kmidclient->getSLManager(); + slman=tdemidclient->getSLManager(); if (setactive) slman->createTemporaryCollection(); sl=slman->getCollection(0); - if (filename==NULL) sl->AddSong(kmidclient->midiFileName()); + if (filename==NULL) sl->AddSong(tdemidclient->midiFileName()); else sl->AddSong(TQFile::encodeName(filename)); } else { - slman=kmidclient->getSLManager(); - sl=slman->getCollection(kmidclient->getActiveCollection()); - r=kmidclient->getActiveCollection(); + slman=tdemidclient->getSLManager(); + sl=slman->getCollection(tdemidclient->getActiveCollection()); + r=tdemidclient->getActiveCollection(); if (sl==NULL) return 0; int id; - if (filename==NULL) id=sl->AddSong(kmidclient->midiFileName()); + if (filename==NULL) id=sl->AddSong(tdemidclient->midiFileName()); else id=sl->AddSong(TQFile::encodeName(filename)); if (setactive) { @@ -373,17 +373,17 @@ int kmidFrame::autoAddSongToCollection(const TQString& filename,int setactive) return r; } -void kmidFrame::urlDrop_slot(TQDropEvent* e) +void tdemidFrame::urlDrop_slot(TQDropEvent* e) { dropEvent(e); } -void kmidFrame::dragEnterEvent(TQDragEnterEvent* e) +void tdemidFrame::dragEnterEvent(TQDragEnterEvent* e) { e->accept(KURLDrag::canDecode(e)); } -void kmidFrame::dropEvent( TQDropEvent * event ) +void tdemidFrame::dropEvent( TQDropEvent * event ) { KURL::List list; KURLDrag::decode(event, list); @@ -412,58 +412,58 @@ void kmidFrame::dropEvent( TQDropEvent * event ) if (!first) { - kmidclient->setActiveCollection(c); + tdemidclient->setActiveCollection(c); - if ((!kmidclient->isPlaying())&&(kmidclient->midiFileName()!=NULL)) - kmidclient->play(); + if ((!tdemidclient->isPlaying())&&(tdemidclient->midiFileName()!=NULL)) + tdemidclient->play(); } } -void kmidFrame::shuttingDown() +void tdemidFrame::shuttingDown() { - if (kmidclient->isPlaying()==1) + if (tdemidclient->isPlaying()==1) { -// kmidclient->stop(); - kmidclient->shuttingDown(); +// tdemidclient->stop(); + tdemidclient->shuttingDown(); } - kmidclient->saveCollections(); + tdemidclient->saveCollections(); } -void kmidFrame::saveProperties(TDEConfig *cfg) +void tdemidFrame::saveProperties(TDEConfig *cfg) { - kmidclient->saveCollections(); - int play=kmidclient->isPlaying(); - cfg->writeEntry("File",kmidclient->midiFileName()); - cfg->writeEntry("ActiveCollection",kmidclient->getActiveCollection()); - cfg->writeEntry("ActiveSong",kmidclient->getSelectedSong()); + tdemidclient->saveCollections(); + int play=tdemidclient->isPlaying(); + cfg->writeEntry("File",tdemidclient->midiFileName()); + cfg->writeEntry("ActiveCollection",tdemidclient->getActiveCollection()); + cfg->writeEntry("ActiveSong",tdemidclient->getSelectedSong()); cfg->writeEntry("Playing",play); } -void kmidFrame::readProperties(TDEConfig *cfg) +void tdemidFrame::readProperties(TDEConfig *cfg) { int activecol=cfg->readNumEntry("ActiveCollection",0); int activesong=cfg->readNumEntry("ActiveSong",0); int wasplaying=cfg->readNumEntry("Playing",0); - SLManager *slman=kmidclient->getSLManager(); + SLManager *slman=tdemidclient->getSLManager(); SongList *sl=slman->getCollection(activecol); sl->setActiveSong(activesong); - kmidclient->setActiveCollection(activecol); - kmidclient->slotSelectSong(activesong-1); + tdemidclient->setActiveCollection(activecol); + tdemidclient->slotSelectSong(activesong-1); if ((activecol==0)&&(wasplaying)) // It was the temporary collection, { // surely the user would like to continue // hearing the song TQString s = cfg->readPathEntry("File"); int c=autoAddSongToCollection(s,1); - kmidclient->setActiveCollection(c); + tdemidclient->setActiveCollection(c); } - if ((wasplaying)&&(kmidclient->midiFileName()!=NULL)) kmidclient->play(); + if ((wasplaying)&&(tdemidclient->midiFileName()!=NULL)) tdemidclient->play(); } -void kmidFrame::options_MidiSetup() +void tdemidFrame::options_MidiSetup() { - if (kmidclient->devman()->checkInit()<0) + if (tdemidclient->devman()->checkInit()<0) { KMessageBox::error(this, i18n("Could not open /dev/sequencer to get some info.\nProbably there is another program using it.")); @@ -471,33 +471,33 @@ void kmidFrame::options_MidiSetup() } MidiConfigDialog *dlg; - dlg=new MidiConfigDialog(kmidclient->devman(),NULL,"MidiDialog"); + dlg=new MidiConfigDialog(tdemidclient->devman(),NULL,"MidiDialog"); if (dlg->exec() == TQDialog::Accepted) { TDEConfig *cfg=kapp->config(); cfg->setGroup("KMid"); cfg->writeEntry("MidiPortNumber",MidiConfigDialog::selecteddevice); - kmidclient->setMidiDevice(MidiConfigDialog::selecteddevice); + tdemidclient->setMidiDevice(MidiConfigDialog::selecteddevice); cfg->setGroup("Midimapper"); cfg->writePathEntry("LoadFile", (MidiConfigDialog::selectedmap==NULL)? TQString():MidiConfigDialog::selectedmap); - kmidclient->setMidiMapFilename(MidiConfigDialog::selectedmap); + tdemidclient->setMidiMapFilename(MidiConfigDialog::selectedmap); } delete dlg; } -void kmidFrame::collect_organize() +void tdemidFrame::collect_organize() { CollectionDialog *dlg; - SLManager *slman=new SLManager(*kmidclient->getSLManager()); - int idx=kmidclient->getActiveCollection(); + SLManager *slman=new SLManager(*tdemidclient->getSLManager()); + int idx=tdemidclient->getActiveCollection(); dlg=new CollectionDialog(slman,idx,NULL,"MidiDialog"); if (dlg->exec() == TQDialog::Accepted) { - kmidclient->setSLManager(slman); - kmidclient->setActiveCollection(CollectionDialog::selectedC); - kmidclient->slotSelectSong( + tdemidclient->setSLManager(slman); + tdemidclient->setActiveCollection(CollectionDialog::selectedC); + tdemidclient->slotSelectSong( (slman->getCollection(CollectionDialog::selectedC))->getActiveSongID()-1); } else @@ -507,14 +507,14 @@ void kmidFrame::collect_organize() delete dlg; } -void kmidFrame::rechooseTextEvent() +void tdemidFrame::rechooseTextEvent() { TDEConfig *cfg=kapp->config(); cfg->setGroup("KMid"); if ((cfg->readNumEntry("AutomaticTextEventChooser",1))==1) { - int t=kmidclient->ChooseTypeOfTextEvents(); - kmidclient->repaintText(t); + int t=tdemidclient->ChooseTypeOfTextEvents(); + tdemidclient->repaintText(t); if (t==1) ((KSelectAction*)actionCollection()->action("display_events"))->setCurrentItem(0); else @@ -522,26 +522,26 @@ void kmidFrame::rechooseTextEvent() } } -void kmidFrame::song_Loop() +void tdemidFrame::song_Loop() { TDEConfig *cfg=kapp->config(); cfg->setGroup("KMid"); int i=1-cfg->readNumEntry("Loop",0); cfg->writeEntry("Loop",i); cfg->sync(); - kmidclient->setSongLoop(i); + tdemidclient->setSongLoop(i); } -void kmidFrame::collect_PlayOrder(int i) +void tdemidFrame::collect_PlayOrder(int i) { TDEConfig *cfg=kapp->config(); cfg->setGroup("KMid"); cfg->writeEntry("CollectionPlayMode", i); cfg->sync(); - kmidclient->setCollectionPlayMode(i); + tdemidclient->setCollectionPlayMode(i); } -void kmidFrame::collect_AutoAdd() +void tdemidFrame::collect_AutoAdd() { TDEConfig *cfg=kapp->config(); cfg->setGroup("KMid"); @@ -549,7 +549,7 @@ void kmidFrame::collect_AutoAdd() cfg->sync(); } -void kmidFrame::file_SaveLyrics() +void tdemidFrame::file_SaveLyrics() { KURL url = KFileDialog::getSaveURL(TQString(),"*",this); @@ -573,120 +573,120 @@ void kmidFrame::file_SaveLyrics() } FILE *fh=fopen(TQFile::encodeName(filename),"wt"); - kmidclient->saveLyrics(fh); + tdemidclient->saveLyrics(fh); fclose(fh); } -void kmidFrame::spacePressed() +void tdemidFrame::spacePressed() { - if (!kmidclient->isPlaying()) kmidclient->play(); + if (!tdemidclient->isPlaying()) tdemidclient->play(); else pause(); } -void kmidFrame::options_ShowVolumeBar() +void tdemidFrame::options_ShowVolumeBar() { TDEConfig *cfg=kapp->config(); cfg->setGroup("KMid"); int i=1-cfg->readNumEntry("ShowVolumeBar",0); cfg->writeEntry("ShowVolumeBar",i); - kmidclient->visibleVolumeBar(i); + tdemidclient->visibleVolumeBar(i); } -void kmidFrame::options_ShowChannelView() +void tdemidFrame::options_ShowChannelView() { if (!((KToggleAction*)actionCollection()->action("toggle_channelview"))->isChecked()) { - kmidclient->visibleChannelView(0); + tdemidclient->visibleChannelView(0); } else { - kmidclient->visibleChannelView(1); - connect (kmidclient->getChannelView(),TQT_SIGNAL(destroyMe()),this,TQT_SLOT(channelViewDestroyed())); + tdemidclient->visibleChannelView(1); + connect (tdemidclient->getChannelView(),TQT_SIGNAL(destroyMe()),this,TQT_SLOT(channelViewDestroyed())); } } -void kmidFrame::channelViewDestroyed() +void tdemidFrame::channelViewDestroyed() { - kmidclient->channelViewDestroyed(); + tdemidclient->channelViewDestroyed(); ((KToggleAction*)actionCollection()->action("toggle_channelview"))->setChecked(false); } -void kmidFrame::options_ChannelViewOptions() +void tdemidFrame::options_ChannelViewOptions() { ChannelViewConfigDialog *dlg; dlg=new ChannelViewConfigDialog(NULL,"ChannelViewConfigDialog"); if (dlg->exec() == TQDialog::Accepted) { - if (kmidclient->getChannelView()) - kmidclient->getChannelView()->lookMode( + if (tdemidclient->getChannelView()) + tdemidclient->getChannelView()->lookMode( ChannelViewConfigDialog::selectedmode ); } delete dlg; } -void kmidFrame::openURL( const TQString url ) +void tdemidFrame::openURL( const TQString url ) { int c=autoAddSongToCollection(url,1); - kmidclient->setActiveCollection(c); + tdemidclient->setActiveCollection(c); } -/*void kmidFrame::play() +/*void tdemidFrame::play() { - kmidclient->play(); + tdemidclient->play(); } -void kmidFrame::pause() +void tdemidFrame::pause() { -// kmidclient->pause(); +// tdemidclient->pause(); ((KAction*)actionCollection()->action("pause"))->activate(); } -void kmidFrame::stop() +void tdemidFrame::stop() { - kmidclient->stop(); + tdemidclient->stop(); } -void kmidFrame::rewind() +void tdemidFrame::rewind() { - kmidclient->rewind(); + tdemidclient->rewind(); } -void kmidFrame::forward() +void tdemidFrame::forward() { - kmidclient->forward(); + tdemidclient->forward(); } -void kmidFrame::seek(int ms) +void tdemidFrame::seek(int ms) { - kmidclient->timebarChange(ms); + tdemidclient->timebarChange(ms); } -void kmidFrame::prevSong() +void tdemidFrame::prevSong() { - kmidclient->prevSong(); + tdemidclient->prevSong(); } -void kmidFrame::nextSong() +void tdemidFrame::nextSong() { - kmidclient->nextSong(); + tdemidclient->nextSong(); } -void kmidFrame::setSongLoop(int i) +void tdemidFrame::setSongLoop(int i) { ((KToggleAction*)actionCollection()->action("song_loop"))->setChecked(i!=0); } -void kmidFrame::setVolume(int i) +void tdemidFrame::setVolume(int i) { - kmidclient->volumebarChange(200-i); + tdemidclient->volumebarChange(200-i); } -void kmidFrame::setTempo(int i) +void tdemidFrame::setTempo(int i) { - kmidclient->changeTempo(i); + tdemidclient->changeTempo(i); } -void kmidFrame::setSongType( int i ) +void tdemidFrame::setSongType( int i ) { KSelectAction *tmplistaction= ((KSelectAction*)actionCollection()->action("file_type")); @@ -694,30 +694,30 @@ void kmidFrame::setSongType( int i ) tmplistaction->setCurrentItem(i); } -void kmidFrame::setLyricEvents( int i ) +void tdemidFrame::setLyricEvents( int i ) { KSelectAction *tmplistaction= ((KSelectAction*)actionCollection()->action("display_events")); tmplistaction->setCurrentItem(i); } -void kmidFrame::selectSong(int i) +void tdemidFrame::selectSong(int i) { - kmidclient->getComboSongs()->setCurrentItem(i-1); - kmidclient->selectSong(i-1); + tdemidclient->getComboSongs()->setCurrentItem(i-1); + tdemidclient->selectSong(i-1); } -void kmidFrame::setActiveCollection( int i ) +void tdemidFrame::setActiveCollection( int i ) { - kmidclient->setActiveCollection(i); + tdemidclient->setActiveCollection(i); } -void kmidFrame::setCollectionPlayMode(int i) +void tdemidFrame::setCollectionPlayMode(int i) { ((KSelectAction*)actionCollection()->action("play_order"))->setCurrentItem(i); } -void kmidFrame::setMidiDevice(int i) +void tdemidFrame::setMidiDevice(int i) { @@ -725,4 +725,4 @@ void kmidFrame::setMidiDevice(int i) */ -#include "kmidframe.moc" +#include "tdemidframe.moc" diff --git a/kmid/kmidframe.h b/tdemid/tdemidframe.h similarity index 91% rename from kmid/kmidframe.h rename to tdemid/tdemidframe.h index f028c749..e146762e 100644 --- a/kmid/kmidframe.h +++ b/tdemid/tdemidframe.h @@ -1,6 +1,6 @@ /************************************************************************** - kmidframe.h - The main widget of KMid + tdemidframe.h - The main widget of KMid Copyright (C) 1997,98 Antonio Larrosa Jimenez This program is free software; you can redistribute it and/or modify @@ -26,20 +26,20 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include class TDEApplication; class TDEConfig; -class kmidClient; +class tdemidClient; class KToolBar; class TQDragEvent; class KAccel; -class KDE_EXPORT kmidFrame : public KMainWindow +class KDE_EXPORT tdemidFrame : public KMainWindow { Q_OBJECT @@ -77,8 +77,8 @@ protected: public: - kmidFrame(const char *name=0); - virtual ~kmidFrame(); + tdemidFrame(const char *name=0); + virtual ~tdemidFrame(); public slots: @@ -128,7 +128,7 @@ public slots: void shuttingDown(); private: - kmidClient *kmidclient; + tdemidClient *tdemidclient; }; #endif diff --git a/kmid/kmidui.rc b/tdemid/tdemidui.rc similarity index 97% rename from kmid/kmidui.rc rename to tdemid/tdemidui.rc index 8553ad2e..28d60897 100644 --- a/kmid/kmidui.rc +++ b/tdemid/tdemidui.rc @@ -1,5 +1,5 @@ - + &File diff --git a/kmid/version.h b/tdemid/version.h similarity index 88% rename from kmid/version.h rename to tdemid/version.h index be282fff..b2416c18 100644 --- a/kmid/version.h +++ b/tdemid/version.h @@ -13,13 +13,13 @@ //#define AT_HOME -// The next definition makes kmid display some general debug messages +// The next definition makes tdemid display some general debug messages // that may be helpful to locate any bug, but without making lots of // messages. Please when reporting a bug, be sure that this is set and // send me the output. //#define GENERAL_DEBUG_MESSAGES -// Define MODE_DEMO_ONLYVISUAL for kmid to work on systems with no soundcard, +// Define MODE_DEMO_ONLYVISUAL for tdemid to work on systems with no soundcard, // or when it is not well configured. You will only get visual feedback, that // is, you will see the letter changing of colors, but no music. Really, you // would get music if it is possible, but by defining this, many synchronization diff --git a/kmid/x-karaoke.desktop b/tdemid/x-karaoke.desktop similarity index 100% rename from kmid/x-karaoke.desktop rename to tdemid/x-karaoke.desktop