aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/mediaplayer
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules/mediaplayer')
-rw-r--r--src/modules/mediaplayer/CMakeLists.txt12
-rw-r--r--src/modules/mediaplayer/MpAmipInterface.cpp (renamed from src/modules/mediaplayer/mp_amipinterface.cpp)84
-rw-r--r--src/modules/mediaplayer/MpAmipInterface.h (renamed from src/modules/mediaplayer/mp_amipinterface.h)14
-rw-r--r--src/modules/mediaplayer/MpInterface.cpp (renamed from src/modules/mediaplayer/mp_interface.cpp)78
-rw-r--r--src/modules/mediaplayer/MpInterface.h (renamed from src/modules/mediaplayer/mp_interface.h)26
-rw-r--r--src/modules/mediaplayer/MpMp3.cpp (renamed from src/modules/mediaplayer/mp_mp3.cpp)4
-rw-r--r--src/modules/mediaplayer/MpMp3.h (renamed from src/modules/mediaplayer/mp_mp3.h)2
-rw-r--r--src/modules/mediaplayer/MpMprisInterface.cpp (renamed from src/modules/mediaplayer/mp_mprisinterface.cpp)164
-rw-r--r--src/modules/mediaplayer/MpMprisInterface.h (renamed from src/modules/mediaplayer/mp_mprisinterface.h)66
-rw-r--r--src/modules/mediaplayer/MpWinampInterface.cpp (renamed from src/modules/mediaplayer/mp_winampinterface.cpp)18
-rw-r--r--src/modules/mediaplayer/MpWinampInterface.h (renamed from src/modules/mediaplayer/mp_winampinterface.h)8
-rw-r--r--src/modules/mediaplayer/MpXmmsInterface.cpp (renamed from src/modules/mediaplayer/mp_xmmsinterface.cpp)16
-rw-r--r--src/modules/mediaplayer/MpXmmsInterface.h (renamed from src/modules/mediaplayer/mp_xmmsinterface.h)8
-rw-r--r--src/modules/mediaplayer/libkvimediaplayer.cpp62
14 files changed, 281 insertions, 281 deletions
diff --git a/src/modules/mediaplayer/CMakeLists.txt b/src/modules/mediaplayer/CMakeLists.txt
index 9ab400403..746132d46 100644
--- a/src/modules/mediaplayer/CMakeLists.txt
+++ b/src/modules/mediaplayer/CMakeLists.txt
@@ -2,12 +2,12 @@
SET(kvimediaplayer_SRCS
libkvimediaplayer.cpp
- mp_interface.cpp
- mp_mp3.cpp
- mp_winampinterface.cpp
- mp_xmmsinterface.cpp
- mp_amipinterface.cpp
- mp_mprisinterface.cpp
+ MpInterface.cpp
+ MpMp3.cpp
+ MpWinampInterface.cpp
+ MpXmmsInterface.cpp
+ MpAmipInterface.cpp
+ MpMprisInterface.cpp
)
# After this call, files will be moc'ed to moc_kvi_*.cpp
diff --git a/src/modules/mediaplayer/mp_amipinterface.cpp b/src/modules/mediaplayer/MpAmipInterface.cpp
index df4e309cd..60c7390f0 100644
--- a/src/modules/mediaplayer/mp_amipinterface.cpp
+++ b/src/modules/mediaplayer/MpAmipInterface.cpp
@@ -1,6 +1,6 @@
//=============================================================================
//
-// File : mp_amipinterface.cpp
+// File : MpAmipInterface.cpp
// Creation date : Sun 27 Mar 2005 16:55:09 by Szymon Stefanek
//
// This file is part of the KVIrc IRC client distribution
@@ -22,7 +22,7 @@
//
//=============================================================================
-#include "mp_amipinterface.h"
+#include "MpAmipInterface.h"
#include "KviOptions.h"
#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
@@ -102,7 +102,7 @@ static QTextCodec * mediaplayer_get_codec()
}
MP_IMPLEMENT_DESCRIPTOR(
- KviAmipInterface,
+ MpAmipInterface,
"amip",
__tr2qs_ctx(
"An interface to the AMIP plug-in.\n" \
@@ -116,8 +116,8 @@ MP_IMPLEMENT_DESCRIPTOR(
-KviAmipInterface::KviAmipInterface()
-: KviMediaPlayerInterface()
+MpAmipInterface::MpAmipInterface()
+: MpInterface()
{
if(!amip_dll) {
bool res = loadAmipDll();
@@ -129,7 +129,7 @@ KviAmipInterface::KviAmipInterface()
}
}
-KviAmipInterface::~KviAmipInterface()
+MpAmipInterface::~MpAmipInterface()
{
if(!amip_dll) return;
ac_uninit();
@@ -138,7 +138,7 @@ KviAmipInterface::~KviAmipInterface()
}
-int KviAmipInterface::detect(bool bStart)
+int MpAmipInterface::detect(bool bStart)
{
if(!amip_dll) return 0;
char host[AC_BUFFER_SIZE];
@@ -148,7 +148,7 @@ int KviAmipInterface::detect(bool bStart)
}
#define MP_AMIP_COMMAND(__cmdname,__acmd) \
- bool KviAmipInterface::__cmdname() \
+ bool MpAmipInterface::__cmdname() \
{ \
return (ac_exec(__acmd) == AC_ERR_NOERROR); \
}
@@ -181,27 +181,27 @@ QString eval_str(const char *var)
return res;
}
-int KviAmipInterface::length()
+int MpAmipInterface::length()
{
return eval_int("var_sl") * 1000;
}
-int KviAmipInterface::position()
+int MpAmipInterface::position()
{
return eval_int("var_psec") * 1000;
}
-int KviAmipInterface::bitRate()
+int MpAmipInterface::bitRate()
{
return eval_int("var_br");
}
-int KviAmipInterface::sampleRate()
+int MpAmipInterface::sampleRate()
{
return eval_int("var_sr");
}
-int KviAmipInterface::channels()
+int MpAmipInterface::channels()
{
int ret = -1;
if(eval_str("var_typ").startsWith("Stereo"))
@@ -211,28 +211,28 @@ int KviAmipInterface::channels()
return ret;
}
-KviMediaPlayerInterface::PlayerStatus KviAmipInterface::status()
+MpInterface::PlayerStatus MpAmipInterface::status()
{
int ret = eval_int("var_stat");
switch(ret)
{
case 0:
- return KviMediaPlayerInterface::Stopped;
+ return MpInterface::Stopped;
break;
case 3:
- return KviMediaPlayerInterface::Paused;
+ return MpInterface::Paused;
break;
case 1:
- return KviMediaPlayerInterface::Playing;
+ return MpInterface::Playing;
break;
default:
- return KviMediaPlayerInterface::Unknown;
+ return MpInterface::Unknown;
break;
}
- return KviMediaPlayerInterface::Unknown;
+ return MpInterface::Unknown;
}
-QString KviAmipInterface::mrl()
+QString MpAmipInterface::mrl()
{
QString ret;
QString fn = eval_str("var_fn");
@@ -255,42 +255,42 @@ QString getAmipString(const char * var)
return ret;
}
-QString KviAmipInterface::nowPlaying()
+QString MpAmipInterface::nowPlaying()
{
return getAmipString("var_s");
}
-QString KviAmipInterface::artist()
+QString MpAmipInterface::artist()
{
return getAmipString("var_1");
}
-QString KviAmipInterface::title()
+QString MpAmipInterface::title()
{
return getAmipString("var_2");
}
-QString KviAmipInterface::album()
+QString MpAmipInterface::album()
{
return getAmipString("var_4");
}
-QString KviAmipInterface::year()
+QString MpAmipInterface::year()
{
return getAmipString("var_5");
}
-QString KviAmipInterface::comment()
+QString MpAmipInterface::comment()
{
return getAmipString("var_6");
}
-QString KviAmipInterface::genre()
+QString MpAmipInterface::genre()
{
return getAmipString("var_7");
}
-bool KviAmipInterface::setVol(kvs_int_t &iVol)
+bool MpAmipInterface::setVol(kvs_int_t &iVol)
{
if(!amip_dll) return false;
char volcmd[AC_BUFFER_SIZE];
@@ -298,19 +298,19 @@ bool KviAmipInterface::setVol(kvs_int_t &iVol)
return (ac_exec(volcmd) == AC_ERR_NOERROR);
}
-int KviAmipInterface::getVol()
+int MpAmipInterface::getVol()
{
return eval_int("var_vol");
}
-bool KviAmipInterface::jumpTo(kvs_int_t &iPos)
+bool MpAmipInterface::jumpTo(kvs_int_t &iPos)
{
if(!amip_dll) return false;
char jmpcmd[AC_BUFFER_SIZE];
sprintf(jmpcmd, "jumptotime %d", iPos/1000);
return (ac_exec(jmpcmd) == AC_ERR_NOERROR);
}
-bool KviAmipInterface::hide()
+bool MpAmipInterface::hide()
{
HWND hWinamp = (HWND)eval_int("var_phwnd");
if(hWinamp && hWinamp != (HWND)-1)
@@ -321,7 +321,7 @@ bool KviAmipInterface::hide()
return false;
}
-bool KviAmipInterface::show()
+bool MpAmipInterface::show()
{
HWND hWinamp = (HWND)eval_int("var_phwnd");
if(hWinamp && hWinamp != (HWND)-1)
@@ -332,13 +332,13 @@ bool KviAmipInterface::show()
return false;
}
-bool KviAmipInterface::minimize()
+bool MpAmipInterface::minimize()
{
if(!amip_dll) return false;
return (ac_exec("control mimimize") == AC_ERR_NOERROR);
}
-bool KviAmipInterface::setPlayListPos(kvs_int_t &iPos)
+bool MpAmipInterface::setPlayListPos(kvs_int_t &iPos)
{
if(!amip_dll) return false;
char jmpcmd[AC_BUFFER_SIZE];
@@ -346,27 +346,27 @@ bool KviAmipInterface::setPlayListPos(kvs_int_t &iPos)
return (ac_exec(jmpcmd) == AC_ERR_NOERROR);
}
-int KviAmipInterface::getPlayListPos()
+int MpAmipInterface::getPlayListPos()
{
return eval_int("var_pos");
}
-int KviAmipInterface::getListLength()
+int MpAmipInterface::getListLength()
{
return eval_int("var_ll");
}
-bool KviAmipInterface::getRepeat()
+bool MpAmipInterface::getRepeat()
{
return eval_str("var_repeat").startsWith("on");
}
-bool KviAmipInterface::getShuffle()
+bool MpAmipInterface::getShuffle()
{
return eval_str("var_shuffle").startsWith("on");
}
-bool KviAmipInterface::setShuffle(bool &bVal)
+bool MpAmipInterface::setShuffle(bool &bVal)
{
if(!amip_dll) return false;
bool res;
@@ -377,7 +377,7 @@ bool KviAmipInterface::setShuffle(bool &bVal)
return res;
}
-bool KviAmipInterface::setRepeat(bool &bVal)
+bool MpAmipInterface::setRepeat(bool &bVal)
{
if(!amip_dll) return false;
bool res;
@@ -388,7 +388,7 @@ bool KviAmipInterface::setRepeat(bool &bVal)
return res;
}
-bool KviAmipInterface::amipExec(const QString &cmd)
+bool MpAmipInterface::amipExec(const QString &cmd)
{
if(!amip_dll) return false;
QTextCodec *c=mediaplayer_get_codec();
@@ -396,7 +396,7 @@ bool KviAmipInterface::amipExec(const QString &cmd)
return (ac_exec(szCmd) == AC_ERR_NOERROR);
}
-QString KviAmipInterface::amipEval(const QString &cmd)
+QString MpAmipInterface::amipEval(const QString &cmd)
{
QString ret;
if(!amip_dll) return ret;
diff --git a/src/modules/mediaplayer/mp_amipinterface.h b/src/modules/mediaplayer/MpAmipInterface.h
index f5eaf664d..e8a9fac34 100644
--- a/src/modules/mediaplayer/mp_amipinterface.h
+++ b/src/modules/mediaplayer/MpAmipInterface.h
@@ -2,7 +2,7 @@
#define _MP_AMIPINTERFACE_H_
//=============================================================================
//
-// File : mp_amipinterface.cpp
+// File : MpAmipInterface.cpp
// Creation date : Sun 27 Mar 2005 16:55:09 by Szymon Stefanek
//
// This file is part of the KVIrc IRC client distribution
@@ -28,13 +28,13 @@
#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
- #include "mp_interface.h"
+ #include "MpInterface.h"
- class KviAmipInterface : public KviMediaPlayerInterface
+ class MpAmipInterface : public MpInterface
{
public:
- KviAmipInterface();
- ~KviAmipInterface();
+ MpAmipInterface();
+ ~MpAmipInterface();
public:
virtual int detect(bool bStart);
virtual bool prev();
@@ -71,10 +71,10 @@
virtual bool setShuffle(bool &bVal);
virtual bool amipExec(const QString &cmd);
virtual QString amipEval(const QString &cmd);
- virtual KviMediaPlayerInterface::PlayerStatus status();
+ virtual MpInterface::PlayerStatus status();
};
- MP_DECLARE_DESCRIPTOR(KviAmipInterface)
+ MP_DECLARE_DESCRIPTOR(MpAmipInterface)
#endif //COMPILE_ON_WINDOWS
diff --git a/src/modules/mediaplayer/mp_interface.cpp b/src/modules/mediaplayer/MpInterface.cpp
index 3993ff8e6..f5a1f569c 100644
--- a/src/modules/mediaplayer/mp_interface.cpp
+++ b/src/modules/mediaplayer/MpInterface.cpp
@@ -1,6 +1,6 @@
//=============================================================================
//
-// File : mp_interface.cpp
+// File : MpInterface.cpp
// Creation date : Fri Mar 25 20:01:25 2005 GMT by Szymon Stefanek
//
// This file is part of the KVIrc irc client distribution
@@ -22,8 +22,8 @@
//
//=============================================================================
-#include "mp_interface.h"
-#include "mp_mp3.h"
+#include "MpInterface.h"
+#include "MpMp3.h"
#include "KviOptions.h"
#include "KviLocale.h"
@@ -38,48 +38,48 @@ static QTextCodec * mediaplayer_get_codec()
}
-void KviMediaPlayerInterface::notImplemented()
+void MpInterface::notImplemented()
{
setLastError(__tr2qs_ctx("Function not implemented","mediaplayer"));
}
-int KviMediaPlayerInterface::position()
+int MpInterface::position()
{
notImplemented();
return -1;
}
-int KviMediaPlayerInterface::length()
+int MpInterface::length()
{
notImplemented();
return -1;
}
-bool KviMediaPlayerInterface::quit()
+bool MpInterface::quit()
{
notImplemented();
return false;
}
-bool KviMediaPlayerInterface::hide()
+bool MpInterface::hide()
{
notImplemented();
return false;
}
-bool KviMediaPlayerInterface::show()
+bool MpInterface::show()
{
notImplemented();
return false;
}
-bool KviMediaPlayerInterface::minimize()
+bool MpInterface::minimize()
{
notImplemented();
return false;
}
-QString KviMediaPlayerInterface::getLocalFile()
+QString MpInterface::getLocalFile()
{
QString ret = mrl();
if(ret.isEmpty())return ret;
@@ -91,7 +91,7 @@ QString KviMediaPlayerInterface::getLocalFile()
return QString();
}
-QString KviMediaPlayerInterface::amipEval(const QString &)
+QString MpInterface::amipEval(const QString &)
{
return QString();
}
@@ -111,157 +111,157 @@ QString KviMediaPlayerInterface::amipEval(const QString &)
if(!scan_mp3_file(f,&mp3))return -1;
-QString KviMediaPlayerInterface::artist()
+QString MpInterface::artist()
{
SCAN_MP3_FILE
return pCodec->toUnicode(QByteArray(mp3.id3.artist));
}
-QString KviMediaPlayerInterface::title()
+QString MpInterface::title()
{
SCAN_MP3_FILE
return pCodec->toUnicode(QByteArray(mp3.id3.title));
}
-QString KviMediaPlayerInterface::genre()
+QString MpInterface::genre()
{
SCAN_MP3_FILE
return pCodec->toUnicode(QByteArray(get_typegenre(mp3.id3.genre[0])));
}
-QString KviMediaPlayerInterface::comment()
+QString MpInterface::comment()
{
SCAN_MP3_FILE
return pCodec->toUnicode(QByteArray(mp3.id3.comment));
}
-QString KviMediaPlayerInterface::year()
+QString MpInterface::year()
{
SCAN_MP3_FILE
return QString(mp3.id3.year);
}
-QString KviMediaPlayerInterface::album()
+QString MpInterface::album()
{
SCAN_MP3_FILE
return pCodec->toUnicode(QByteArray(mp3.id3.album));
}
-bool KviMediaPlayerInterface::playMrl(const QString &)
+bool MpInterface::playMrl(const QString &)
{
notImplemented();
return false;
}
-bool KviMediaPlayerInterface::amipExec(const QString &)
+bool MpInterface::amipExec(const QString &)
{
notImplemented();
return false;
}
-bool KviMediaPlayerInterface::setVol(kvs_int_t &)
+bool MpInterface::setVol(kvs_int_t &)
{
notImplemented();
return false;
}
-int KviMediaPlayerInterface::getVol()
+int MpInterface::getVol()
{
notImplemented();
return -1;
}
-bool KviMediaPlayerInterface::mute()
+bool MpInterface::mute()
{
notImplemented();
return false;
}
-bool KviMediaPlayerInterface::jumpTo(kvs_int_t &)
+bool MpInterface::jumpTo(kvs_int_t &)
{
notImplemented();
return false;
}
-KviMediaPlayerInterface::PlayerStatus KviMediaPlayerInterface::status()
+MpInterface::PlayerStatus MpInterface::status()
{
notImplemented();
- return KviMediaPlayerInterface::Unknown;
+ return MpInterface::Unknown;
}
-int KviMediaPlayerInterface::bitRate()
+int MpInterface::bitRate()
{
SCAN_MP3_FILE_RET_INT
return header_bitrate(&(mp3.header));
}
-int KviMediaPlayerInterface::sampleRate()
+int MpInterface::sampleRate()
{
SCAN_MP3_FILE_RET_INT
return header_frequency(&(mp3.header));
}
-int KviMediaPlayerInterface::channels()
+int MpInterface::channels()
{
SCAN_MP3_FILE_RET_INT
return header_channels(&(mp3.header));
}
-int KviMediaPlayerInterface::getPlayListPos()
+int MpInterface::getPlayListPos()
{
notImplemented();
return -1;
}
-bool KviMediaPlayerInterface::setPlayListPos(kvs_int_t &)
+bool MpInterface::setPlayListPos(kvs_int_t &)
{
notImplemented();
return false;
}
-int KviMediaPlayerInterface::getListLength()
+int MpInterface::getListLength()
{
notImplemented();
return -1;
}
-int KviMediaPlayerInterface::getEqData(kvs_int_t &)
+int MpInterface::getEqData(kvs_int_t &)
{
notImplemented();
return -1;
}
-bool KviMediaPlayerInterface::setEqData(kvs_int_t &, kvs_int_t &)
+bool MpInterface::setEqData(kvs_int_t &, kvs_int_t &)
{
notImplemented();
return false;
}
-bool KviMediaPlayerInterface::getRepeat()
+bool MpInterface::getRepeat()
{
notImplemented();
return false;
}
-bool KviMediaPlayerInterface::getShuffle()
+bool MpInterface::getShuffle()
{
notImplemented();
return false;
}
-bool KviMediaPlayerInterface::setRepeat(bool &)
+bool MpInterface::setRepeat(bool &)
{
notImplemented();
return false;
}
-bool KviMediaPlayerInterface::setShuffle(bool &)
+bool MpInterface::setShuffle(bool &)
{
notImplemented();
return false;
}
-QString KviMediaPlayerInterface::mediaType()
+QString MpInterface::mediaType()
{
QString ret = mrl();
if(ret.endsWith(".mp3",Qt::CaseInsensitive))ret = "MPEG Layer 3";
diff --git a/src/modules/mediaplayer/mp_interface.h b/src/modules/mediaplayer/MpInterface.h
index 61cd53d47..9e205b4c9 100644
--- a/src/modules/mediaplayer/mp_interface.h
+++ b/src/modules/mediaplayer/MpInterface.h
@@ -2,7 +2,7 @@
#define _MP_INTERFACE_H_
//=============================================================================
//
-// File : mp_interface.h
+// File : MpInterface.h
// Creation date : Fri Mar 25 20:01:25 2005 GMT by Szymon Stefanek
//
// This file is part of the KVIrc irc client distribution
@@ -28,13 +28,13 @@
#include "KviQString.h"
#include "KviKvsTypes.h"
-class KviMediaPlayerInterface
+class MpInterface
{
public:
// don't do any initialization in the constructor
// implement lazy initialization in each function instead
- KviMediaPlayerInterface(){};
- virtual ~KviMediaPlayerInterface(){};
+ MpInterface(){};
+ virtual ~MpInterface(){};
protected:
QString m_szLastError;
public:
@@ -109,7 +109,7 @@ public:
virtual bool quit();
// return the current player status
enum PlayerStatus { Unknown, Stopped, Playing, Paused };
- virtual KviMediaPlayerInterface::PlayerStatus status();
+ virtual MpInterface::PlayerStatus status();
// current position in the media (msecs)
// 0 if the player isn't playing anything and -1 if unknown
virtual int position();
@@ -178,20 +178,20 @@ protected:
};
-class KviMediaPlayerInterfaceDescriptor
+class MpInterfaceDescriptor
{
public:
- KviMediaPlayerInterfaceDescriptor(){};
- virtual ~KviMediaPlayerInterfaceDescriptor(){};
+ MpInterfaceDescriptor(){};
+ virtual ~MpInterfaceDescriptor(){};
public:
virtual const QString & name() = 0;
virtual const QString & description() = 0;
- virtual KviMediaPlayerInterface * instance() = 0;
+ virtual MpInterface * instance() = 0;
};
#define MP_DECLARE_DESCRIPTOR(_interfaceclass) \
- class _interfaceclass ## Descriptor : public KviMediaPlayerInterfaceDescriptor \
+ class _interfaceclass ## Descriptor : public MpInterfaceDescriptor \
{ \
public: \
_interfaceclass ## Descriptor(); \
@@ -203,12 +203,12 @@ public:
public: \
virtual const QString & name(); \
virtual const QString & description(); \
- virtual KviMediaPlayerInterface * instance(); \
+ virtual MpInterface * instance(); \
};
#define MP_IMPLEMENT_DESCRIPTOR(_interfaceclass,_name,_description) \
_interfaceclass ## Descriptor::_interfaceclass ## Descriptor() \
- : KviMediaPlayerInterfaceDescriptor() \
+ : MpInterfaceDescriptor() \
{ \
m_pInstance = 0; \
m_szName = _name; \
@@ -226,7 +226,7 @@ public:
{ \
return m_szDescription; \
} \
- KviMediaPlayerInterface * _interfaceclass ## Descriptor::instance() \
+ MpInterface * _interfaceclass ## Descriptor::instance() \
{ \
if(!m_pInstance)m_pInstance = new _interfaceclass(); \
return m_pInstance; \
diff --git a/src/modules/mediaplayer/mp_mp3.cpp b/src/modules/mediaplayer/MpMp3.cpp
index efdc0b473..9f3e68cbe 100644
--- a/src/modules/mediaplayer/mp_mp3.cpp
+++ b/src/modules/mediaplayer/MpMp3.cpp
@@ -1,6 +1,6 @@
//=============================================================================
//
-// File : mp_mp3.cpp
+// File : MpMp3.cpp
// Creation date : Fri Mar 25 20:01:25 2005 GMT by Szymon Stefanek
//
// This file is part of the KVIrc irc client distribution
@@ -37,7 +37,7 @@
//
//=============================================================================
-#include "mp_mp3.h"
+#include "MpMp3.h"
#include "KviOptions.h"
#include <QFileInfo>
diff --git a/src/modules/mediaplayer/mp_mp3.h b/src/modules/mediaplayer/MpMp3.h
index 80dbda85c..b50c3e953 100644
--- a/src/modules/mediaplayer/mp_mp3.h
+++ b/src/modules/mediaplayer/MpMp3.h
@@ -1,6 +1,6 @@
//=============================================================================
//
-// File : mp_mp3.h
+// File : MpMp3.h
// Creation date : Fri Mar 25 20:01:25 2005 GMT by Szymon Stefanek
//
// This file is part of the KVIrc irc client distribution
diff --git a/src/modules/mediaplayer/mp_mprisinterface.cpp b/src/modules/mediaplayer/MpMprisInterface.cpp
index 3bc59730e..560d03c93 100644
--- a/src/modules/mediaplayer/mp_mprisinterface.cpp
+++ b/src/modules/mediaplayer/MpMprisInterface.cpp
@@ -1,6 +1,6 @@
//=============================================================================
//
-// File : mp_mprisinterface.cpp
+// File : MpMprisInterface.cpp
// Creation date : Thu 06 Dec 2007 14:20:02 by Tomasz Moń
//
// This file is part of the KVIrc IRC client distribution
@@ -22,7 +22,7 @@
//
//=============================================================================
-#include "mp_mprisinterface.h"
+#include "MpMprisInterface.h"
#if (defined(COMPILE_DBUS_SUPPORT) && !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MAC) && !defined(COMPILE_ON_MINGW))
#include "KviLocale.h"
@@ -60,17 +60,17 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, MPRISPlayerStatus
return argument;
}
-KviMPRISInterface::KviMPRISInterface()
-: KviMediaPlayerInterface()
+MpMprisInterface::MpMprisInterface()
+: MpInterface()
{
qDBusRegisterMetaType<MPRISPlayerStatus>();
}
-KviMPRISInterface::~KviMPRISInterface()
+MpMprisInterface::~MpMprisInterface()
{
}
-int KviMPRISInterface::detect(bool)
+int MpMprisInterface::detect(bool)
{
QDBusReply<QStringList> reply = QDBusConnection::sessionBus().interface()->registeredServiceNames();
if (!reply.isValid()) /* something fishy with dbus, it won't work */
@@ -94,32 +94,32 @@ int KviMPRISInterface::detect(bool)
} \
return TRUE;
-bool KviMPRISInterface::prev()
+bool MpMprisInterface::prev()
{
MPRIS_SIMPLE_CALL("/Player", "Prev")
}
-bool KviMPRISInterface::next()
+bool MpMprisInterface::next()
{
MPRIS_SIMPLE_CALL("/Player", "Next")
}
-bool KviMPRISInterface::play()
+bool MpMprisInterface::play()
{
MPRIS_SIMPLE_CALL("/Player", "Play")
}
-bool KviMPRISInterface::stop()
+bool MpMprisInterface::stop()
{
MPRIS_SIMPLE_CALL("/Player", "Stop")
}
-bool KviMPRISInterface::pause()
+bool MpMprisInterface::pause()
{
MPRIS_SIMPLE_CALL("/Player", "Pause")
}
-bool KviMPRISInterface::quit()
+bool MpMprisInterface::quit()
{
MPRIS_SIMPLE_CALL("/", "Quit")
}
@@ -135,7 +135,7 @@ bool KviMPRISInterface::quit()
}
#define MPRIS_GET_METADATA_FIELD(__field, __return_type, __return_if_fail) \
- if (this->status() != KviMediaPlayerInterface::Playing) \
+ if (this->status() != MpInterface::Playing) \
return __return_if_fail; \
MPRIS_CALL_METHOD("GetMetadata", __return_if_fail) \
foreach (QVariant v, reply.arguments()) { \
@@ -161,28 +161,28 @@ bool KviMPRISInterface::quit()
return __return_if_fail; \
}
-KviMediaPlayerInterface::PlayerStatus KviMPRISInterface::status()
+MpInterface::PlayerStatus MpMprisInterface::status()
{
- MPRIS_CALL_METHOD("GetStatus", KviMediaPlayerInterface::Unknown)
+ MPRIS_CALL_METHOD("GetStatus", MpInterface::Unknown)
MPRISPlayerStatus status;
if(reply.arguments().isEmpty())
- return KviMediaPlayerInterface::Unknown;
+ return MpInterface::Unknown;
status = qdbus_cast<MPRISPlayerStatus>(reply.arguments().first());
switch (status.Play) {
- case 0: return KviMediaPlayerInterface::Playing;
- case 1: return KviMediaPlayerInterface::Paused;
- case 2: return KviMediaPlayerInterface::Stopped;
- default: return KviMediaPlayerInterface::Unknown;
+ case 0: return MpInterface::Playing;
+ case 1: return MpInterface::Paused;
+ case 2: return MpInterface::Stopped;
+ default: return MpInterface::Unknown;
}
}
-QString KviMPRISInterface::nowPlaying()
+QString MpMprisInterface::nowPlaying()
{
- if (this->status() != KviMediaPlayerInterface::Playing)
+ if (this->status() != MpInterface::Playing)
return "";
MPRIS_CALL_METHOD("GetMetadata", "")
@@ -209,7 +209,7 @@ QString KviMPRISInterface::nowPlaying()
return "";
}
-QString KviMPRISInterface::mrl()
+QString MpMprisInterface::mrl()
{
MPRIS_CALL_METHOD("GetMetadata", "")
@@ -227,53 +227,53 @@ QString KviMPRISInterface::mrl()
return "";
}
-QString KviMPRISInterface::title()
+QString MpMprisInterface::title()
{
MPRIS_GET_METADATA_FIELD("title", QString, "")
}
-QString KviMPRISInterface::artist()
+QString MpMprisInterface::artist()
{
MPRIS_GET_METADATA_FIELD("artist", QString, "")
}
-QString KviMPRISInterface::genre()
+QString MpMprisInterface::genre()
{
MPRIS_GET_METADATA_FIELD("genre", QString, "")
}
-QString KviMPRISInterface::comment()
+QString MpMprisInterface::comment()
{
MPRIS_GET_METADATA_FIELD("comment", QString, "")
}
-QString KviMPRISInterface::year()
+QString MpMprisInterface::year()
{
MPRIS_GET_METADATA_FIELD("year", QString, "")
}
-QString KviMPRISInterface::album()
+QString MpMprisInterface::album()
{
MPRIS_GET_METADATA_FIELD("album", QString, "")
}
-int KviMPRISInterface::bitRate()
+int MpMprisInterface::bitRate()
{
MPRIS_GET_METADATA_FIELD("audio-bitrate", int, -1)
}
-int KviMPRISInterface::sampleRate()
+int MpMprisInterface::sampleRate()
{
MPRIS_GET_METADATA_FIELD("audio-samplerate", int, -1)
}
-bool KviMPRISInterface::setVol(kvs_int_t &iVol)
+bool MpMprisInterface::setVol(kvs_int_t &iVol)
{
MPRIS_CALL_METHOD_WITH_ARG("VolumeSet", QVariant((int)(100*iVol/255)), false);
return true;
}
-int KviMPRISInterface::getVol()
+int MpMprisInterface::getVol()
{
MPRIS_CALL_METHOD("VolumeGet", -1)
@@ -281,13 +281,13 @@ int KviMPRISInterface::getVol()
return iVol * 255 /100;
}
-int KviMPRISInterface::position()
+int MpMprisInterface::position()
{
MPRIS_CALL_METHOD("PositionGet", -1)
return reply.arguments().first().toInt();
}
-int KviMPRISInterface::length()
+int MpMprisInterface::length()
{
MPRIS_CALL_METHOD("GetMetadata", -1)
@@ -306,7 +306,7 @@ int KviMPRISInterface::length()
return -1;
}
-bool KviMPRISInterface::jumpTo(kvs_int_t &iPos)
+bool MpMprisInterface::jumpTo(kvs_int_t &iPos)
{
MPRIS_CALL_METHOD_WITH_ARG("PositionSet", QVariant((int)iPos), false)
return true;
@@ -314,7 +314,7 @@ bool KviMPRISInterface::jumpTo(kvs_int_t &iPos)
/* audacious interface */
MP_IMPLEMENT_DESCRIPTOR(
- KviAudaciousInterface,
+ MpAudaciousInterface,
"audacious",
__tr2qs_ctx(
"An interface to the popular audacious media player.\n" \
@@ -324,13 +324,13 @@ MP_IMPLEMENT_DESCRIPTOR(
)
)
-KviAudaciousInterface::KviAudaciousInterface()
-: KviMPRISInterface()
+MpAudaciousInterface::MpAudaciousInterface()
+: MpMprisInterface()
{
m_szServiceName = "org.mpris.audacious";
}
-int KviAudaciousInterface::getPlayListPos()
+int MpAudaciousInterface::getPlayListPos()
{
QDBusInterface dbus_iface("org.mpris.audacious", "/org/atheme/audacious",
"org.atheme.audacious", QDBusConnection::sessionBus());
@@ -339,16 +339,16 @@ int KviAudaciousInterface::getPlayListPos()
}
-bool KviAudaciousInterface::quit()
+bool MpAudaciousInterface::quit()
{
- if (KviMPRISInterface::quit())
+ if (MpMprisInterface::quit())
return TRUE;
/* compability with older versions */
MPRIS_SIMPLE_CALL("/Player", "Quit")
}
-QString KviAudaciousInterface::mrl()
+QString MpAudaciousInterface::mrl()
{
MPRIS_CALL_METHOD("GetMetadata", "")
@@ -371,32 +371,32 @@ QString KviAudaciousInterface::mrl()
return "";
}
-KviMediaPlayerInterface::PlayerStatus KviAudaciousInterface::status()
+MpInterface::PlayerStatus MpAudaciousInterface::status()
{
- KviMediaPlayerInterface::PlayerStatus status;
- status = KviMPRISInterface::status();
- if (status != KviMediaPlayerInterface::Unknown)
+ MpInterface::PlayerStatus status;
+ status = MpMprisInterface::status();
+ if (status != MpInterface::Unknown)
return status;
/* compability with older versions */
QDBusInterface dbus_iface(m_szServiceName, "/Player",
"org.freedesktop.MediaPlayer", QDBusConnection::sessionBus());
if (!dbus_iface.isValid())
- return KviMediaPlayerInterface::Unknown;
+ return MpInterface::Unknown;
QDBusMessage reply = dbus_iface.call(QDBus::Block, "GetStatus");
switch (reply.arguments().first().toInt()) {
- case 0: return KviMediaPlayerInterface::Playing;
- case 1: return KviMediaPlayerInterface::Paused;
- case 2: return KviMediaPlayerInterface::Stopped;
- default: return KviMediaPlayerInterface::Unknown;
+ case 0: return MpInterface::Playing;
+ case 1: return MpInterface::Paused;
+ case 2: return MpInterface::Stopped;
+ default: return MpInterface::Unknown;
}
}
-int KviAudaciousInterface::length()
+int MpAudaciousInterface::length()
{
- int length = KviMPRISInterface::length();
+ int length = MpMprisInterface::length();
if (length != -1)
return length;
@@ -419,7 +419,7 @@ int KviAudaciousInterface::length()
}
#define AUDACIOUS_GET_TUPLE_FIELD(__field) \
- if (this->status() != KviMediaPlayerInterface::Playing) \
+ if (this->status() != MpInterface::Playing) \
return ""; \
QDBusInterface dbus_iface("org.mpris.audacious", "/org/atheme/audacious", \
"org.atheme.audacious", QDBusConnection::sessionBus()); \
@@ -428,19 +428,19 @@ int KviAudaciousInterface::length()
QDBusReply<QDBusVariant> reply = dbus_iface.callWithArgumentList(QDBus::Block, "SongTuple", args); \
return reply.value().variant().toString(); \
-QString KviAudaciousInterface::year()
+QString MpAudaciousInterface::year()
{
AUDACIOUS_GET_TUPLE_FIELD("year")
}
-QString KviAudaciousInterface::mediaType()
+QString MpAudaciousInterface::mediaType()
{
AUDACIOUS_GET_TUPLE_FIELD("codec")
}
/* BMPx interface */
MP_IMPLEMENT_DESCRIPTOR(
- KviBmpxInterface,
+ MpBmpxInterface,
"bmpx",
__tr2qs_ctx(
"An interface to BMPx.\n" \
@@ -450,21 +450,21 @@ MP_IMPLEMENT_DESCRIPTOR(
)
)
-KviBmpxInterface::KviBmpxInterface()
-: KviMPRISInterface()
+MpBmpxInterface::MpBmpxInterface()
+: MpMprisInterface()
{
m_szServiceName = "org.mpris.bmp";
}
/* BMPx doesn't provide GetStatus method, always assume Playing status */
-KviMediaPlayerInterface::PlayerStatus KviBmpxInterface::status()
+MpInterface::PlayerStatus MpBmpxInterface::status()
{
- return KviMediaPlayerInterface::Playing;
+ return MpInterface::Playing;
}
/* Amarok2 interface */
MP_IMPLEMENT_DESCRIPTOR(
- KviAmarok2Interface,
+ MpAmarok2Interface,
"amarok2",
__tr2qs_ctx(
"An interface to Amarok2.\n" \
@@ -474,15 +474,15 @@ MP_IMPLEMENT_DESCRIPTOR(
)
)
-KviAmarok2Interface::KviAmarok2Interface()
-: KviMPRISInterface()
+MpAmarok2Interface::MpAmarok2Interface()
+: MpMprisInterface()
{
m_szServiceName = "org.mpris.amarok";
}
/* Qmmp interface */
MP_IMPLEMENT_DESCRIPTOR(
- KviQmmpInterface,
+ MpQmmpInterface,
"Qmmp",
__tr2qs_ctx(
"An interface to Qmmp.\n" \
@@ -492,15 +492,15 @@ MP_IMPLEMENT_DESCRIPTOR(
)
)
-KviQmmpInterface::KviQmmpInterface()
-: KviMPRISInterface()
+MpQmmpInterface::MpQmmpInterface()
+: MpMprisInterface()
{
m_szServiceName = "org.mpris.qmmp";
}
/* xmms2 interface */
MP_IMPLEMENT_DESCRIPTOR(
- KviXmms2Interface,
+ MpXmms2Interface,
"xmms2",
__tr2qs_ctx(
"An interface to the Xmms2 media player.\n" \
@@ -509,15 +509,15 @@ MP_IMPLEMENT_DESCRIPTOR(
)
)
-KviXmms2Interface::KviXmms2Interface()
-: KviMPRISInterface()
+MpXmms2Interface::MpXmms2Interface()
+: MpMprisInterface()
{
m_szServiceName = "org.mpris.xmms2";
}
/* mozilla songbird interface */
MP_IMPLEMENT_DESCRIPTOR(
- KviSongbirdInterface,
+ MpSongbirdInterface,
"songbird",
__tr2qs_ctx(
"An interface to the Mozilla Songbird media player.\n" \
@@ -528,20 +528,20 @@ MP_IMPLEMENT_DESCRIPTOR(
)
)
-KviSongbirdInterface::KviSongbirdInterface()
-: KviMPRISInterface()
+MpSongbirdInterface::MpSongbirdInterface()
+: MpMprisInterface()
{
m_szServiceName = "org.mpris.songbird";
}
-KviMediaPlayerInterface::PlayerStatus KviSongbirdInterface::status()
+MpInterface::PlayerStatus MpSongbirdInterface::status()
{
- return KviMediaPlayerInterface::Playing;
+ return MpInterface::Playing;
}
/* Totem interface */
MP_IMPLEMENT_DESCRIPTOR(
- KviTotemInterface,
+ MpTotemInterface,
"totem",
__tr2qs_ctx(
"An interface to Totem.\n" \
@@ -551,15 +551,15 @@ MP_IMPLEMENT_DESCRIPTOR(
)
)
-KviTotemInterface::KviTotemInterface()
-: KviMPRISInterface()
+MpTotemInterface::MpTotemInterface()
+: MpMprisInterface()
{
m_szServiceName = "org.mpris.Totem";
}
/* Vlc interface */
MP_IMPLEMENT_DESCRIPTOR(
- KviVlcInterface,
+ MpVlcInterface,
"vlc",
__tr2qs_ctx(
"An interface to Vlc.\n" \
@@ -571,8 +571,8 @@ MP_IMPLEMENT_DESCRIPTOR(
)
)
-KviVlcInterface::KviVlcInterface()
-: KviMPRISInterface()
+MpVlcInterface::MpVlcInterface()
+: MpMprisInterface()
{
m_szServiceName = "org.mpris.vlc";
}
diff --git a/src/modules/mediaplayer/mp_mprisinterface.h b/src/modules/mediaplayer/MpMprisInterface.h
index f86af3b27..51767390c 100644
--- a/src/modules/mediaplayer/mp_mprisinterface.h
+++ b/src/modules/mediaplayer/MpMprisInterface.h
@@ -2,7 +2,7 @@
#define _MP_AUDACIOUSINTERFACE_H_
//=============================================================================
//
-// File : mp_mprisinterface.h
+// File : MpMprisInterface.h
// Creation date : Thu 06 Dec 2007 14:20:02 by Tomasz Moń
//
// This file is part of the KVIrc IRC client distribution
@@ -24,18 +24,18 @@
//
//=============================================================================
-#include "mp_interface.h"
+#include "MpInterface.h"
#include "kvi_settings.h"
#if (defined(COMPILE_DBUS_SUPPORT) && !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MAC) && !defined(COMPILE_ON_MINGW))
#include <QtDBus/QtDBus>
- class KviMPRISInterface : public KviMediaPlayerInterface
+ class MpMprisInterface : public MpInterface
{
public:
- KviMPRISInterface();
- virtual ~KviMPRISInterface();
+ MpMprisInterface();
+ virtual ~MpMprisInterface();
public:
QString m_szServiceName;
virtual int detect(bool bStart);
@@ -45,7 +45,7 @@
virtual bool stop();
virtual bool pause();
virtual bool quit();
- virtual KviMediaPlayerInterface::PlayerStatus status();
+ virtual MpInterface::PlayerStatus status();
virtual QString nowPlaying();
virtual QString mrl();
virtual QString title();
@@ -63,13 +63,13 @@
virtual bool jumpTo(kvs_int_t &iPos);
};
- class KviAudaciousInterface : public KviMPRISInterface
+ class MpAudaciousInterface : public MpMprisInterface
{
public:
- KviAudaciousInterface();
+ MpAudaciousInterface();
public:
virtual bool quit();
- virtual KviMediaPlayerInterface::PlayerStatus status();
+ virtual MpInterface::PlayerStatus status();
virtual QString mrl();
virtual int length();
@@ -78,58 +78,58 @@
virtual QString mediaType();
};
- class KviBmpxInterface : public KviMPRISInterface
+ class MpBmpxInterface : public MpMprisInterface
{
public:
- KviBmpxInterface();
- virtual KviMediaPlayerInterface::PlayerStatus status();
+ MpBmpxInterface();
+ virtual MpInterface::PlayerStatus status();
};
- class KviAmarok2Interface : public KviMPRISInterface
+ class MpAmarok2Interface : public MpMprisInterface
{
public:
- KviAmarok2Interface();
+ MpAmarok2Interface();
};
- class KviQmmpInterface : public KviMPRISInterface
+ class MpQmmpInterface : public MpMprisInterface
{
public:
- KviQmmpInterface();
+ MpQmmpInterface();
};
- class KviXmms2Interface : public KviMPRISInterface
+ class MpXmms2Interface : public MpMprisInterface
{
public:
- KviXmms2Interface();
+ MpXmms2Interface();
};
- class KviSongbirdInterface : public KviMPRISInterface
+ class MpSongbirdInterface : public MpMprisInterface
{
public:
- KviSongbirdInterface();
- virtual KviMediaPlayerInterface::PlayerStatus status();
+ MpSongbirdInterface();
+ virtual MpInterface::PlayerStatus status();
};
- class KviTotemInterface : public KviMPRISInterface
+ class MpTotemInterface : public MpMprisInterface
{
public:
- KviTotemInterface();
+ MpTotemInterface();
};
- class KviVlcInterface : public KviMPRISInterface
+ class MpVlcInterface : public MpMprisInterface
{
public:
- KviVlcInterface();
+ MpVlcInterface();
};
- MP_DECLARE_DESCRIPTOR(KviAudaciousInterface)
- MP_DECLARE_DESCRIPTOR(KviBmpxInterface)
- MP_DECLARE_DESCRIPTOR(KviAmarok2Interface)
- MP_DECLARE_DESCRIPTOR(KviQmmpInterface)
- MP_DECLARE_DESCRIPTOR(KviXmms2Interface)
- MP_DECLARE_DESCRIPTOR(KviSongbirdInterface)
- MP_DECLARE_DESCRIPTOR(KviTotemInterface)
- MP_DECLARE_DESCRIPTOR(KviVlcInterface)
+ MP_DECLARE_DESCRIPTOR(MpAudaciousInterface)
+ MP_DECLARE_DESCRIPTOR(MpBmpxInterface)
+ MP_DECLARE_DESCRIPTOR(MpAmarok2Interface)
+ MP_DECLARE_DESCRIPTOR(MpQmmpInterface)
+ MP_DECLARE_DESCRIPTOR(MpXmms2Interface)
+ MP_DECLARE_DESCRIPTOR(MpSongbirdInterface)
+ MP_DECLARE_DESCRIPTOR(MpTotemInterface)
+ MP_DECLARE_DESCRIPTOR(MpVlcInterface)
#endif //COMPILE_ON_WINDOWS
#endif //_MP_AUDACIOUSINTERFACE_H_
diff --git a/src/modules/mediaplayer/mp_winampinterface.cpp b/src/modules/mediaplayer/MpWinampInterface.cpp
index b52f37550..1fe06d234 100644
--- a/src/modules/mediaplayer/mp_winampinterface.cpp
+++ b/src/modules/mediaplayer/MpWinampInterface.cpp
@@ -1,6 +1,6 @@
//=============================================================================
//
-// File : mp_winampinterface.cpp
+// File : MpWinampInterface.cpp
// Creation date : Mon 28 Mar 2005 23:41:50 by Szymon Stefanek
//
// This file is part of the KVIrc IRC client distribution
@@ -22,7 +22,7 @@
//
//=============================================================================
-#include "mp_winampinterface.h"
+#include "MpWinampInterface.h"
#include "KviOptions.h"
#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
@@ -204,7 +204,7 @@ MP_IMPLEMENT_DESCRIPTOR(
KviWinampInterface::KviWinampInterface()
-: KviMediaPlayerInterface()
+: MpInterface()
{
}
@@ -280,7 +280,7 @@ int KviWinampInterface::channels()
return ret;
}
-KviMediaPlayerInterface::PlayerStatus KviWinampInterface::status()
+MpInterface::PlayerStatus KviWinampInterface::status()
{
HWND hWinamp = find_winamp(this);
int ret = 1000;
@@ -288,19 +288,19 @@ KviMediaPlayerInterface::PlayerStatus KviWinampInterface::status()
switch(ret)
{
case 0:
- return KviMediaPlayerInterface::Stopped;
+ return MpInterface::Stopped;
break;
case 3:
- return KviMediaPlayerInterface::Paused;
+ return MpInterface::Paused;
break;
case 1:
- return KviMediaPlayerInterface::Playing;
+ return MpInterface::Playing;
break;
default:
- return KviMediaPlayerInterface::Unknown;
+ return MpInterface::Unknown;
break;
}
- return KviMediaPlayerInterface::Unknown;
+ return MpInterface::Unknown;
}
QString KviWinampInterface::mrl()
diff --git a/src/modules/mediaplayer/mp_winampinterface.h b/src/modules/mediaplayer/MpWinampInterface.h
index 648c3c581..623e5f7fe 100644
--- a/src/modules/mediaplayer/mp_winampinterface.h
+++ b/src/modules/mediaplayer/MpWinampInterface.h
@@ -2,7 +2,7 @@
#define _MP_WINAMPINTERFACE_H_
//=============================================================================
//
-// File : mp_winampinterface.h
+// File : MpWinampInterface.h
// Creation date : Mon 28 Mar 2005 23:41:50 by Szymon Stefanek
//
// This file is part of the KVIrc IRC client distribution
@@ -28,9 +28,9 @@
#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
- #include "mp_interface.h"
+ #include "MpInterface.h"
- class KviWinampInterface : public KviMediaPlayerInterface
+ class KviWinampInterface : public MpInterface
{
public:
KviWinampInterface();
@@ -66,7 +66,7 @@
virtual bool getShuffle();
virtual bool setRepeat(bool &bVal);
virtual bool setShuffle(bool &bVal);
- virtual KviMediaPlayerInterface::PlayerStatus status();
+ virtual MpInterface::PlayerStatus status();
};
MP_DECLARE_DESCRIPTOR(KviWinampInterface)
diff --git a/src/modules/mediaplayer/mp_xmmsinterface.cpp b/src/modules/mediaplayer/MpXmmsInterface.cpp
index 23eddf03b..24890f9dc 100644
--- a/src/modules/mediaplayer/mp_xmmsinterface.cpp
+++ b/src/modules/mediaplayer/MpXmmsInterface.cpp
@@ -1,6 +1,6 @@
//=============================================================================
//
-// File : mp_xmmsinterface.cpp
+// File : MpXmmsInterface.cpp
// Creation date : Fri 25 Mar 2005 20:04:54 by Szymon Stefanek
//
// This file is part of the KVIrc IRC client distribution
@@ -25,7 +25,7 @@
//
//=============================================================================
-#include "mp_xmmsinterface.h"
+#include "MpXmmsInterface.h"
#if (!defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MAC) && !defined(COMPILE_ON_MINGW))
@@ -78,7 +78,7 @@ static const char *audacious_lib_names[] =
KviXmmsInterface::KviXmmsInterface()
-: KviMediaPlayerInterface()
+: MpInterface()
{
m_pPlayerLibrary = 0;
m_szPlayerLibraryName = "libxmms.so";
@@ -259,21 +259,21 @@ bool KviXmmsInterface::setShuffle(bool &bVal)
return true;
}
-KviMediaPlayerInterface::PlayerStatus KviXmmsInterface::status()
+MpInterface::PlayerStatus KviXmmsInterface::status()
{
bool (*sym1)(int) = (bool (*)(int))lookupSymbol("xmms_remote_is_paused");
if(sym1)
{
- if(sym1(0))return KviMediaPlayerInterface::Paused;
+ if(sym1(0))return MpInterface::Paused;
bool (*sym2)(int) = (bool (*)(int))lookupSymbol("xmms_remote_is_playing");
if(sym2)
{
- if(sym2(0))return KviMediaPlayerInterface::Playing;
- else return KviMediaPlayerInterface::Stopped;
+ if(sym2(0))return MpInterface::Playing;
+ else return MpInterface::Stopped;
}
}
- return KviMediaPlayerInterface::Unknown;
+ return MpInterface::Unknown;
}
bool KviXmmsInterface::playMrl(const QString &mrl)
diff --git a/src/modules/mediaplayer/mp_xmmsinterface.h b/src/modules/mediaplayer/MpXmmsInterface.h
index df6eb04b8..3c49c036b 100644
--- a/src/modules/mediaplayer/mp_xmmsinterface.h
+++ b/src/modules/mediaplayer/MpXmmsInterface.h
@@ -2,7 +2,7 @@
#define _MP_XMMSINTERFACE_H_
//=============================================================================
//
-// File : mp_xmmsinterface.h
+// File : MpXmmsInterface.h
// Creation date : Fri 25 Mar 2005 20:04:54 by Szymon Stefanek
//
// This file is part of the KVIrc IRC client distribution
@@ -27,14 +27,14 @@
//
//=============================================================================
-#include "mp_interface.h"
+#include "MpInterface.h"
#include "kvi_settings.h"
#include <QLibrary>
#if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW)
- class KviXmmsInterface : public KviMediaPlayerInterface
+ class KviXmmsInterface : public MpInterface
{
public:
KviXmmsInterface();
@@ -54,7 +54,7 @@
virtual bool jumpTo(kvs_int_t &iPos);
virtual bool setVol(kvs_int_t &iVol);
virtual int getVol();
- virtual KviMediaPlayerInterface::PlayerStatus status();
+ virtual MpInterface::PlayerStatus status();
virtual QString nowPlaying();
virtual bool playMrl(const QString &mrl);
virtual QString mrl();
diff --git a/src/modules/mediaplayer/libkvimediaplayer.cpp b/src/modules/mediaplayer/libkvimediaplayer.cpp
index 9da76e490..c20fb421c 100644
--- a/src/modules/mediaplayer/libkvimediaplayer.cpp
+++ b/src/modules/mediaplayer/libkvimediaplayer.cpp
@@ -24,11 +24,11 @@
//
//=============================================================================
-#include "mp_interface.h"
-#include "mp_amipinterface.h"
-#include "mp_mprisinterface.h"
-#include "mp_winampinterface.h"
-#include "mp_xmmsinterface.h"
+#include "MpInterface.h"
+#include "MpAmipInterface.h"
+#include "MpMprisInterface.h"
+#include "MpWinampInterface.h"
+#include "MpXmmsInterface.h"
#include "KviModule.h"
#include "KviOptions.h"
@@ -36,19 +36,19 @@
#include "kvi_out.h"
#include <QUrl>
-static KviPointerList<KviMediaPlayerInterfaceDescriptor> * g_pDescriptorList = 0;
+static KviPointerList<MpInterfaceDescriptor> * g_pDescriptorList = 0;
-static KviMediaPlayerInterface * g_pMPInterface = 0;
+static MpInterface * g_pMPInterface = 0;
-static KviMediaPlayerInterface * auto_detect_player(KviWindow * pOut = 0)
+static MpInterface * auto_detect_player(KviWindow * pOut = 0)
{
int iBest = 0;
- KviMediaPlayerInterface * pBest = 0;
- KviMediaPlayerInterfaceDescriptor * d;
- KviMediaPlayerInterfaceDescriptor * pDBest = 0;
+ MpInterface * pBest = 0;
+ MpInterfaceDescriptor * d;
+ MpInterfaceDescriptor * pDBest = 0;
for(d = g_pDescriptorList->first();d;d = g_pDescriptorList->next())
{
- KviMediaPlayerInterface * i = d->instance();
+ MpInterface * i = d->instance();
if(i)
{
int iScore = i->detect(false);
@@ -74,7 +74,7 @@ static KviMediaPlayerInterface * auto_detect_player(KviWindow * pOut = 0)
// no sure player found... try again with a destructive test
for(d = g_pDescriptorList->first();d;d = g_pDescriptorList->next())
{
- KviMediaPlayerInterface * i = d->instance();
+ MpInterface * i = d->instance();
if(i)
{
int iScore = i->detect(true);
@@ -460,7 +460,7 @@ MP_KVS_COMMAND(setPlayer)
KVSM_PARAMETER("player",KVS_PT_STRING,0,szPlayer)
KVSM_PARAMETERS_END(c)
- for(KviMediaPlayerInterfaceDescriptor * d = g_pDescriptorList->first();d;d = g_pDescriptorList->next())
+ for(MpInterfaceDescriptor * d = g_pDescriptorList->first();d;d = g_pDescriptorList->next())
{
if(d->name() == szPlayer)
{
@@ -523,7 +523,7 @@ MP_KVS_FUNCTION(playerList)
KviKvsArray* pArray = new KviKvsArray();
int id=0;
- for(KviMediaPlayerInterfaceDescriptor * d = g_pDescriptorList->first();d;d = g_pDescriptorList->next())
+ for(MpInterfaceDescriptor * d = g_pDescriptorList->first();d;d = g_pDescriptorList->next())
{
pArray->set(id++,new KviKvsVariant(d->name()));
}
@@ -1456,16 +1456,16 @@ MP_KVS_FUNCTION(status)
// KVSM_PARAMETERS_END(c)
MP_KVS_FAIL_ON_NO_INTERFACE
- KviMediaPlayerInterface::PlayerStatus eStat = g_pMPInterface->status();
+ MpInterface::PlayerStatus eStat = g_pMPInterface->status();
switch(eStat)
{
- case KviMediaPlayerInterface::Stopped:
+ case MpInterface::Stopped:
c->returnValue()->setString("stopped");
break;
- case KviMediaPlayerInterface::Playing:
+ case MpInterface::Playing:
c->returnValue()->setString("playing");
break;
- case KviMediaPlayerInterface::Paused:
+ case MpInterface::Paused:
c->returnValue()->setString("paused");
break;
default:
@@ -1606,24 +1606,24 @@ MP_KVS_COMMAND(setShuffle)
static bool mediaplayer_module_init( KviModule * m )
{
- g_pDescriptorList = new KviPointerList<KviMediaPlayerInterfaceDescriptor>;
+ g_pDescriptorList = new KviPointerList<MpInterfaceDescriptor>;
g_pDescriptorList->setAutoDelete(true);
#if (defined(COMPILE_DBUS_SUPPORT) && !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MAC) && !defined(COMPILE_ON_MINGW))
- g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviAudaciousInterface));
+ g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(MpAudaciousInterface));
g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviAudaciousClassicInterface));
g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviXmmsInterface));
- g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviXmms2Interface));
- g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviBmpxInterface));
- g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviAmarok2Interface));
- g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviQmmpInterface));
- g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviSongbirdInterface));
- g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviTotemInterface));
- g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviVlcInterface));
+ g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(MpXmms2Interface));
+ g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(MpBmpxInterface));
+ g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(MpAmarok2Interface));
+ g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(MpQmmpInterface));
+ g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(MpSongbirdInterface));
+ g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(MpTotemInterface));
+ g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(MpVlcInterface));
#endif
#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
- g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviAmipInterface));
+ g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(MpAmipInterface));
g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviWinampInterface));
#endif
g_pMPInterface = 0;
@@ -1632,7 +1632,7 @@ static bool mediaplayer_module_init( KviModule * m )
{
g_pMPInterface = auto_detect_player();
} else {
- for(KviMediaPlayerInterfaceDescriptor * d = g_pDescriptorList->first();d;d = g_pDescriptorList->next())
+ for(MpInterfaceDescriptor * d = g_pDescriptorList->first();d;d = g_pDescriptorList->next())
{
if(d->name() == KVI_OPTION_STRING(KviOption_stringPreferredMediaPlayer))
{
@@ -1724,7 +1724,7 @@ static bool mediaplayer_module_ctrl(KviModule *,const char * operation,void * pa
{
// we expect param to be a pointer to QStringList
QStringList * l = (QStringList *)param;
- for(KviMediaPlayerInterfaceDescriptor * d = g_pDescriptorList->first();d;d = g_pDescriptorList->next())
+ for(MpInterfaceDescriptor * d = g_pDescriptorList->first();d;d = g_pDescriptorList->next())
{
l->append(d->name());
}
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 05:14:46 +0000