diff options
| author | Timothy Pearson <[email protected]> | 2011-12-16 09:57:20 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2011-12-16 09:57:20 -0600 |
| commit | c6611272c2bc4a42580848946c8c5d81bb0409c7 (patch) | |
| tree | 0fd5b58844663dfcd00fb2b79cf67dd0fd429c62 /src/modules/mediaplayer/mp_interface.cpp | |
| parent | 805c2821ceaddada48b346c6d11bd0dc1351a539 (diff) | |
| download | kvirc-c6611272c2bc4a42580848946c8c5d81bb0409c7.tar.gz kvirc-c6611272c2bc4a42580848946c8c5d81bb0409c7.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 805c2821ceaddada48b346c6d11bd0dc1351a539.
Diffstat (limited to 'src/modules/mediaplayer/mp_interface.cpp')
| -rw-r--r-- | src/modules/mediaplayer/mp_interface.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/modules/mediaplayer/mp_interface.cpp b/src/modules/mediaplayer/mp_interface.cpp index c318e632..0c0a97a0 100644 --- a/src/modules/mediaplayer/mp_interface.cpp +++ b/src/modules/mediaplayer/mp_interface.cpp @@ -26,7 +26,7 @@ #include "mp_mp3.h" #include "kvi_options.h" #include "kvi_locale.h" -#include <textcodec.h> +#include <tqtextcodec.h> static TQTextCodec * mediaplayer_get_codec() { @@ -82,7 +82,7 @@ TQString KviMediaPlayerInterface::getLocalFile() { TQString ret = mrl(); if(ret.isEmpty())return ret; - if(ret.startsWith("file://",false)) + if(ret.tqstartsWith("file://",false)) { ret.remove(0,7); return ret; @@ -183,7 +183,7 @@ bool KviMediaPlayerInterface::jumpTo(int &iPos) return false; } -KviMediaPlayerInterface::PlayerStatus KviMediaPlayerInterface::status() +KviMediaPlayerInterface::PlayertqStatus KviMediaPlayerInterface::status() { notImplemented(); return KviMediaPlayerInterface::Unknown; @@ -265,12 +265,12 @@ bool KviMediaPlayerInterface::setShuffle(bool &bVal) TQString KviMediaPlayerInterface::mediaType() { TQString ret = mrl(); - if(ret.endsWith(".mp3",false))ret = "MPEG Layer 3"; - else if(ret.endsWith(".ogg",false))ret = "OGG Vorbis"; - else if(ret.endsWith(".avi",false))ret = "Audio Video Interleave"; - else if(ret.endsWith(".mpeg",false))ret = "MPEG Video"; - else if(ret.endsWith(".mpg",false))ret = "MPEG Video"; - else if(ret.startsWith("http://",false))ret = "HTTP Audio Stream"; + if(ret.tqendsWith(".mp3",false))ret = "MPEG Layer 3"; + else if(ret.tqendsWith(".ogg",false))ret = "OGG Vorbis"; + else if(ret.tqendsWith(".avi",false))ret = "Audio Video Interleave"; + else if(ret.tqendsWith(".mpeg",false))ret = "MPEG Video"; + else if(ret.tqendsWith(".mpg",false))ret = "MPEG Video"; + else if(ret.tqstartsWith("http://",false))ret = "HTTP Audio Stream"; else ret = TQString(); return ret; } |