summaryrefslogtreecommitdiffstats
path: root/src/modules/mediaplayer/mp_xmmsinterface.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules/mediaplayer/mp_xmmsinterface.cpp')
-rw-r--r--src/modules/mediaplayer/mp_xmmsinterface.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/modules/mediaplayer/mp_xmmsinterface.cpp b/src/modules/mediaplayer/mp_xmmsinterface.cpp
index 532327af..730b4fe6 100644
--- a/src/modules/mediaplayer/mp_xmmsinterface.cpp
+++ b/src/modules/mediaplayer/mp_xmmsinterface.cpp
@@ -129,8 +129,8 @@ void * KviXmmsInterface::lookupSymbol(const char * szSymbolName)
{
if(!loadPlayerLibrary())
{
- QString tmp;
- KviQString::sprintf(tmp,__tr2qs_ctx("Can't load the player library (%Q)","mediaplayer"),&m_szPlayerLibraryName);
+ TQString tmp;
+ KviTQString::sprintf(tmp,__tr2qs_ctx("Can't load the player library (%Q)","mediaplayer"),&m_szPlayerLibraryName);
setLastError(tmp);
return 0;
}
@@ -138,8 +138,8 @@ void * KviXmmsInterface::lookupSymbol(const char * szSymbolName)
void * symptr = kvi_library_symbol(m_hPlayerLibrary,szSymbolName);
if(!symptr)
{
- QString tmp;
- KviQString::sprintf(tmp,__tr2qs_ctx("Can't find symbol %s in %Q","mediaplayer"),szSymbolName,&m_szPlayerLibraryName);
+ TQString tmp;
+ KviTQString::sprintf(tmp,__tr2qs_ctx("Can't find symbol %s in %Q","mediaplayer"),szSymbolName,&m_szPlayerLibraryName);
setLastError(tmp);
}
return symptr;
@@ -256,7 +256,7 @@ bool KviXmmsInterface::setShuffle(bool &bVal)
return true;
}
-KviMediaPlayerInterface::PlayerStatus KviXmmsInterface::status()
+KviMediaPlayerInterface::PlayertqStatus KviXmmsInterface::status()
{
bool (*sym1)(int) = (bool (*)(int))lookupSymbol("xmms_remote_is_paused");
if(sym1)
@@ -273,10 +273,10 @@ KviMediaPlayerInterface::PlayerStatus KviXmmsInterface::status()
return KviMediaPlayerInterface::Unknown;
}
-bool KviXmmsInterface::playMrl(const QString &mrl)
+bool KviXmmsInterface::playMrl(const TQString &mrl)
{
void (*sym)(int,char *) = (void (*)(int,char *))lookupSymbol("xmms_remote_playlist_add_url_string");
- KviQCString tmp = mrl.local8Bit();
+ KviTQCString tmp = mrl.local8Bit();
if(!tmp.isEmpty())
{
if(sym)
@@ -300,24 +300,24 @@ bool KviXmmsInterface::playMrl(const QString &mrl)
return true;
}
-QString KviXmmsInterface::nowPlaying()
+TQString KviXmmsInterface::nowPlaying()
{
int (*sym)(int) = (int (*)(int))lookupSymbol("xmms_remote_get_playlist_pos");
- if(!sym)return QString::null;
+ if(!sym)return TQString();
int pos = sym(0);
char * (*sym2)(int,int) = (char * (*)(int,int))lookupSymbol("xmms_remote_get_playlist_title");
- if(!sym2)return QString::null;
- return QString::fromLocal8Bit(sym2(0,pos));
+ if(!sym2)return TQString();
+ return TQString::fromLocal8Bit(sym2(0,pos));
}
-QString KviXmmsInterface::mrl()
+TQString KviXmmsInterface::mrl()
{
int (*sym)(int) = (int (*)(int))lookupSymbol("xmms_remote_get_playlist_pos");
- if(!sym)return QString::null;
+ if(!sym)return TQString();
int pos = sym(0);
char * (*sym2)(int,int) = (char * (*)(int,int))lookupSymbol("xmms_remote_get_playlist_file");
- if(!sym2)return QString::null;
- QString ret = QString::fromLocal8Bit(sym2(0,pos));
+ if(!sym2)return TQString();
+ TQString ret = TQString::fromLocal8Bit(sym2(0,pos));
if(ret.length() > 1)
if(ret[0] == '/')ret.prepend("file://");
return ret;