diff options
| author | 2009-09-01 22:12:36 +0000 | |
|---|---|---|
| committer | 2009-09-01 22:12:36 +0000 | |
| commit | ea06d9bbbd8d8ef75034bfc3f62838f193537984 (patch) | |
| tree | a437eeabaa4b3d09f3313a6b0dd07b5bb961749d /src/modules/mediaplayer | |
| parent | updated splash screen (diff) | |
| download | KVIrc-ea06d9bbbd8d8ef75034bfc3f62838f193537984.tar.gz KVIrc-ea06d9bbbd8d8ef75034bfc3f62838f193537984.tar.bz2 KVIrc-ea06d9bbbd8d8ef75034bfc3f62838f193537984.zip | |
- trailing whitespace cleanups all over the place
- removed charset dependent manpages since it really makes no sense to distribute them, they are getting installed in non standard places and one manpage per language is enough
- added SpotChat to the serverdb, happens to be my network anyway :P (someone should remind me to check all the networks and servers there so we can do a cleanup if needed
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3463 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/mediaplayer')
| -rw-r--r-- | src/modules/mediaplayer/mp_amipinterface.cpp | 10 | ||||
| -rw-r--r-- | src/modules/mediaplayer/mp_amipinterface.h | 2 | ||||
| -rw-r--r-- | src/modules/mediaplayer/mp_mp3.h | 2 | ||||
| -rw-r--r-- | src/modules/mediaplayer/mp_winampinterface.cpp | 14 | ||||
| -rw-r--r-- | src/modules/mediaplayer/mp_winampinterface.h | 4 | ||||
| -rw-r--r-- | src/modules/mediaplayer/winamp.cpp | 2 |
6 files changed, 17 insertions, 17 deletions
diff --git a/src/modules/mediaplayer/mp_amipinterface.cpp b/src/modules/mediaplayer/mp_amipinterface.cpp index 52d71cba0..c81dd745a 100644 --- a/src/modules/mediaplayer/mp_amipinterface.cpp +++ b/src/modules/mediaplayer/mp_amipinterface.cpp @@ -81,7 +81,7 @@ static bool loadAmipDll() { amip_dll = LoadLibrary("ac.dll"); if (!amip_dll) return false; - + MP_AC_FUNC(ac_init); MP_AC_FUNC(ac_uninit); MP_AC_FUNC(ac_getDestHost); @@ -89,15 +89,15 @@ static bool loadAmipDll() MP_AC_FUNC(ac_pingServer); MP_AC_FUNC(ac_eval); MP_AC_FUNC(ac_exec); - + return true; }; static QTextCodec * mediaplayer_get_codec() { - QTextCodec * c= QTextCodec::codecForName(KVI_OPTION_STRING(KviOption_stringWinampTextEncoding).toAscii()); + QTextCodec * c= QTextCodec::codecForName(KVI_OPTION_STRING(KviOption_stringWinampTextEncoding).toAscii()); if(!c) - c = QTextCodec::codecForLocale(); + c = QTextCodec::codecForLocale(); return c; } @@ -241,7 +241,7 @@ QString KviAmipInterface::mrl() else ret=fn; if(!ret.startsWith("http://",Qt::CaseInsensitive)) ret.prepend("file://"); - + return ret; } diff --git a/src/modules/mediaplayer/mp_amipinterface.h b/src/modules/mediaplayer/mp_amipinterface.h index e7e962a2a..df0dacf04 100644 --- a/src/modules/mediaplayer/mp_amipinterface.h +++ b/src/modules/mediaplayer/mp_amipinterface.h @@ -73,7 +73,7 @@ virtual QString amipEval(const QString &cmd); virtual KviMediaPlayerInterface::PlayerStatus status(); }; - + MP_DECLARE_DESCRIPTOR(KviAmipInterface) #endif //COMPILE_ON_WINDOWS diff --git a/src/modules/mediaplayer/mp_mp3.h b/src/modules/mediaplayer/mp_mp3.h index 6a1584732..95a0660f3 100644 --- a/src/modules/mediaplayer/mp_mp3.h +++ b/src/modules/mediaplayer/mp_mp3.h @@ -30,7 +30,7 @@ // This file is based in part on: // // * MP3Info 0.5 by Ricardo Cerqueira <rmc@rccn.net> -// * MP3Stat 0.9 by Ed Sweetman <safemode@voicenet.com> and +// * MP3Stat 0.9 by Ed Sweetman <safemode@voicenet.com> and // Johannes Overmann <overmann@iname.com> // // There has been also a remarkable work by Cristopher Tieckle (Crissi) diff --git a/src/modules/mediaplayer/mp_winampinterface.cpp b/src/modules/mediaplayer/mp_winampinterface.cpp index 2ed11f2a5..4cafce127 100644 --- a/src/modules/mediaplayer/mp_winampinterface.cpp +++ b/src/modules/mediaplayer/mp_winampinterface.cpp @@ -46,14 +46,14 @@ #define IPC_JUMPTOTIME 106 // ** SendMessage(hwnd_winamp,WM_WA_IPC,ms,IPC_JUMPTOTIME); -// ** IPC_JUMPTOTIME sets the position in milliseconds of the +// ** IPC_JUMPTOTIME sets the position in milliseconds of the // ** current song (approximately). #define IPC_SETPLAYLISTPOS 121 // ** SendMessage(hwnd_winamp,WM_WA_IPC,position,IPC_SETPLAYLISTPOS) // ** IPC_SETPLAYLISTPOS sets the playlsit position to 'position'. -#define IPC_SETVOLUME 122 +#define IPC_SETVOLUME 122 // ** SendMessage(hwnd_winamp,WM_WA_IPC,volume,IPC_SETVOLUME); // ** IPC_SETVOLUME sets the volume of Winamp (from 0-255). @@ -62,9 +62,9 @@ // ** IPC_GETLISTLENGTH returns the length of the current playlist, in // ** tracks. -#define IPC_GETEQDATA 127 +#define IPC_GETEQDATA 127 // ** int data=SendMessage(hwnd_winamp,WM_WA_IPC,pos,IPC_GETEQDATA); -// ** IPC_GETEQDATA queries the status of the EQ. +// ** IPC_GETEQDATA queries the status of the EQ. // ** The value returned depends on what 'pos' is set to: // ** Value Meaning // ** ------------------ @@ -169,8 +169,8 @@ static QTextCodec * mediaplayer_get_codec() { - QTextCodec * c= QTextCodec::codecForName(KVI_OPTION_STRING(KviOption_stringWinampTextEncoding).toAscii()); - if(!c)c = QTextCodec::codecForLocale(); + QTextCodec * c= QTextCodec::codecForName(KVI_OPTION_STRING(KviOption_stringWinampTextEncoding).toAscii()); + if(!c)c = QTextCodec::codecForLocale(); return c; } @@ -362,7 +362,7 @@ QString KviWinampInterface::nowPlaying() szBuffer[i] = SendMessage(hWinamp,WM_USER,KVIRC_WM_USER,KVIRC_WM_USER_TRANSFER + i); } szBuffer[ len ] = '\0'; - + QTextCodec *c=mediaplayer_get_codec(); if (c) ret = c->toUnicode(szBuffer); else ret=szBuffer; diff --git a/src/modules/mediaplayer/mp_winampinterface.h b/src/modules/mediaplayer/mp_winampinterface.h index 9107038e3..1b3fb2403 100644 --- a/src/modules/mediaplayer/mp_winampinterface.h +++ b/src/modules/mediaplayer/mp_winampinterface.h @@ -68,9 +68,9 @@ virtual bool setShuffle(bool &bVal); virtual KviMediaPlayerInterface::PlayerStatus status(); }; - + MP_DECLARE_DESCRIPTOR(KviWinampInterface) - + #endif //COMPILE_ON_WINDOWS #endif //!_MP_WINAMPINTERFACE_H_ diff --git a/src/modules/mediaplayer/winamp.cpp b/src/modules/mediaplayer/winamp.cpp index 5d4695993..81bbdeda6 100644 --- a/src/modules/mediaplayer/winamp.cpp +++ b/src/modules/mediaplayer/winamp.cpp @@ -114,7 +114,7 @@ LRESULT CALLBACK WndProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam) char * szTitle = (char *)SendMessage(hwnd,WM_USER,idx,IPC_GETPLAYLISTFILE); strcpy(szBuffer,szTitle); return strlen(szBuffer); - } + } } else if((lParam >= KVIRC_WM_USER_TRANSFER) && (lParam < (KVIRC_WM_USER_TRANSFER + 4096))) { return (LRESULT) szBuffer[lParam - KVIRC_WM_USER_TRANSFER]; |
