diff options
Diffstat (limited to 'tdeioslave')
| -rw-r--r-- | tdeioslave/audiocd/Makefile.am | 8 | ||||
| -rw-r--r-- | tdeioslave/audiocd/audiocd.cpp | 4 | ||||
| -rw-r--r-- | tdeioslave/audiocd/audiocd.h | 2 | ||||
| -rw-r--r-- | tdeioslave/audiocd/audiocd.protocol | 2 | ||||
| -rw-r--r-- | tdeioslave/audiocd/plugins/lame/encoderlame.cpp | 2 | ||||
| -rw-r--r-- | tdeioslave/audiocd/plugins/vorbis/encodervorbis.cpp | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/tdeioslave/audiocd/Makefile.am b/tdeioslave/audiocd/Makefile.am index 8e190d4e..980cd6c9 100644 --- a/tdeioslave/audiocd/Makefile.am +++ b/tdeioslave/audiocd/Makefile.am @@ -10,13 +10,13 @@ INCLUDES = -I$(top_srcdir)/libkcddb \ KDE_CXXFLAGS=$(ENABLE_PERMISSIVE_FLAG) -kde_module_LTLIBRARIES = kio_audiocd.la +kde_module_LTLIBRARIES = tdeio_audiocd.la -kio_audiocd_la_SOURCES = audiocd.cpp +tdeio_audiocd_la_SOURCES = audiocd.cpp -kio_audiocd_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +tdeio_audiocd_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -kio_audiocd_la_LIBADD = ./plugins/libaudiocdplugins.la $(LIB_KIO) $(CDPARANOIA_LIBS) $(top_builddir)/libkcddb/libkcddb.la $(top_builddir)/kscd/libkcompactdisc.la +tdeio_audiocd_la_LIBADD = ./plugins/libaudiocdplugins.la $(LIB_KIO) $(CDPARANOIA_LIBS) $(top_builddir)/libkcddb/libkcddb.la $(top_builddir)/kscd/libkcompactdisc.la noinst_HEADERS = audiocd.h diff --git a/tdeioslave/audiocd/audiocd.cpp b/tdeioslave/audiocd/audiocd.cpp index 7898be5a..68192e3d 100644 --- a/tdeioslave/audiocd/audiocd.cpp +++ b/tdeioslave/audiocd/audiocd.cpp @@ -80,7 +80,7 @@ int kdemain(int argc, char ** argv) // with the user putenv(strdup("SESSION_MANAGER=")); TDEApplication::disableAutoDcopRegistration(); - TDECmdLineArgs::init(argc, argv, "kio_audiocd", 0, 0, 0, 0); + TDECmdLineArgs::init(argc, argv, "tdeio_audiocd", 0, 0, 0, 0); TDECmdLineArgs::addCmdLineOptions(options); TDEApplication app(false, true); @@ -758,7 +758,7 @@ struct cdrom_drive *AudioCDProtocol::getDrive() else if(!fi.exists()) error(TDEIO::ERR_DOES_NOT_EXIST, d->device); else error(TDEIO::ERR_SLAVE_DEFINED, -i18n("Unknown error. If you have a cd in the drive try running cdparanoia -vsQ as yourself (not root). Do you see a track list? If not, make sure you have permission to access the CD device. If you are using SCSI emulation (possible if you have an IDE CD writer) then make sure you check that you have read and write permissions on the generic SCSI device, which is probably /dev/sg0, /dev/sg1, etc.. If it still does not work, try typing audiocd:/?device=/dev/sg0 (or similar) to tell kio_audiocd which device your CD-ROM is.")); +i18n("Unknown error. If you have a cd in the drive try running cdparanoia -vsQ as yourself (not root). Do you see a track list? If not, make sure you have permission to access the CD device. If you are using SCSI emulation (possible if you have an IDE CD writer) then make sure you check that you have read and write permissions on the generic SCSI device, which is probably /dev/sg0, /dev/sg1, etc.. If it still does not work, try typing audiocd:/?device=/dev/sg0 (or similar) to tell tdeio_audiocd which device your CD-ROM is.")); return 0; } diff --git a/tdeioslave/audiocd/audiocd.h b/tdeioslave/audiocd/audiocd.h index 75b9bfd2..be805376 100644 --- a/tdeioslave/audiocd/audiocd.h +++ b/tdeioslave/audiocd/audiocd.h @@ -97,7 +97,7 @@ class AudioCDProtocol : public TDEIO::SlaveBase * NOTE: if you want to add a file which is the whole CD, give * trackNo = -1 * NOTE2: you can safely add MP3 or OGG files always. the function - * will check if kio_audiocd was compiled with support for those, + * will check if tdeio_audiocd was compiled with support for those, * so NO NEED to wrap your calls with #ifdef for lame or vorbis. * this function will do the right thing. */ diff --git a/tdeioslave/audiocd/audiocd.protocol b/tdeioslave/audiocd/audiocd.protocol index eb462539..f8963cbb 100644 --- a/tdeioslave/audiocd/audiocd.protocol +++ b/tdeioslave/audiocd/audiocd.protocol @@ -1,5 +1,5 @@ [Protocol] -exec=kio_audiocd +exec=tdeio_audiocd protocol=audiocd input=none output=filesystem diff --git a/tdeioslave/audiocd/plugins/lame/encoderlame.cpp b/tdeioslave/audiocd/plugins/lame/encoderlame.cpp index 8984bb33..a9a6233f 100644 --- a/tdeioslave/audiocd/plugins/lame/encoderlame.cpp +++ b/tdeioslave/audiocd/plugins/lame/encoderlame.cpp @@ -307,7 +307,7 @@ long EncoderLame::readCleanup(){ usleep(1); } - // Now copy the file out of the temp into kio + // Now copy the file out of the temp into tdeio TQFile file( d->tempFile->name() ); if ( file.open( IO_ReadOnly ) ) { TQByteArray output; diff --git a/tdeioslave/audiocd/plugins/vorbis/encodervorbis.cpp b/tdeioslave/audiocd/plugins/vorbis/encodervorbis.cpp index 048a46e0..f1a5bad5 100644 --- a/tdeioslave/audiocd/plugins/vorbis/encodervorbis.cpp +++ b/tdeioslave/audiocd/plugins/vorbis/encodervorbis.cpp @@ -96,7 +96,7 @@ bool EncoderVorbis::init(){ ( &d->vc, const_cast<char *>("kde-encoder"), - const_cast<char *>("kio_audiocd") + const_cast<char *>("tdeio_audiocd") ); return true; } |