summaryrefslogtreecommitdiffstats
path: root/tdefile-plugins
diff options
context:
space:
mode:
Diffstat (limited to 'tdefile-plugins')
-rw-r--r--tdefile-plugins/au/tdefile_au.h2
-rw-r--r--tdefile-plugins/avi/tdefile_avi.h2
-rw-r--r--tdefile-plugins/flac/tdefile_flac.cpp16
-rw-r--r--tdefile-plugins/flac/tdefile_flac.h2
-rw-r--r--tdefile-plugins/m3u/tdefile_m3u.h2
-rw-r--r--tdefile-plugins/mp3/tdefile_mp3.cpp20
-rw-r--r--tdefile-plugins/mp3/tdefile_mp3.desktop2
-rw-r--r--tdefile-plugins/mp3/tdefile_mp3.h2
-rw-r--r--tdefile-plugins/mpc/tdefile_mpc.cpp14
-rw-r--r--tdefile-plugins/mpc/tdefile_mpc.h2
-rw-r--r--tdefile-plugins/mpeg/tdefile_mpeg.h2
-rw-r--r--tdefile-plugins/ogg/tdefile_ogg.h2
-rw-r--r--tdefile-plugins/sid/tdefile_sid.h2
-rw-r--r--tdefile-plugins/theora/tdefile_theora.h2
-rw-r--r--tdefile-plugins/wav/tdefile_wav.h2
15 files changed, 40 insertions, 34 deletions
diff --git a/tdefile-plugins/au/tdefile_au.h b/tdefile-plugins/au/tdefile_au.h
index 9d5104ef..14b141fc 100644
--- a/tdefile-plugins/au/tdefile_au.h
+++ b/tdefile-plugins/au/tdefile_au.h
@@ -26,7 +26,7 @@ class TQStringList;
class KAuPlugin: public KFilePlugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tdefile-plugins/avi/tdefile_avi.h b/tdefile-plugins/avi/tdefile_avi.h
index a533723b..f6718bff 100644
--- a/tdefile-plugins/avi/tdefile_avi.h
+++ b/tdefile-plugins/avi/tdefile_avi.h
@@ -36,7 +36,7 @@ class TQStringList;
class KAviPlugin: public KFilePlugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tdefile-plugins/flac/tdefile_flac.cpp b/tdefile-plugins/flac/tdefile_flac.cpp
index 85d52068..3ee4efa2 100644
--- a/tdefile-plugins/flac/tdefile_flac.cpp
+++ b/tdefile-plugins/flac/tdefile_flac.cpp
@@ -43,6 +43,8 @@
#define TAGLIB_1_2
#endif
+#define TStringToTQString(s) TQString::fromUtf8((s).toCString(true))
+
#include <tstring.h>
#include <tfile.h>
#include <flacfile.h>
@@ -181,13 +183,13 @@ bool KFlacPlugin::readInfo( KFileMetaInfo& info, uint what )
TQString date = file->tag()->year() > 0 ? TQString::number(file->tag()->year()) : TQString();
TQString track = file->tag()->track() > 0 ? TQString::number(file->tag()->track()) : TQString();
- appendItem(commentgroup, "Title", TQString(TStringToQString(file->tag()->title())).stripWhiteSpace());
- appendItem(commentgroup, "Artist", TQString(TStringToQString(file->tag()->artist())).stripWhiteSpace());
- appendItem(commentgroup, "Album", TQString(TStringToQString(file->tag()->album())).stripWhiteSpace());
+ appendItem(commentgroup, "Title", TStringToTQString(file->tag()->title()).stripWhiteSpace());
+ appendItem(commentgroup, "Artist", TStringToTQString(file->tag()->artist()).stripWhiteSpace());
+ appendItem(commentgroup, "Album", TStringToTQString(file->tag()->album()).stripWhiteSpace());
appendItem(commentgroup, "Date", date);
- appendItem(commentgroup, "Comment", TQString(TStringToQString(file->tag()->comment())).stripWhiteSpace());
+ appendItem(commentgroup, "Comment", TStringToTQString(file->tag()->comment()).stripWhiteSpace());
appendItem(commentgroup, "Tracknumber", track);
- appendItem(commentgroup, "Genre", TQString(TStringToQString(file->tag()->genre())).stripWhiteSpace());
+ appendItem(commentgroup, "Genre", TStringToTQString(file->tag()->genre()).stripWhiteSpace());
}
if (readTech && file->audioProperties())
@@ -198,7 +200,7 @@ bool KFlacPlugin::readInfo( KFileMetaInfo& info, uint what )
appendItem(techgroup, "Bitrate", properties->bitrate());
appendItem(techgroup, "Sample Rate", properties->sampleRate());
- appendItem(techgroup, "Sample Width", properties->sampleWidth());
+ appendItem(techgroup, "Sample Width", properties->bitsPerSample());
appendItem(techgroup, "Channels", properties->channels());
appendItem(techgroup, "Length", properties->length());
}
@@ -232,7 +234,7 @@ bool KFlacPlugin::writeInfo(const KFileMetaInfo& info) const
{
TagLib::File *file;
- if (!TagLib::File::isWritable(TQFile::encodeName(info.path()).data())) {
+ if (access(info.path().local8Bit().data(), R_OK|W_OK)) {
kdDebug(7034) << "can't write to " << info.path() << endl;
return false;
}
diff --git a/tdefile-plugins/flac/tdefile_flac.h b/tdefile-plugins/flac/tdefile_flac.h
index 982a8a51..72c1f8c6 100644
--- a/tdefile-plugins/flac/tdefile_flac.h
+++ b/tdefile-plugins/flac/tdefile_flac.h
@@ -31,7 +31,7 @@ class TQStringList;
class KFlacPlugin: public KFilePlugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tdefile-plugins/m3u/tdefile_m3u.h b/tdefile-plugins/m3u/tdefile_m3u.h
index 08a6c506..da2142a9 100644
--- a/tdefile-plugins/m3u/tdefile_m3u.h
+++ b/tdefile-plugins/m3u/tdefile_m3u.h
@@ -28,7 +28,7 @@ class TQStringList;
class KM3uPlugin: public KFilePlugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tdefile-plugins/mp3/tdefile_mp3.cpp b/tdefile-plugins/mp3/tdefile_mp3.cpp
index 041e0313..f6f567cf 100644
--- a/tdefile-plugins/mp3/tdefile_mp3.cpp
+++ b/tdefile-plugins/mp3/tdefile_mp3.cpp
@@ -40,6 +40,8 @@
#include <id3v1genres.h>
#include <id3v2framefactory.h>
+#define TStringToTQString(s) TQString::fromUtf8((s).toCString(true))
+
typedef KGenericFactory<KMp3Plugin> Mp3Factory;
K_EXPORT_COMPONENT_FACTORY(tdefile_mp3, Mp3Factory( "tdefile_mp3" ))
@@ -47,9 +49,9 @@ K_EXPORT_COMPONENT_FACTORY(tdefile_mp3, Mp3Factory( "tdefile_mp3" ))
KMp3Plugin::KMp3Plugin(TQObject *parent, const char *name, const TQStringList &args)
: KFilePlugin(parent, name, args)
{
- kdDebug(7034) << "mp3 plugin\n";
+ kdDebug(7034) << "mp3 plugin for mimetype " << name << endl;
- KFileMimeTypeInfo *info = addMimeTypeInfo("audio/x-mp3");
+ KFileMimeTypeInfo *info = addMimeTypeInfo(name);
// id3 group
@@ -154,21 +156,21 @@ bool KMp3Plugin::readInfo(KFileMetaInfo &info, uint what)
TQString date = file.tag()->year() > 0 ? TQString::number(file.tag()->year()) : TQString();
TQString track = file.tag()->track() > 0 ? TQString::number(file.tag()->track()) : TQString();
- TQString title = TQString(TStringToQString(file.tag()->title())).stripWhiteSpace();
+ TQString title = TStringToTQString(file.tag()->title()).stripWhiteSpace();
if (!title.isEmpty())
appendItem(id3group, "Title", title);
- TQString artist = TQString(TStringToQString(file.tag()->artist())).stripWhiteSpace();
+ TQString artist = TStringToTQString(file.tag()->artist()).stripWhiteSpace();
if (!artist.isEmpty())
appendItem(id3group, "Artist", artist);
- TQString album = TQString(TStringToQString(file.tag()->album())).stripWhiteSpace();
+ TQString album = TStringToTQString(file.tag()->album()).stripWhiteSpace();
if (!album.isEmpty())
appendItem(id3group, "Album", album);
appendItem(id3group, "Date", date);
- TQString comment = TQString(TStringToQString(file.tag()->comment())).stripWhiteSpace();
+ TQString comment = TStringToTQString(file.tag()->comment()).stripWhiteSpace();
if (!comment.isEmpty())
appendItem(id3group, "Comment", comment);
appendItem(id3group, "Tracknumber", track);
- TQString genre = TQString(TStringToQString(file.tag()->genre())).stripWhiteSpace();
+ TQString genre = TStringToTQString(file.tag()->genre()).stripWhiteSpace();
if (!genre.isEmpty())
appendItem(id3group, "Genre", genre);
}
@@ -235,7 +237,7 @@ bool KMp3Plugin::writeInfo(const KFileMetaInfo &info) const
TagLib::ID3v2::FrameFactory::instance()->setDefaultTextEncoding(TagLib::String::UTF8);
TagLib::MPEG::File file(TQFile::encodeName(info.path()).data(), false);
- if(!file.isOpen() || !TagLib::File::isWritable(file.name()))
+ if(!file.isOpen() || access(info.path().local8Bit().data(), R_OK|W_OK))
{
kdDebug(7034) << "couldn't open " << info.path() << endl;
return false;
@@ -294,7 +296,7 @@ TQValidator *KMp3Plugin::createValidator(const TQString & /* mimetype */,
TagLib::StringList genres = TagLib::ID3v1::genreList();
for(TagLib::StringList::ConstIterator it = genres.begin(); it != genres.end(); ++it)
{
- l.append(TStringToQString((*it)));
+ l.append(TStringToTQString((*it)));
}
return new ComboValidator(l, false, true, parent, name);
}
diff --git a/tdefile-plugins/mp3/tdefile_mp3.desktop b/tdefile-plugins/mp3/tdefile_mp3.desktop
index 617ecc02..9eaeb81d 100644
--- a/tdefile-plugins/mp3/tdefile_mp3.desktop
+++ b/tdefile-plugins/mp3/tdefile_mp3.desktop
@@ -3,6 +3,6 @@ Type=Service
Name=MP3 Info
X-TDE-ServiceTypes=KFilePlugin
X-TDE-Library=tdefile_mp3
-MimeType=audio/x-mp3
+MimeType=audio/mpeg;audio/x-mp3
PreferredGroups=id3,Technical
PreferredItems=Title,Artist,Album,Tracknumber,Genre,Bitrate,Length,Date,Comment,Sample Rate,Channels,Version,Layer,Copyright,Original,CRC
diff --git a/tdefile-plugins/mp3/tdefile_mp3.h b/tdefile-plugins/mp3/tdefile_mp3.h
index cc01aa3e..d6e13cb8 100644
--- a/tdefile-plugins/mp3/tdefile_mp3.h
+++ b/tdefile-plugins/mp3/tdefile_mp3.h
@@ -25,7 +25,7 @@ class TQStringList;
class KMp3Plugin: public KFilePlugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tdefile-plugins/mpc/tdefile_mpc.cpp b/tdefile-plugins/mpc/tdefile_mpc.cpp
index 9a6a3d42..b3282c19 100644
--- a/tdefile-plugins/mpc/tdefile_mpc.cpp
+++ b/tdefile-plugins/mpc/tdefile_mpc.cpp
@@ -46,6 +46,8 @@
#include <unistd.h>
#include <ctype.h>
+#define TStringToTQString(s) TQString::fromUtf8((s).toCString(true))
+
K_EXPORT_COMPONENT_FACTORY(tdefile_mpc, KGenericFactory<KMpcPlugin>("tdefile_mpc"))
KMpcPlugin::KMpcPlugin( TQObject *parent, const char *name,
@@ -157,13 +159,13 @@ bool KMpcPlugin::readInfo( KFileMetaInfo& info, uint what )
TQString date = file->tag()->year() > 0 ? TQString::number(file->tag()->year()) : TQString();
TQString track = file->tag()->track() > 0 ? TQString::number(file->tag()->track()) : TQString();
- appendItem(commentgroup, "Title", TQString(TStringToQString(file->tag()->title())).stripWhiteSpace());
- appendItem(commentgroup, "Artist", TQString(TStringToQString(file->tag()->artist())).stripWhiteSpace());
- appendItem(commentgroup, "Album", TQString(TStringToQString(file->tag()->album())).stripWhiteSpace());
+ appendItem(commentgroup, "Title", TStringToTQString(file->tag()->title()).stripWhiteSpace());
+ appendItem(commentgroup, "Artist", TStringToTQString(file->tag()->artist()).stripWhiteSpace());
+ appendItem(commentgroup, "Album", TStringToTQString(file->tag()->album()).stripWhiteSpace());
appendItem(commentgroup, "Date", date);
- appendItem(commentgroup, "Comment", TQString(TStringToQString(file->tag()->comment())).stripWhiteSpace());
+ appendItem(commentgroup, "Comment", TStringToTQString(file->tag()->comment()).stripWhiteSpace());
appendItem(commentgroup, "Tracknumber", track);
- appendItem(commentgroup, "Genre", TQString(TStringToQString(file->tag()->genre())).stripWhiteSpace());
+ appendItem(commentgroup, "Genre", TStringToTQString(file->tag()->genre()).stripWhiteSpace());
}
if (readTech)
@@ -208,7 +210,7 @@ bool KMpcPlugin::writeInfo(const KFileMetaInfo& info) const
{
TagLib::File *file;
- if (!TagLib::File::isWritable(TQFile::encodeName(info.path()).data())) {
+ if (access(info.path().local8Bit().data(), R_OK|W_OK)) {
kdDebug(7034) << "can't write to " << info.path() << endl;
return false;
}
diff --git a/tdefile-plugins/mpc/tdefile_mpc.h b/tdefile-plugins/mpc/tdefile_mpc.h
index 4bb3a387..b3a223e4 100644
--- a/tdefile-plugins/mpc/tdefile_mpc.h
+++ b/tdefile-plugins/mpc/tdefile_mpc.h
@@ -31,7 +31,7 @@ class TQStringList;
class KMpcPlugin: public KFilePlugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tdefile-plugins/mpeg/tdefile_mpeg.h b/tdefile-plugins/mpeg/tdefile_mpeg.h
index 113bd8ee..0bfc2093 100644
--- a/tdefile-plugins/mpeg/tdefile_mpeg.h
+++ b/tdefile-plugins/mpeg/tdefile_mpeg.h
@@ -27,7 +27,7 @@ class TQStringList;
class KMpegPlugin: public KFilePlugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tdefile-plugins/ogg/tdefile_ogg.h b/tdefile-plugins/ogg/tdefile_ogg.h
index f03e4283..38e65047 100644
--- a/tdefile-plugins/ogg/tdefile_ogg.h
+++ b/tdefile-plugins/ogg/tdefile_ogg.h
@@ -28,7 +28,7 @@ class TQStringList;
class KOggPlugin: public KFilePlugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tdefile-plugins/sid/tdefile_sid.h b/tdefile-plugins/sid/tdefile_sid.h
index fadf13f5..cec8465c 100644
--- a/tdefile-plugins/sid/tdefile_sid.h
+++ b/tdefile-plugins/sid/tdefile_sid.h
@@ -27,7 +27,7 @@ class TQStringList;
class KSidPlugin: public KFilePlugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tdefile-plugins/theora/tdefile_theora.h b/tdefile-plugins/theora/tdefile_theora.h
index a1aa0c09..69b3dcd8 100644
--- a/tdefile-plugins/theora/tdefile_theora.h
+++ b/tdefile-plugins/theora/tdefile_theora.h
@@ -30,7 +30,7 @@ class TQStringList;
class theoraPlugin: public KFilePlugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tdefile-plugins/wav/tdefile_wav.h b/tdefile-plugins/wav/tdefile_wav.h
index 53eb6ccd..07c581a9 100644
--- a/tdefile-plugins/wav/tdefile_wav.h
+++ b/tdefile-plugins/wav/tdefile_wav.h
@@ -26,7 +26,7 @@ class TQStringList;
class KWavPlugin: public KFilePlugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 20:41:27 +0000