TDE
/
kmplayer
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kmplayer
0
0
Fork 0
Code Issues Releases Wiki Activity

Replace KDE_[NO_]EXPORT with TDE_[NO_]EXPORT

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/21/head
Michele Calgaro 7 months ago
parent 132da05296
commit 22a46b7525
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
40 changed files with 1040 additions and 1040 deletions
Show Stats Download Patch File Download Diff File

6
src/kmplayer.h
Unescape View File

@ -67,12 +67,12 @@ public:
void addURL (const KURL& url); void addURL (const KURL& url);
KMPlayer::PartBase * player () const { return m_player; } KMPlayer::PartBase * player () const { return m_player; }
void resizePlayer (int percentage); void resizePlayer (int percentage);
KDE_NO_EXPORT TDERecentFilesAction * recentFiles () const { return fileOpenRecent; } TDE_NO_EXPORT TDERecentFilesAction * recentFiles () const { return fileOpenRecent; }
KDE_NO_EXPORT KMPlayer::View *view () const { return m_view; } TDE_NO_EXPORT KMPlayer::View *view () const { return m_view; }
bool broadcasting () const; bool broadcasting () const;
void showBroadcastConfig (); void showBroadcastConfig ();
void hideBroadcastConfig (); void hideBroadcastConfig ();
KDE_NO_EXPORT KMPlayerBroadcastConfig * broadcastConfig () const { return m_broadcastconfig; } TDE_NO_EXPORT KMPlayerBroadcastConfig * broadcastConfig () const { return m_broadcastconfig; }
/* After createGUI() some menu's have to readded again */ /* After createGUI() some menu's have to readded again */
void initMenu (); void initMenu ();
void restoreFromConfig (); void restoreFromConfig ();

20
src/kmplayer_asx.cpp
Unescape View File

@ -31,7 +31,7 @@ static TQString getAsxAttribute (Element * e, const TQString & attr) {
return TQString (); return TQString ();
} }
KDE_NO_EXPORT NodePtr ASX::Asx::childFromTag (const TQString & tag) { TDE_NO_EXPORT NodePtr ASX::Asx::childFromTag (const TQString & tag) {
const char * name = tag.latin1 (); const char * name = tag.latin1 ();
if (!strcasecmp (name, "entry")) if (!strcasecmp (name, "entry"))
return new ASX::Entry (m_doc); return new ASX::Entry (m_doc);
@ -46,7 +46,7 @@ KDE_NO_EXPORT NodePtr ASX::Asx::childFromTag (const TQString & tag) {
return 0L; return 0L;
} }
KDE_NO_EXPORT Node::PlayType ASX::Asx::playType () { TDE_NO_EXPORT Node::PlayType ASX::Asx::playType () {
if (cached_ismrl_version != document ()->m_tree_version) if (cached_ismrl_version != document ()->m_tree_version)
for (NodePtr e = firstChild (); e; e = e->nextSibling ()) { for (NodePtr e = firstChild (); e; e = e->nextSibling ()) {
if (e->id == id_node_title) if (e->id == id_node_title)
@ -59,7 +59,7 @@ KDE_NO_EXPORT Node::PlayType ASX::Asx::playType () {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
KDE_NO_EXPORT NodePtr ASX::Entry::childFromTag (const TQString & tag) { TDE_NO_EXPORT NodePtr ASX::Entry::childFromTag (const TQString & tag) {
const char * name = tag.latin1 (); const char * name = tag.latin1 ();
if (!strcasecmp (name, "ref")) if (!strcasecmp (name, "ref"))
return new ASX::Ref (m_doc); return new ASX::Ref (m_doc);
@ -76,7 +76,7 @@ KDE_NO_EXPORT NodePtr ASX::Entry::childFromTag (const TQString & tag) {
return 0L; return 0L;
} }
KDE_NO_EXPORT Node::PlayType ASX::Entry::playType () { TDE_NO_EXPORT Node::PlayType ASX::Entry::playType () {
if (cached_ismrl_version != document ()->m_tree_version) { if (cached_ismrl_version != document ()->m_tree_version) {
ref_child_count = 0; ref_child_count = 0;
NodePtr ref; NodePtr ref;
@ -100,7 +100,7 @@ KDE_NO_EXPORT Node::PlayType ASX::Entry::playType () {
return play_type_none; return play_type_none;
} }
KDE_NO_EXPORT void ASX::Entry::activate () { TDE_NO_EXPORT void ASX::Entry::activate () {
resolved = true; resolved = true;
for (NodePtr e = firstChild (); e; e = e->nextSibling ()) for (NodePtr e = firstChild (); e; e = e->nextSibling ())
if (e->id == id_node_param) { if (e->id == id_node_param) {
@ -116,30 +116,30 @@ KDE_NO_EXPORT void ASX::Entry::activate () {
Mrl::activate (); Mrl::activate ();
} }
KDE_NO_EXPORT void ASX::Entry::deactivate () { TDE_NO_EXPORT void ASX::Entry::deactivate () {
PlayListNotify * n = document ()->notify_listener; PlayListNotify * n = document ()->notify_listener;
if (n) if (n)
n->setInfoMessage (TQString ()); n->setInfoMessage (TQString ());
} }
KDE_NO_EXPORT bool ASX::Entry::expose () const { TDE_NO_EXPORT bool ASX::Entry::expose () const {
return ref_child_count > 1 && !pretty_name.isEmpty (); return ref_child_count > 1 && !pretty_name.isEmpty ();
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
KDE_NO_EXPORT void ASX::Ref::opened () { TDE_NO_EXPORT void ASX::Ref::opened () {
src = getAsxAttribute (this, "href"); src = getAsxAttribute (this, "href");
//kdDebug () << "Ref attr found src: " << src << endl; //kdDebug () << "Ref attr found src: " << src << endl;
} }
KDE_NO_EXPORT bool ASX::Ref::expose () const { TDE_NO_EXPORT bool ASX::Ref::expose () const {
return !src.isEmpty (); return !src.isEmpty ();
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
KDE_NO_EXPORT void ASX::EntryRef::opened () { TDE_NO_EXPORT void ASX::EntryRef::opened () {
src = getAsxAttribute (this, "href"); src = getAsxAttribute (this, "href");
//kdDebug () << "EntryRef attr found src: " << src << endl; //kdDebug () << "EntryRef attr found src: " << src << endl;
} }

8
src/kmplayer_asx.h
Unescape View File

@ -46,7 +46,7 @@ class KMPLAYER_NO_EXPORT Asx : public Mrl {
public: public:
KDE_NO_CDTOR_EXPORT Asx (NodePtr & d) : Mrl (d, id_node_asx) {} KDE_NO_CDTOR_EXPORT Asx (NodePtr & d) : Mrl (d, id_node_asx) {}
NodePtr childFromTag (const TQString & tag); NodePtr childFromTag (const TQString & tag);
KDE_NO_EXPORT const char * nodeName () const { return "ASX"; } TDE_NO_EXPORT const char * nodeName () const { return "ASX"; }
bool expose () const { return !pretty_name.isEmpty (); } bool expose () const { return !pretty_name.isEmpty (); }
PlayType playType (); PlayType playType ();
}; };
@ -59,7 +59,7 @@ public:
KDE_NO_CDTOR_EXPORT Entry (NodePtr & d) KDE_NO_CDTOR_EXPORT Entry (NodePtr & d)
: Mrl (d, id_node_entry), ref_child_count (0) {} : Mrl (d, id_node_entry), ref_child_count (0) {}
NodePtr childFromTag (const TQString & tag); NodePtr childFromTag (const TQString & tag);
KDE_NO_EXPORT const char * nodeName () const { return "Entry"; } TDE_NO_EXPORT const char * nodeName () const { return "Entry"; }
/** /**
* False, but since we might have a 'base' child, we can have a rel. src * False, but since we might have a 'base' child, we can have a rel. src
*/ */
@ -78,7 +78,7 @@ public:
KDE_NO_CDTOR_EXPORT Ref (NodePtr & d) : Mrl (d, id_node_ref) {} KDE_NO_CDTOR_EXPORT Ref (NodePtr & d) : Mrl (d, id_node_ref) {}
//NodePtr childFromTag (const TQString & tag); //NodePtr childFromTag (const TQString & tag);
void opened (); void opened ();
KDE_NO_EXPORT const char * nodeName () const { return "Ref"; } TDE_NO_EXPORT const char * nodeName () const { return "Ref"; }
bool expose () const; bool expose () const;
}; };
@ -90,7 +90,7 @@ public:
KDE_NO_CDTOR_EXPORT EntryRef (NodePtr & d) : Mrl (d, id_node_entryref) {} KDE_NO_CDTOR_EXPORT EntryRef (NodePtr & d) : Mrl (d, id_node_entryref) {}
//NodePtr childFromTag (const TQString & tag); //NodePtr childFromTag (const TQString & tag);
void opened (); void opened ();
KDE_NO_EXPORT const char * nodeName () const { return "EntryRef"; } TDE_NO_EXPORT const char * nodeName () const { return "EntryRef"; }
}; };
} //namespace ASX } //namespace ASX

8
src/kmplayer_atom.h
Unescape View File

@ -43,7 +43,7 @@ class KMPLAYER_NO_EXPORT Feed : public Mrl {
public: public:
KDE_NO_CDTOR_EXPORT Feed (NodePtr & d) : Mrl (d, id_node_feed) {} KDE_NO_CDTOR_EXPORT Feed (NodePtr & d) : Mrl (d, id_node_feed) {}
NodePtr childFromTag (const TQString & tag); NodePtr childFromTag (const TQString & tag);
KDE_NO_EXPORT const char * nodeName () const { return "feed"; } TDE_NO_EXPORT const char * nodeName () const { return "feed"; }
void closed (); void closed ();
bool expose () const { return !pretty_name.isEmpty (); } bool expose () const { return !pretty_name.isEmpty (); }
}; };
@ -52,7 +52,7 @@ class KMPLAYER_NO_EXPORT Entry : public Mrl {
public: public:
KDE_NO_CDTOR_EXPORT Entry (NodePtr & d) : Mrl (d, id_node_entry) {} KDE_NO_CDTOR_EXPORT Entry (NodePtr & d) : Mrl (d, id_node_entry) {}
NodePtr childFromTag (const TQString & tag); NodePtr childFromTag (const TQString & tag);
KDE_NO_EXPORT const char * nodeName () const { return "entry"; } TDE_NO_EXPORT const char * nodeName () const { return "entry"; }
PlayType playType () { return play_type_none; } PlayType playType () { return play_type_none; }
void closed (); void closed ();
}; };
@ -60,7 +60,7 @@ public:
class KMPLAYER_NO_EXPORT Link : public Mrl { class KMPLAYER_NO_EXPORT Link : public Mrl {
public: public:
KDE_NO_CDTOR_EXPORT Link (NodePtr & d) : Mrl (d, id_node_link) {} KDE_NO_CDTOR_EXPORT Link (NodePtr & d) : Mrl (d, id_node_link) {}
KDE_NO_EXPORT const char * nodeName () const { return "link"; } TDE_NO_EXPORT const char * nodeName () const { return "link"; }
PlayType playType (); PlayType playType ();
void closed (); void closed ();
}; };
@ -68,7 +68,7 @@ public:
class KMPLAYER_NO_EXPORT Content : public Mrl { class KMPLAYER_NO_EXPORT Content : public Mrl {
public: public:
KDE_NO_CDTOR_EXPORT Content (NodePtr &d) : Mrl(d, id_node_content) {} KDE_NO_CDTOR_EXPORT Content (NodePtr &d) : Mrl(d, id_node_content) {}
KDE_NO_EXPORT const char * nodeName () const { return "content"; } TDE_NO_EXPORT const char * nodeName () const { return "content"; }
PlayType playType (); PlayType playType ();
void closed (); void closed ();
//bool expose () const { return isPlayable (); } //bool expose () const { return isPlayable (); }

14
src/kmplayer_def.h
Unescape View File

@ -31,16 +31,16 @@
#include <kdemacros.h> #include <kdemacros.h>
#undef KDE_NO_CDTOR_EXPORT #undef KDE_NO_CDTOR_EXPORT
#undef KDE_NO_EXPORT #undef TDE_NO_EXPORT
#ifndef KDE_EXPORT #ifndef TDE_EXPORT
#define KDE_EXPORT #define TDE_EXPORT
#endif #endif
#if __GNUC__ - 0 > 3 && __GNUC_MINOR__ - 0 > 1 #if __GNUC__ - 0 > 3 && __GNUC_MINOR__ - 0 > 1
# define KMPLAYER_NO_EXPORT __attribute__ ((visibility("hidden"))) # define KMPLAYER_NO_EXPORT __attribute__ ((visibility("hidden")))
# define KMPLAYER_EXPORT __attribute__ ((visibility("default"))) # define KMPLAYER_EXPORT __attribute__ ((visibility("default")))
# define KMPLAYER_NO_MBR_EXPORT __attribute__ ((visibility("hidden"))) # define KMPLAYER_NO_MBR_EXPORT __attribute__ ((visibility("hidden")))
# define KDE_NO_CDTOR_EXPORT # define KDE_NO_CDTOR_EXPORT
# define KDE_NO_EXPORT # define TDE_NO_EXPORT
#elif __GNUC__ - 0 > 3 || (__GNUC__ - 0 == 3 && __GNUC_MINOR__ - 0 > 3) #elif __GNUC__ - 0 > 3 || (__GNUC__ - 0 == 3 && __GNUC_MINOR__ - 0 > 3)
#if __GNUC__ - 0 > 3 #if __GNUC__ - 0 > 3
#define KMPLAYER_NO_EXPORT __attribute__ ((visibility("hidden"))) #define KMPLAYER_NO_EXPORT __attribute__ ((visibility("hidden")))
@ -48,18 +48,18 @@
#define KMPLAYER_NO_EXPORT #define KMPLAYER_NO_EXPORT
#endif #endif
#define KDE_NO_CDTOR_EXPORT __attribute__ ((visibility("hidden"))) #define KDE_NO_CDTOR_EXPORT __attribute__ ((visibility("hidden")))
#define KDE_NO_EXPORT __attribute__ ((visibility("hidden"))) #define TDE_NO_EXPORT __attribute__ ((visibility("hidden")))
#define KMPLAYER_EXPORT __attribute__ ((visibility("default"))) #define KMPLAYER_EXPORT __attribute__ ((visibility("default")))
#define KMPLAYER_NO_MBR_EXPORT #define KMPLAYER_NO_MBR_EXPORT
#elif __GNUC__ - 0 > 3 || (__GNUC__ - 0 == 3 && __GNUC_MINOR__ - 0 > 2) #elif __GNUC__ - 0 > 3 || (__GNUC__ - 0 == 3 && __GNUC_MINOR__ - 0 > 2)
#define KDE_NO_CDTOR_EXPORT #define KDE_NO_CDTOR_EXPORT
#define KDE_NO_EXPORT __attribute__ ((visibility("hidden"))) #define TDE_NO_EXPORT __attribute__ ((visibility("hidden")))
#define KMPLAYER_EXPORT #define KMPLAYER_EXPORT
#define KMPLAYER_NO_EXPORT #define KMPLAYER_NO_EXPORT
#define KMPLAYER_NO_MBR_EXPORT #define KMPLAYER_NO_MBR_EXPORT
#else #else
#define KDE_NO_CDTOR_EXPORT #define KDE_NO_CDTOR_EXPORT
#define KDE_NO_EXPORT #define TDE_NO_EXPORT
#define KMPLAYER_EXPORT #define KMPLAYER_EXPORT
#define KMPLAYER_NO_EXPORT #define KMPLAYER_NO_EXPORT
#define KMPLAYER_NO_MBR_EXPORT #define KMPLAYER_NO_MBR_EXPORT

82
src/kmplayer_part.cpp
Unescape View File

@ -117,7 +117,7 @@ KDE_NO_CDTOR_EXPORT KMPlayerFactory::~KMPlayerFactory () {
delete s_instance; delete s_instance;
} }
KDE_NO_EXPORT KParts::Part *KMPlayerFactory::createPartObject TDE_NO_EXPORT KParts::Part *KMPlayerFactory::createPartObject
(TQWidget *wparent, const char *wname, (TQWidget *wparent, const char *wname,
TQObject *parent, const char * name, TQObject *parent, const char * name,
const char * cls, const TQStringList & args) { const char * cls, const TQStringList & args) {
@ -392,16 +392,16 @@ KDE_NO_CDTOR_EXPORT KMPlayerPart::~KMPlayerPart () {
m_config = 0L; m_config = 0L;
} }
KDE_NO_EXPORT bool KMPlayerPart::allowRedir (const KURL & url) const { TDE_NO_EXPORT bool KMPlayerPart::allowRedir (const KURL & url) const {
return kapp->authorizeURLAction ("redirect", m_docbase, url); return kapp->authorizeURLAction ("redirect", m_docbase, url);
} }
KDE_NO_EXPORT void KMPlayerPart::setAutoControls (bool b) { TDE_NO_EXPORT void KMPlayerPart::setAutoControls (bool b) {
m_auto_controls = b; m_auto_controls = b;
m_view->controlPanel ()->setAutoControls (b); m_view->controlPanel ()->setAutoControls (b);
} }
KDE_NO_EXPORT void KMPlayerPart::viewerPartDestroyed (TQObject * o) { TDE_NO_EXPORT void KMPlayerPart::viewerPartDestroyed (TQObject * o) {
if (o == m_master) if (o == m_master)
m_master = 0L; m_master = 0L;
kdDebug () << "KMPlayerPart(" << this << ")::viewerPartDestroyed" << endl; kdDebug () << "KMPlayerPart(" << this << ")::viewerPartDestroyed" << endl;
@ -411,14 +411,14 @@ KDE_NO_EXPORT void KMPlayerPart::viewerPartDestroyed (TQObject * o) {
(*i)->updatePlayerMenu (m_view->controlPanel ()); (*i)->updatePlayerMenu (m_view->controlPanel ());
} }
KDE_NO_EXPORT void KMPlayerPart::viewerPartProcessChanged (const char *) { TDE_NO_EXPORT void KMPlayerPart::viewerPartProcessChanged (const char *) {
const KMPlayerPartList::iterator e =kmplayerpart_static->partlist.end(); const KMPlayerPartList::iterator e =kmplayerpart_static->partlist.end();
KMPlayerPartList::iterator i = std::find_if (kmplayerpart_static->partlist.begin (), e, GroupPredicate (this, m_group)); KMPlayerPartList::iterator i = std::find_if (kmplayerpart_static->partlist.begin (), e, GroupPredicate (this, m_group));
if (i != e && *i != this) if (i != e && *i != this)
(*i)->updatePlayerMenu (m_view->controlPanel ()); (*i)->updatePlayerMenu (m_view->controlPanel ());
} }
KDE_NO_EXPORT void KMPlayerPart::viewerPartSourceChanged(Source *o, Source *s) { TDE_NO_EXPORT void KMPlayerPart::viewerPartSourceChanged(Source *o, Source *s) {
kdDebug () << "KMPlayerPart::source changed " << m_master << endl; kdDebug () << "KMPlayerPart::source changed " << m_master << endl;
if (m_master && m_view) { if (m_master && m_view) {
connectSource (o, s); connectSource (o, s);
@ -426,7 +426,7 @@ KDE_NO_EXPORT void KMPlayerPart::viewerPartSourceChanged(Source *o, Source *s) {
} }
} }
KDE_NO_EXPORT bool KMPlayerPart::openURL (const KURL & _url) { TDE_NO_EXPORT bool KMPlayerPart::openURL (const KURL & _url) {
kdDebug () << "KMPlayerPart::openURL " << _url.url() << endl; kdDebug () << "KMPlayerPart::openURL " << _url.url() << endl;
Source * urlsource = m_sources ["urlsource"]; Source * urlsource = m_sources ["urlsource"];
KMPlayerHRefSource * hrefsource = static_cast <KMPlayerHRefSource *>(m_sources ["hrefsource"]); KMPlayerHRefSource * hrefsource = static_cast <KMPlayerHRefSource *>(m_sources ["hrefsource"]);
@ -506,14 +506,14 @@ KDE_NO_EXPORT bool KMPlayerPart::openURL (const KURL & _url) {
return true; return true;
} }
KDE_NO_EXPORT bool KMPlayerPart::openNewURL (const KURL & url) { TDE_NO_EXPORT bool KMPlayerPart::openNewURL (const KURL & url) {
m_file_name.truncate (0); m_file_name.truncate (0);
m_havehref = false; m_havehref = false;
m_sources ["urlsource"]->setAutoPlay (true); m_sources ["urlsource"]->setAutoPlay (true);
return openURL (url); return openURL (url);
} }
KDE_NO_EXPORT void KMPlayerPart::waitForImageWindowTimeOut () { TDE_NO_EXPORT void KMPlayerPart::waitForImageWindowTimeOut () {
if (!m_master) { if (!m_master) {
// still no ImageWindow attached, eg. audio only // still no ImageWindow attached, eg. audio only
const KMPlayerPartList::iterator e =kmplayerpart_static->partlist.end(); const KMPlayerPartList::iterator e =kmplayerpart_static->partlist.end();
@ -536,7 +536,7 @@ KDE_NO_EXPORT void KMPlayerPart::waitForImageWindowTimeOut () {
} }
} }
KDE_NO_EXPORT bool KMPlayerPart::closeURL () { TDE_NO_EXPORT bool KMPlayerPart::closeURL () {
if (!m_group.isEmpty ()) { if (!m_group.isEmpty ()) {
kmplayerpart_static->partlist.remove (this); kmplayerpart_static->partlist.remove (this);
m_group.truncate (0); m_group.truncate (0);
@ -544,7 +544,7 @@ KDE_NO_EXPORT bool KMPlayerPart::closeURL () {
return PartBase::closeURL (); return PartBase::closeURL ();
} }
KDE_NO_EXPORT void KMPlayerPart::connectToPart (KMPlayerPart * m) { TDE_NO_EXPORT void KMPlayerPart::connectToPart (KMPlayerPart * m) {
m_master = m; m_master = m;
m->connectPanel (m_view->controlPanel ()); m->connectPanel (m_view->controlPanel ());
m->updatePlayerMenu (m_view->controlPanel ()); m->updatePlayerMenu (m_view->controlPanel ());
@ -567,7 +567,7 @@ KDE_NO_EXPORT void KMPlayerPart::connectToPart (KMPlayerPart * m) {
} }
} }
KDE_NO_EXPORT void KMPlayerPart::setLoaded (int percentage) { TDE_NO_EXPORT void KMPlayerPart::setLoaded (int percentage) {
PartBase::setLoaded (percentage); PartBase::setLoaded (percentage);
if (percentage < 100) { if (percentage < 100) {
m_browserextension->setLoadingProgress (percentage); m_browserextension->setLoadingProgress (percentage);
@ -576,7 +576,7 @@ KDE_NO_EXPORT void KMPlayerPart::setLoaded (int percentage) {
} }
} }
KDE_NO_EXPORT void KMPlayerPart::playingStarted () { TDE_NO_EXPORT void KMPlayerPart::playingStarted () {
const KMPlayerPartList::iterator e =kmplayerpart_static->partlist.end(); const KMPlayerPartList::iterator e =kmplayerpart_static->partlist.end();
KMPlayerPartList::iterator i = std::find_if (kmplayerpart_static->partlist.begin (), e, GroupPredicate (this, m_group)); KMPlayerPartList::iterator i = std::find_if (kmplayerpart_static->partlist.begin (), e, GroupPredicate (this, m_group));
if (i != e && *i != this && m_view && (*i)->source()) { if (i != e && *i != this && m_view && (*i)->source()) {
@ -600,7 +600,7 @@ KDE_NO_EXPORT void KMPlayerPart::playingStarted () {
m_browserextension->infoMessage (i18n("KMPlayer: Playing")); m_browserextension->infoMessage (i18n("KMPlayer: Playing"));
} }
KDE_NO_EXPORT void KMPlayerPart::playingStopped () { TDE_NO_EXPORT void KMPlayerPart::playingStopped () {
KMPlayer::PartBase::playingStopped (); KMPlayer::PartBase::playingStopped ();
if (m_started_emited) { if (m_started_emited) {
m_started_emited = false; m_started_emited = false;
@ -615,7 +615,7 @@ KDE_NO_EXPORT void KMPlayerPart::playingStopped () {
m_view->controlPanel ()->setPlaying (false); m_view->controlPanel ()->setPlaying (false);
} }
KDE_NO_EXPORT void KMPlayerPart::setMenuZoom (int id) { TDE_NO_EXPORT void KMPlayerPart::setMenuZoom (int id) {
int w = 0, h = 0; int w = 0, h = 0;
if (m_source) if (m_source)
m_source->dimensions (w, h); m_source->dimensions (w, h);
@ -637,7 +637,7 @@ KDE_NO_EXPORT void KMPlayerPart::setMenuZoom (int id) {
int (scale * m_view->viewer ()->height())); int (scale * m_view->viewer ()->height()));
} }
KDE_NO_EXPORT void KMPlayerPart::statusPosition (int pos, int length) { TDE_NO_EXPORT void KMPlayerPart::statusPosition (int pos, int length) {
int left = (length - pos) / 10; int left = (length - pos) / 10;
if (left != last_time_left) { if (left != last_time_left) {
last_time_left = left; last_time_left = left;
@ -661,32 +661,32 @@ KDE_NO_CDTOR_EXPORT KMPlayerBrowserExtension::KMPlayerBrowserExtension (KMPlayer
: KParts::BrowserExtension (parent, "KMPlayer Browser Extension") { : KParts::BrowserExtension (parent, "KMPlayer Browser Extension") {
} }
KDE_NO_EXPORT void KMPlayerBrowserExtension::urlChanged (const TQString & url) { TDE_NO_EXPORT void KMPlayerBrowserExtension::urlChanged (const TQString & url) {
emit setLocationBarURL (url); emit setLocationBarURL (url);
} }
KDE_NO_EXPORT void KMPlayerBrowserExtension::setLoadingProgress (int percentage) { TDE_NO_EXPORT void KMPlayerBrowserExtension::setLoadingProgress (int percentage) {
emit loadingProgress (percentage); emit loadingProgress (percentage);
} }
KDE_NO_EXPORT void KMPlayerBrowserExtension::saveState (TQDataStream & stream) { TDE_NO_EXPORT void KMPlayerBrowserExtension::saveState (TQDataStream & stream) {
stream << static_cast <PartBase *> (parent ())->url ().url (); stream << static_cast <PartBase *> (parent ())->url ().url ();
} }
KDE_NO_EXPORT void KMPlayerBrowserExtension::restoreState (TQDataStream & stream) { TDE_NO_EXPORT void KMPlayerBrowserExtension::restoreState (TQDataStream & stream) {
TQString url; TQString url;
stream >> url; stream >> url;
static_cast <PartBase *> (parent ())->openURL (KURL(url)); static_cast <PartBase *> (parent ())->openURL (KURL(url));
} }
KDE_NO_EXPORT void KMPlayerBrowserExtension::requestOpenURL (const KURL & url, const TQString & target, const TQString & service) { TDE_NO_EXPORT void KMPlayerBrowserExtension::requestOpenURL (const KURL & url, const TQString & target, const TQString & service) {
KParts::URLArgs args; KParts::URLArgs args;
args.frameName = target; args.frameName = target;
args.serviceType = service; args.serviceType = service;
emit openURLRequest (url, args); emit openURLRequest (url, args);
} }
KDE_NO_EXPORT void KMPlayerBrowserExtension::slotRequestOpenURL (const KURL &url, const TQString &target) { TDE_NO_EXPORT void KMPlayerBrowserExtension::slotRequestOpenURL (const KURL &url, const TQString &target) {
requestOpenURL (url, target, TQString ()); requestOpenURL (url, target, TQString ());
} }
@ -870,11 +870,11 @@ KDE_NO_CDTOR_EXPORT KMPlayerLiveConnectExtension::~KMPlayerLiveConnectExtension(
kdDebug () << "KMPlayerLiveConnectExtension::~KMPlayerLiveConnectExtension()" << endl; kdDebug () << "KMPlayerLiveConnectExtension::~KMPlayerLiveConnectExtension()" << endl;
} }
KDE_NO_EXPORT void KMPlayerLiveConnectExtension::started () { TDE_NO_EXPORT void KMPlayerLiveConnectExtension::started () {
m_started = true; m_started = true;
} }
KDE_NO_EXPORT void KMPlayerLiveConnectExtension::finished () { TDE_NO_EXPORT void KMPlayerLiveConnectExtension::finished () {
if (m_started && m_enablefinish) { if (m_started && m_enablefinish) {
KParts::LiveConnectExtension::ArgList args; KParts::LiveConnectExtension::ArgList args;
args.push_back (qMakePair (KParts::LiveConnectExtension::TypeString, TQString("if (window.onFinished) onFinished();"))); args.push_back (qMakePair (KParts::LiveConnectExtension::TypeString, TQString("if (window.onFinished) onFinished();")));
@ -884,7 +884,7 @@ KDE_NO_EXPORT void KMPlayerLiveConnectExtension::finished () {
} }
} }
KDE_NO_EXPORT void KMPlayerLiveConnectExtension::evaluate ( TDE_NO_EXPORT void KMPlayerLiveConnectExtension::evaluate (
const TQString & scr, TQString & result) { const TQString & scr, TQString & result) {
TQString script (scr); TQString script (scr);
KParts::LiveConnectExtension::ArgList args; KParts::LiveConnectExtension::ArgList args;
@ -902,7 +902,7 @@ KDE_NO_EXPORT void KMPlayerLiveConnectExtension::evaluate (
result = script_result; result = script_result;
} }
KDE_NO_EXPORT bool KMPlayerLiveConnectExtension::get TDE_NO_EXPORT bool KMPlayerLiveConnectExtension::get
(const unsigned long id, const TQString & name, (const unsigned long id, const TQString & name,
KParts::LiveConnectExtension::Type & type, KParts::LiveConnectExtension::Type & type,
unsigned long & rid, TQString & rval) unsigned long & rid, TQString & rval)
@ -942,7 +942,7 @@ KDE_NO_EXPORT bool KMPlayerLiveConnectExtension::get
return true; return true;
} }
KDE_NO_EXPORT bool KMPlayerLiveConnectExtension::put TDE_NO_EXPORT bool KMPlayerLiveConnectExtension::put
(const unsigned long, const TQString & name, const TQString & val) { (const unsigned long, const TQString & name, const TQString & val) {
if (name == "__kmplayer__res") { if (name == "__kmplayer__res") {
script_result = val; script_result = val;
@ -973,7 +973,7 @@ KDE_NO_EXPORT bool KMPlayerLiveConnectExtension::put
return true; return true;
} }
KDE_NO_EXPORT bool KMPlayerLiveConnectExtension::call TDE_NO_EXPORT bool KMPlayerLiveConnectExtension::call
(const unsigned long id, const TQString & name, (const unsigned long id, const TQString & name,
const TQStringList & args, KParts::LiveConnectExtension::Type & type, const TQStringList & args, KParts::LiveConnectExtension::Type & type,
unsigned long & rid, TQString & rval) { unsigned long & rid, TQString & rval) {
@ -1091,10 +1091,10 @@ KDE_NO_EXPORT bool KMPlayerLiveConnectExtension::call
return true; return true;
} }
KDE_NO_EXPORT void KMPlayerLiveConnectExtension::unregister (const unsigned long) { TDE_NO_EXPORT void KMPlayerLiveConnectExtension::unregister (const unsigned long) {
} }
KDE_NO_EXPORT void KMPlayerLiveConnectExtension::setSize (int w, int h) { TDE_NO_EXPORT void KMPlayerLiveConnectExtension::setSize (int w, int h) {
KMPlayer::View * view = static_cast <KMPlayer::View*> (player->view ()); KMPlayer::View * view = static_cast <KMPlayer::View*> (player->view ());
if (view->controlPanelMode () == KMPlayer::View::CP_Show) if (view->controlPanelMode () == KMPlayer::View::CP_Show)
h += view->controlPanel()->height(); h += view->controlPanel()->height();
@ -1116,21 +1116,21 @@ KDE_NO_CDTOR_EXPORT KMPlayerHRefSource::~KMPlayerHRefSource () {
//kdDebug () << "KMPlayerHRefSource::~KMPlayerHRefSource" << endl; //kdDebug () << "KMPlayerHRefSource::~KMPlayerHRefSource" << endl;
} }
KDE_NO_EXPORT void KMPlayerHRefSource::init () { TDE_NO_EXPORT void KMPlayerHRefSource::init () {
Source::init (); Source::init ();
setIdentified (); setIdentified ();
} }
KDE_NO_EXPORT bool KMPlayerHRefSource::hasLength () { TDE_NO_EXPORT bool KMPlayerHRefSource::hasLength () {
return false; return false;
} }
KDE_NO_EXPORT bool KMPlayerHRefSource::processOutput (const TQString & /*str*/) { TDE_NO_EXPORT bool KMPlayerHRefSource::processOutput (const TQString & /*str*/) {
//return Source::processOutput (str); //return Source::processOutput (str);
return true; return true;
} }
KDE_NO_EXPORT void KMPlayerHRefSource::setURL (const KURL & url) { TDE_NO_EXPORT void KMPlayerHRefSource::setURL (const KURL & url) {
m_url = url; m_url = url;
m_identified = false; m_identified = false;
m_finished = false; m_finished = false;
@ -1138,7 +1138,7 @@ KDE_NO_EXPORT void KMPlayerHRefSource::setURL (const KURL & url) {
kdDebug () << "KMPlayerHRefSource::setURL " << m_url.url() << endl; kdDebug () << "KMPlayerHRefSource::setURL " << m_url.url() << endl;
} }
KDE_NO_EXPORT void KMPlayerHRefSource::play () { TDE_NO_EXPORT void KMPlayerHRefSource::play () {
kdDebug () << "KMPlayerHRefSource::play " << m_url.url() << endl; kdDebug () << "KMPlayerHRefSource::play " << m_url.url() << endl;
Source * src = m_player->sources () ["urlsource"]; Source * src = m_player->sources () ["urlsource"];
TQString target = src->document ()->document ()-> TQString target = src->document ()->document ()->
@ -1150,7 +1150,7 @@ KDE_NO_EXPORT void KMPlayerHRefSource::play () {
m_player->setSource (m_player->sources () ["urlsource"]); m_player->setSource (m_player->sources () ["urlsource"]);
} }
KDE_NO_EXPORT void KMPlayerHRefSource::activate () { TDE_NO_EXPORT void KMPlayerHRefSource::activate () {
m_player->stop (); m_player->stop ();
if (m_finished) { if (m_finished) {
TQTimer::singleShot (0, this, TQ_SLOT (finished ())); TQTimer::singleShot (0, this, TQ_SLOT (finished ()));
@ -1167,18 +1167,18 @@ KDE_NO_EXPORT void KMPlayerHRefSource::activate () {
} }
} }
KDE_NO_EXPORT void KMPlayerHRefSource::clear () { TDE_NO_EXPORT void KMPlayerHRefSource::clear () {
setURL (KURL ()); setURL (KURL ());
} }
KDE_NO_EXPORT void KMPlayerHRefSource::grabReady (const TQString & path) { TDE_NO_EXPORT void KMPlayerHRefSource::grabReady (const TQString & path) {
kdDebug () << "KMPlayerHRefSource::grabReady(" << path << ")" << endl; kdDebug () << "KMPlayerHRefSource::grabReady(" << path << ")" << endl;
m_finished = true; m_finished = true;
m_grabfile = path; m_grabfile = path;
finished (); finished ();
} }
KDE_NO_EXPORT void KMPlayerHRefSource::finished () { TDE_NO_EXPORT void KMPlayerHRefSource::finished () {
kdDebug () << "KMPlayerHRefSource::finished()" << endl; kdDebug () << "KMPlayerHRefSource::finished()" << endl;
KMPlayer::View * view = static_cast <KMPlayer::View*> (m_player->view ()); KMPlayer::View * view = static_cast <KMPlayer::View*> (m_player->view ());
if (!view) return; if (!view) return;
@ -1191,7 +1191,7 @@ KDE_NO_EXPORT void KMPlayerHRefSource::finished () {
connect (view, TQ_SIGNAL (pictureClicked ()), this, TQ_SLOT (play ())); connect (view, TQ_SIGNAL (pictureClicked ()), this, TQ_SLOT (play ()));
} }
KDE_NO_EXPORT void KMPlayerHRefSource::deactivate () { TDE_NO_EXPORT void KMPlayerHRefSource::deactivate () {
kdDebug () << "KMPlayerHRefSource::deactivate()" << endl; kdDebug () << "KMPlayerHRefSource::deactivate()" << endl;
KMPlayer::View * view = static_cast <KMPlayer::View*> (m_player->view ()); KMPlayer::View * view = static_cast <KMPlayer::View*> (m_player->view ());
if (!view) return; if (!view) return;
@ -1200,7 +1200,7 @@ KDE_NO_EXPORT void KMPlayerHRefSource::deactivate () {
disconnect (view, TQ_SIGNAL (pictureClicked ()), this, TQ_SLOT (play ())); disconnect (view, TQ_SIGNAL (pictureClicked ()), this, TQ_SLOT (play ()));
} }
KDE_NO_EXPORT TQString KMPlayerHRefSource::prettyName () { TDE_NO_EXPORT TQString KMPlayerHRefSource::prettyName () {
return i18n ("WEB"); return i18n ("WEB");
} }

4
src/kmplayer_part.h
Unescape View File

@ -137,11 +137,11 @@ public:
TQObject * parent, const char * name, const TQStringList &args); TQObject * parent, const char * name, const TQStringList &args);
~KMPlayerPart (); ~KMPlayerPart ();
KDE_NO_EXPORT KMPlayerBrowserExtension * browserextension() const TDE_NO_EXPORT KMPlayerBrowserExtension * browserextension() const
{ return m_browserextension; } { return m_browserextension; }
KMPlayerLiveConnectExtension * liveconnectextension () const KMPlayerLiveConnectExtension * liveconnectextension () const
{ return m_liveconnectextension; } { return m_liveconnectextension; }
KDE_NO_EXPORT bool hasFeature (int f) { return m_features & f; } TDE_NO_EXPORT bool hasFeature (int f) { return m_features & f; }
bool allowRedir (const KURL & url) const; bool allowRedir (const KURL & url) const;
void connectToPart (KMPlayerPart *); void connectToPart (KMPlayerPart *);
KMPlayerPart * master () const { return m_master; } KMPlayerPart * master () const { return m_master; }

86
src/kmplayer_rp.cpp
Unescape View File

@ -39,7 +39,7 @@ KDE_NO_CDTOR_EXPORT RP::Imfl::Imfl (NodePtr & d)
KDE_NO_CDTOR_EXPORT RP::Imfl::~Imfl () { KDE_NO_CDTOR_EXPORT RP::Imfl::~Imfl () {
} }
KDE_NO_EXPORT void RP::Imfl::closed () { TDE_NO_EXPORT void RP::Imfl::closed () {
for (NodePtr n = firstChild (); n; n = n->nextSibling ()) for (NodePtr n = firstChild (); n; n = n->nextSibling ())
if (RP::id_node_head == n->id) { if (RP::id_node_head == n->id) {
AttributePtr a = convertNode <Element> (n)->attributes ()->first (); AttributePtr a = convertNode <Element> (n)->attributes ()->first ();
@ -57,7 +57,7 @@ KDE_NO_EXPORT void RP::Imfl::closed () {
} }
} }
KDE_NO_EXPORT void RP::Imfl::defer () { TDE_NO_EXPORT void RP::Imfl::defer () {
kdDebug () << "RP::Imfl::defer " << endl; kdDebug () << "RP::Imfl::defer " << endl;
setState (state_deferred); setState (state_deferred);
for (Node * n = firstChild ().ptr (); n; n = n->nextSibling ().ptr ()) for (Node * n = firstChild ().ptr (); n; n = n->nextSibling ().ptr ())
@ -65,7 +65,7 @@ KDE_NO_EXPORT void RP::Imfl::defer () {
n->activate (); n->activate ();
} }
KDE_NO_EXPORT void RP::Imfl::activate () { TDE_NO_EXPORT void RP::Imfl::activate () {
kdDebug () << "RP::Imfl::activate " << endl; kdDebug () << "RP::Imfl::activate " << endl;
resolved = true; resolved = true;
setState (state_activated); setState (state_activated);
@ -92,7 +92,7 @@ KDE_NO_EXPORT void RP::Imfl::activate () {
finish (); finish ();
} }
KDE_NO_EXPORT void RP::Imfl::finish () { TDE_NO_EXPORT void RP::Imfl::finish () {
kdDebug () << "RP::Imfl::finish " << endl; kdDebug () << "RP::Imfl::finish " << endl;
Mrl::finish (); Mrl::finish ();
if (duration_timer) { if (duration_timer) {
@ -104,7 +104,7 @@ KDE_NO_EXPORT void RP::Imfl::finish () {
n->finish (); n->finish ();
} }
KDE_NO_EXPORT void RP::Imfl::childDone (NodePtr) { TDE_NO_EXPORT void RP::Imfl::childDone (NodePtr) {
if (unfinished () && !duration_timer) { if (unfinished () && !duration_timer) {
for (NodePtr n = firstChild (); n; n = n->nextSibling ()) for (NodePtr n = firstChild (); n; n = n->nextSibling ())
switch (n->id) { switch (n->id) {
@ -119,7 +119,7 @@ KDE_NO_EXPORT void RP::Imfl::childDone (NodePtr) {
} }
} }
KDE_NO_EXPORT void RP::Imfl::deactivate () { TDE_NO_EXPORT void RP::Imfl::deactivate () {
kdDebug () << "RP::Imfl::deactivate " << endl; kdDebug () << "RP::Imfl::deactivate " << endl;
if (unfinished ()) if (unfinished ())
finish (); finish ();
@ -132,7 +132,7 @@ KDE_NO_EXPORT void RP::Imfl::deactivate () {
rp_surface = Mrl::getSurface (0L); rp_surface = Mrl::getSurface (0L);
} }
KDE_NO_EXPORT bool RP::Imfl::handleEvent (EventPtr event) { TDE_NO_EXPORT bool RP::Imfl::handleEvent (EventPtr event) {
if (event->id () == event_timer) { if (event->id () == event_timer) {
TimerEvent * te = static_cast <TimerEvent *> (event.ptr ()); TimerEvent * te = static_cast <TimerEvent *> (event.ptr ());
if (te->timer_info == duration_timer) { if (te->timer_info == duration_timer) {
@ -145,11 +145,11 @@ KDE_NO_EXPORT bool RP::Imfl::handleEvent (EventPtr event) {
return true; return true;
} }
KDE_NO_EXPORT void RP::Imfl::accept (Visitor * v) { TDE_NO_EXPORT void RP::Imfl::accept (Visitor * v) {
v->visit (this); v->visit (this);
} }
KDE_NO_EXPORT Surface *RP::Imfl::surface () { TDE_NO_EXPORT Surface *RP::Imfl::surface () {
if (!rp_surface) { if (!rp_surface) {
rp_surface = Mrl::getSurface (this); rp_surface = Mrl::getSurface (this);
if (rp_surface) { if (rp_surface) {
@ -162,7 +162,7 @@ KDE_NO_EXPORT Surface *RP::Imfl::surface () {
return rp_surface.ptr (); return rp_surface.ptr ();
} }
KDE_NO_EXPORT NodePtr RP::Imfl::childFromTag (const TQString & tag) { TDE_NO_EXPORT NodePtr RP::Imfl::childFromTag (const TQString & tag) {
const char * ctag = tag.latin1 (); const char * ctag = tag.latin1 ();
if (!strcmp (ctag, "head")) if (!strcmp (ctag, "head"))
return new DarkNode (m_doc, "head", RP::id_node_head); return new DarkNode (m_doc, "head", RP::id_node_head);
@ -183,7 +183,7 @@ KDE_NO_EXPORT NodePtr RP::Imfl::childFromTag (const TQString & tag) {
return 0L; return 0L;
} }
KDE_NO_EXPORT void RP::Imfl::repaint () { TDE_NO_EXPORT void RP::Imfl::repaint () {
if (!active ()) if (!active ())
kdWarning () << "Spurious Imfl repaint" << endl; kdWarning () << "Spurious Imfl repaint" << endl;
else if (surface () && width > 0 && height > 0) else if (surface () && width > 0 && height > 0)
@ -197,11 +197,11 @@ KDE_NO_CDTOR_EXPORT RP::Image::Image (NodePtr & doc)
KDE_NO_CDTOR_EXPORT RP::Image::~Image () { KDE_NO_CDTOR_EXPORT RP::Image::~Image () {
} }
KDE_NO_EXPORT void RP::Image::closed () { TDE_NO_EXPORT void RP::Image::closed () {
src = getAttribute (StringPool::attr_name); src = getAttribute (StringPool::attr_name);
} }
KDE_NO_EXPORT void RP::Image::activate () { TDE_NO_EXPORT void RP::Image::activate () {
kdDebug () << "RP::Image::activate" << endl; kdDebug () << "RP::Image::activate" << endl;
setState (state_activated); setState (state_activated);
isPlayable (); // update src attribute isPlayable (); // update src attribute
@ -214,11 +214,11 @@ KDE_NO_EXPORT void RP::Image::activate () {
} }
} }
KDE_NO_EXPORT void RP::Image::begin () { TDE_NO_EXPORT void RP::Image::begin () {
Node::begin (); Node::begin ();
} }
KDE_NO_EXPORT void RP::Image::deactivate () { TDE_NO_EXPORT void RP::Image::deactivate () {
cached_img.setUrl (TQString ()); cached_img.setUrl (TQString ());
if (img_surface) { if (img_surface) {
img_surface->remove (); img_surface->remove ();
@ -229,7 +229,7 @@ KDE_NO_EXPORT void RP::Image::deactivate () {
} }
KDE_NO_EXPORT void RP::Image::remoteReady (TQByteArray & data) { TDE_NO_EXPORT void RP::Image::remoteReady (TQByteArray & data) {
kdDebug () << "RP::Image::remoteReady" << endl; kdDebug () << "RP::Image::remoteReady" << endl;
if (!data.isEmpty () && cached_img.isEmpty ()) { if (!data.isEmpty () && cached_img.isEmpty ()) {
TQImage * img = new TQImage (data); TQImage * img = new TQImage (data);
@ -244,13 +244,13 @@ KDE_NO_EXPORT void RP::Image::remoteReady (TQByteArray & data) {
postpone_lock = 0L; postpone_lock = 0L;
} }
KDE_NO_EXPORT bool RP::Image::isReady (bool postpone_if_not) { TDE_NO_EXPORT bool RP::Image::isReady (bool postpone_if_not) {
if (downloading () && postpone_if_not) if (downloading () && postpone_if_not)
postpone_lock = document ()->postpone (); postpone_lock = document ()->postpone ();
return !downloading (); return !downloading ();
} }
KDE_NO_EXPORT Surface *RP::Image::surface () { TDE_NO_EXPORT Surface *RP::Image::surface () {
if (!img_surface && !cached_img.isEmpty ()) { if (!img_surface && !cached_img.isEmpty ()) {
Node * p = parentNode ().ptr (); Node * p = parentNode ().ptr ();
if (p && p->id == RP::id_node_imfl) { if (p && p->id == RP::id_node_imfl) {
@ -266,7 +266,7 @@ KDE_NO_EXPORT Surface *RP::Image::surface () {
KDE_NO_CDTOR_EXPORT RP::TimingsBase::TimingsBase (NodePtr & d, const short i) KDE_NO_CDTOR_EXPORT RP::TimingsBase::TimingsBase (NodePtr & d, const short i)
: Element (d, i), x (0), y (0), w (0), h (0), start (0), duration (0) {} : Element (d, i), x (0), y (0), w (0), h (0), start (0), duration (0) {}
KDE_NO_EXPORT void RP::TimingsBase::activate () { TDE_NO_EXPORT void RP::TimingsBase::activate () {
setState (state_activated); setState (state_activated);
x = y = w = h = 0; x = y = w = h = 0;
srcx = srcy = srcw = srch = 0; srcx = srcy = srcw = srch = 0;
@ -305,13 +305,13 @@ KDE_NO_EXPORT void RP::TimingsBase::activate () {
start_timer = document ()->setTimeout (this, start *100); start_timer = document ()->setTimeout (this, start *100);
} }
KDE_NO_EXPORT void RP::TimingsBase::deactivate () { TDE_NO_EXPORT void RP::TimingsBase::deactivate () {
if (unfinished ()) if (unfinished ())
finish (); finish ();
setState (state_deactivated); setState (state_deactivated);
} }
KDE_NO_EXPORT bool RP::TimingsBase::handleEvent (EventPtr event) { TDE_NO_EXPORT bool RP::TimingsBase::handleEvent (EventPtr event) {
if (event->id () == event_timer) { if (event->id () == event_timer) {
TimerEvent * te = static_cast <TimerEvent *> (event.ptr ()); TimerEvent * te = static_cast <TimerEvent *> (event.ptr ());
if (te->timer_info == update_timer && duration > 0) { if (te->timer_info == update_timer && duration > 0) {
@ -337,7 +337,7 @@ KDE_NO_EXPORT bool RP::TimingsBase::handleEvent (EventPtr event) {
return false; return false;
} }
KDE_NO_EXPORT void RP::TimingsBase::begin () { TDE_NO_EXPORT void RP::TimingsBase::begin () {
progress = 0; progress = 0;
setState (state_began); setState (state_began);
if (target) if (target)
@ -349,14 +349,14 @@ KDE_NO_EXPORT void RP::TimingsBase::begin () {
} }
} }
KDE_NO_EXPORT void RP::TimingsBase::update (int percentage) { TDE_NO_EXPORT void RP::TimingsBase::update (int percentage) {
progress = percentage; progress = percentage;
Node * p = parentNode ().ptr (); Node * p = parentNode ().ptr ();
if (p->id == RP::id_node_imfl) if (p->id == RP::id_node_imfl)
static_cast <RP::Imfl *> (p)->repaint (); static_cast <RP::Imfl *> (p)->repaint ();
} }
KDE_NO_EXPORT void RP::TimingsBase::finish () { TDE_NO_EXPORT void RP::TimingsBase::finish () {
progress = 100; progress = 100;
if (start_timer) { if (start_timer) {
document ()->cancelTimer (start_timer); document ()->cancelTimer (start_timer);
@ -373,11 +373,11 @@ KDE_NO_EXPORT void RP::TimingsBase::finish () {
Element::finish (); Element::finish ();
} }
KDE_NO_EXPORT void RP::Crossfade::activate () { TDE_NO_EXPORT void RP::Crossfade::activate () {
TimingsBase::activate (); TimingsBase::activate ();
} }
KDE_NO_EXPORT void RP::Crossfade::begin () { TDE_NO_EXPORT void RP::Crossfade::begin () {
//kdDebug () << "RP::Crossfade::begin" << endl; //kdDebug () << "RP::Crossfade::begin" << endl;
TimingsBase::begin (); TimingsBase::begin ();
if (target && target->id == id_node_image) { if (target && target->id == id_node_image) {
@ -389,17 +389,17 @@ KDE_NO_EXPORT void RP::Crossfade::begin () {
} }
} }
KDE_NO_EXPORT void RP::Crossfade::accept (Visitor * v) { TDE_NO_EXPORT void RP::Crossfade::accept (Visitor * v) {
v->visit (this); v->visit (this);
} }
KDE_NO_EXPORT void RP::Fadein::activate () { TDE_NO_EXPORT void RP::Fadein::activate () {
// pickup color from Fill that should be declared before this node // pickup color from Fill that should be declared before this node
from_color = 0; from_color = 0;
TimingsBase::activate (); TimingsBase::activate ();
} }
KDE_NO_EXPORT void RP::Fadein::begin () { TDE_NO_EXPORT void RP::Fadein::begin () {
//kdDebug () << "RP::Fadein::begin" << endl; //kdDebug () << "RP::Fadein::begin" << endl;
TimingsBase::begin (); TimingsBase::begin ();
if (target && target->id == id_node_image) { if (target && target->id == id_node_image) {
@ -411,39 +411,39 @@ KDE_NO_EXPORT void RP::Fadein::begin () {
} }
} }
KDE_NO_EXPORT void RP::Fadein::accept (Visitor * v) { TDE_NO_EXPORT void RP::Fadein::accept (Visitor * v) {
v->visit (this); v->visit (this);
} }
KDE_NO_EXPORT void RP::Fadeout::activate () { TDE_NO_EXPORT void RP::Fadeout::activate () {
to_color = TQColor (getAttribute ("color")).rgb (); to_color = TQColor (getAttribute ("color")).rgb ();
TimingsBase::activate (); TimingsBase::activate ();
} }
KDE_NO_EXPORT void RP::Fadeout::begin () { TDE_NO_EXPORT void RP::Fadeout::begin () {
//kdDebug () << "RP::Fadeout::begin" << endl; //kdDebug () << "RP::Fadeout::begin" << endl;
TimingsBase::begin (); TimingsBase::begin ();
} }
KDE_NO_EXPORT void RP::Fadeout::accept (Visitor * v) { TDE_NO_EXPORT void RP::Fadeout::accept (Visitor * v) {
v->visit (this); v->visit (this);
} }
KDE_NO_EXPORT void RP::Fill::activate () { TDE_NO_EXPORT void RP::Fill::activate () {
color = TQColor (getAttribute ("color")).rgb (); color = TQColor (getAttribute ("color")).rgb ();
TimingsBase::activate (); TimingsBase::activate ();
} }
KDE_NO_EXPORT void RP::Fill::begin () { TDE_NO_EXPORT void RP::Fill::begin () {
setState (state_began); setState (state_began);
update (0); update (0);
} }
KDE_NO_EXPORT void RP::Fill::accept (Visitor * v) { TDE_NO_EXPORT void RP::Fill::accept (Visitor * v) {
v->visit (this); v->visit (this);
} }
KDE_NO_EXPORT void RP::Wipe::activate () { TDE_NO_EXPORT void RP::Wipe::activate () {
//TODO implement 'type="push"' //TODO implement 'type="push"'
TQString dir = getAttribute ("direction").lower (); TQString dir = getAttribute ("direction").lower ();
direction = dir_right; direction = dir_right;
@ -456,7 +456,7 @@ KDE_NO_EXPORT void RP::Wipe::activate () {
TimingsBase::activate (); TimingsBase::activate ();
} }
KDE_NO_EXPORT void RP::Wipe::begin () { TDE_NO_EXPORT void RP::Wipe::begin () {
//kdDebug () << "RP::Wipe::begin" << endl; //kdDebug () << "RP::Wipe::begin" << endl;
TimingsBase::begin (); TimingsBase::begin ();
if (target && target->id == id_node_image) { if (target && target->id == id_node_image) {
@ -468,15 +468,15 @@ KDE_NO_EXPORT void RP::Wipe::begin () {
} }
} }
KDE_NO_EXPORT void RP::Wipe::accept (Visitor * v) { TDE_NO_EXPORT void RP::Wipe::accept (Visitor * v) {
v->visit (this); v->visit (this);
} }
KDE_NO_EXPORT void RP::ViewChange::activate () { TDE_NO_EXPORT void RP::ViewChange::activate () {
TimingsBase::activate (); TimingsBase::activate ();
} }
KDE_NO_EXPORT void RP::ViewChange::begin () { TDE_NO_EXPORT void RP::ViewChange::begin () {
kdDebug () << "RP::ViewChange::begin" << endl; kdDebug () << "RP::ViewChange::begin" << endl;
setState (state_began); setState (state_began);
Node * p = parentNode ().ptr (); Node * p = parentNode ().ptr ();
@ -485,13 +485,13 @@ KDE_NO_EXPORT void RP::ViewChange::begin () {
update (0); update (0);
} }
KDE_NO_EXPORT void RP::ViewChange::finish () { TDE_NO_EXPORT void RP::ViewChange::finish () {
Node * p = parentNode ().ptr (); Node * p = parentNode ().ptr ();
if (p && p->id == RP::id_node_imfl) if (p && p->id == RP::id_node_imfl)
static_cast <RP::Imfl *> (p)->needs_scene_img--; static_cast <RP::Imfl *> (p)->needs_scene_img--;
TimingsBase::finish (); TimingsBase::finish ();
} }
KDE_NO_EXPORT void RP::ViewChange::accept (Visitor * v) { TDE_NO_EXPORT void RP::ViewChange::accept (Visitor * v) {
v->visit (this); v->visit (this);
} }

22
src/kmplayer_rp.h
Unescape View File

@ -53,7 +53,7 @@ class KMPLAYER_NO_EXPORT Imfl : public Mrl {
public: public:
Imfl (NodePtr & d); Imfl (NodePtr & d);
~Imfl (); ~Imfl ();
KDE_NO_EXPORT virtual const char * nodeName () const { return "imfl"; } TDE_NO_EXPORT virtual const char * nodeName () const { return "imfl"; }
virtual NodePtr childFromTag (const TQString & tag); virtual NodePtr childFromTag (const TQString & tag);
virtual void closed (); virtual void closed ();
virtual void defer (); // start loading the images if not yet done virtual void defer (); // start loading the images if not yet done
@ -61,8 +61,8 @@ public:
virtual void finish (); // end the timings virtual void finish (); // end the timings
virtual void deactivate (); // stop handling paint events virtual void deactivate (); // stop handling paint events
virtual void childDone (NodePtr child); // for if no duration_timer set virtual void childDone (NodePtr child); // for if no duration_timer set
KDE_NO_EXPORT virtual bool expose () const { return false; } TDE_NO_EXPORT virtual bool expose () const { return false; }
KDE_NO_EXPORT virtual PlayType playType () const { return play_type_image; } TDE_NO_EXPORT virtual PlayType playType () const { return play_type_image; }
virtual bool handleEvent (EventPtr event); virtual bool handleEvent (EventPtr event);
virtual void accept (Visitor *); virtual void accept (Visitor *);
Surface *surface (); Surface *surface ();
@ -83,7 +83,7 @@ public:
virtual void finish (); // ?duration_timer has expired? virtual void finish (); // ?duration_timer has expired?
virtual void deactivate (); // disabled virtual void deactivate (); // disabled
virtual bool handleEvent (EventPtr event); virtual bool handleEvent (EventPtr event);
KDE_NO_EXPORT virtual bool expose () const { return false; } TDE_NO_EXPORT virtual bool expose () const { return false; }
int progress; int progress;
Single x, y, w, h; Single x, y, w, h;
Single srcx, srcy, srcw, srch; Single srcx, srcy, srcw, srch;
@ -103,7 +103,7 @@ public:
KDE_NO_CDTOR_EXPORT Crossfade (NodePtr & d) KDE_NO_CDTOR_EXPORT Crossfade (NodePtr & d)
: TimingsBase (d, id_node_crossfade) {} : TimingsBase (d, id_node_crossfade) {}
KDE_NO_CDTOR_EXPORT ~Crossfade () {} KDE_NO_CDTOR_EXPORT ~Crossfade () {}
KDE_NO_EXPORT virtual const char * nodeName () const { return "crossfade"; } TDE_NO_EXPORT virtual const char * nodeName () const { return "crossfade"; }
virtual void activate (); virtual void activate ();
virtual void begin (); virtual void begin ();
virtual void accept (Visitor *); virtual void accept (Visitor *);
@ -113,7 +113,7 @@ class KMPLAYER_NO_EXPORT Fadein : public TimingsBase {
public: public:
KDE_NO_CDTOR_EXPORT Fadein (NodePtr & d) : TimingsBase(d, id_node_fadein) {} KDE_NO_CDTOR_EXPORT Fadein (NodePtr & d) : TimingsBase(d, id_node_fadein) {}
KDE_NO_CDTOR_EXPORT ~Fadein () {} KDE_NO_CDTOR_EXPORT ~Fadein () {}
KDE_NO_EXPORT virtual const char * nodeName () const { return "fadein"; } TDE_NO_EXPORT virtual const char * nodeName () const { return "fadein"; }
virtual void activate (); virtual void activate ();
virtual void begin (); virtual void begin ();
virtual void accept (Visitor *); virtual void accept (Visitor *);
@ -124,7 +124,7 @@ class KMPLAYER_NO_EXPORT Fadeout : public TimingsBase {
public: public:
KDE_NO_CDTOR_EXPORT Fadeout(NodePtr &d) : TimingsBase(d, id_node_fadeout) {} KDE_NO_CDTOR_EXPORT Fadeout(NodePtr &d) : TimingsBase(d, id_node_fadeout) {}
KDE_NO_CDTOR_EXPORT ~Fadeout () {} KDE_NO_CDTOR_EXPORT ~Fadeout () {}
KDE_NO_EXPORT virtual const char * nodeName () const { return "fadeout"; } TDE_NO_EXPORT virtual const char * nodeName () const { return "fadeout"; }
virtual void activate (); virtual void activate ();
virtual void begin (); virtual void begin ();
virtual void accept (Visitor *); virtual void accept (Visitor *);
@ -135,7 +135,7 @@ class KMPLAYER_NO_EXPORT Fill : public TimingsBase {
public: public:
KDE_NO_CDTOR_EXPORT Fill (NodePtr & d) : TimingsBase (d, id_node_fill) {} KDE_NO_CDTOR_EXPORT Fill (NodePtr & d) : TimingsBase (d, id_node_fill) {}
KDE_NO_CDTOR_EXPORT ~Fill () {} KDE_NO_CDTOR_EXPORT ~Fill () {}
KDE_NO_EXPORT virtual const char * nodeName () const { return "fill"; } TDE_NO_EXPORT virtual const char * nodeName () const { return "fill"; }
virtual void activate (); virtual void activate ();
virtual void begin (); virtual void begin ();
unsigned int fillColor () const { return color; } unsigned int fillColor () const { return color; }
@ -147,7 +147,7 @@ class KMPLAYER_NO_EXPORT Wipe : public TimingsBase {
public: public:
KDE_NO_CDTOR_EXPORT Wipe (NodePtr & d) : TimingsBase (d, id_node_wipe) {} KDE_NO_CDTOR_EXPORT Wipe (NodePtr & d) : TimingsBase (d, id_node_wipe) {}
KDE_NO_CDTOR_EXPORT ~Wipe () {} KDE_NO_CDTOR_EXPORT ~Wipe () {}
KDE_NO_EXPORT virtual const char * nodeName () const { return "wipe"; } TDE_NO_EXPORT virtual const char * nodeName () const { return "wipe"; }
virtual void activate (); virtual void activate ();
virtual void begin (); virtual void begin ();
virtual void accept (Visitor *); virtual void accept (Visitor *);
@ -159,7 +159,7 @@ public:
KDE_NO_CDTOR_EXPORT ViewChange (NodePtr & d) KDE_NO_CDTOR_EXPORT ViewChange (NodePtr & d)
: TimingsBase (d, id_node_viewchange) {} : TimingsBase (d, id_node_viewchange) {}
KDE_NO_CDTOR_EXPORT ~ViewChange () {} KDE_NO_CDTOR_EXPORT ~ViewChange () {}
KDE_NO_EXPORT virtual const char * nodeName() const { return "viewchange"; } TDE_NO_EXPORT virtual const char * nodeName() const { return "viewchange"; }
virtual void activate (); virtual void activate ();
virtual void begin (); virtual void begin ();
virtual void finish (); virtual void finish ();
@ -171,7 +171,7 @@ class KMPLAYER_NO_EXPORT Image : public RemoteObject, public Mrl {
public: public:
Image (NodePtr & d); Image (NodePtr & d);
~Image (); ~Image ();
KDE_NO_EXPORT virtual const char * nodeName () const { return "image"; } TDE_NO_EXPORT virtual const char * nodeName () const { return "image"; }
virtual void activate (); virtual void activate ();
virtual void begin (); virtual void begin ();
virtual void deactivate (); virtual void deactivate ();

22
src/kmplayer_rss.cpp
Unescape View File

@ -22,13 +22,13 @@
using namespace KMPlayer; using namespace KMPlayer;
KDE_NO_EXPORT NodePtr RSS::Rss::childFromTag (const TQString & tag) { TDE_NO_EXPORT NodePtr RSS::Rss::childFromTag (const TQString & tag) {
if (!strcmp (tag.latin1 (), "channel")) if (!strcmp (tag.latin1 (), "channel"))
return new RSS::Channel (m_doc); return new RSS::Channel (m_doc);
return 0L; return 0L;
} }
KDE_NO_EXPORT NodePtr RSS::Channel::childFromTag (const TQString & tag) { TDE_NO_EXPORT NodePtr RSS::Channel::childFromTag (const TQString & tag) {
const char *ctag = tag.ascii (); const char *ctag = tag.ascii ();
if (!strcmp (ctag, "item")) if (!strcmp (ctag, "item"))
return new RSS::Item (m_doc); return new RSS::Item (m_doc);
@ -37,7 +37,7 @@ KDE_NO_EXPORT NodePtr RSS::Channel::childFromTag (const TQString & tag) {
return 0L; return 0L;
} }
KDE_NO_EXPORT void RSS::Channel::closed () { TDE_NO_EXPORT void RSS::Channel::closed () {
for (NodePtr c = firstChild (); c; c = c->nextSibling ()) for (NodePtr c = firstChild (); c; c = c->nextSibling ())
if (c->id == id_node_title) { if (c->id == id_node_title) {
pretty_name = c->innerText ().simplifyWhiteSpace (); pretty_name = c->innerText ().simplifyWhiteSpace ();
@ -45,12 +45,12 @@ KDE_NO_EXPORT void RSS::Channel::closed () {
} }
} }
KDE_NO_EXPORT bool RSS::Channel::expose () const { TDE_NO_EXPORT bool RSS::Channel::expose () const {
return !pretty_name.isEmpty () || //return false if no title and only one return !pretty_name.isEmpty () || //return false if no title and only one
previousSibling () || nextSibling (); previousSibling () || nextSibling ();
} }
KDE_NO_EXPORT NodePtr RSS::Item::childFromTag (const TQString & tag) { TDE_NO_EXPORT NodePtr RSS::Item::childFromTag (const TQString & tag) {
const char *ctag = tag.ascii (); const char *ctag = tag.ascii ();
if (!strcmp (ctag, "enclosure")) if (!strcmp (ctag, "enclosure"))
return new RSS::Enclosure (m_doc); return new RSS::Enclosure (m_doc);
@ -61,7 +61,7 @@ KDE_NO_EXPORT NodePtr RSS::Item::childFromTag (const TQString & tag) {
return 0L; return 0L;
} }
KDE_NO_EXPORT void RSS::Item::closed () { TDE_NO_EXPORT void RSS::Item::closed () {
cached_play_type = play_type_none; cached_play_type = play_type_none;
for (NodePtr c = firstChild (); c; c = c->nextSibling ()) { for (NodePtr c = firstChild (); c; c = c->nextSibling ()) {
switch (c->id) { switch (c->id) {
@ -81,13 +81,13 @@ KDE_NO_EXPORT void RSS::Item::closed () {
cached_play_type = play_type_audio; cached_play_type = play_type_audio;
} }
KDE_NO_EXPORT Mrl * RSS::Item::linkNode () { TDE_NO_EXPORT Mrl * RSS::Item::linkNode () {
if (enclosure) if (enclosure)
return enclosure->mrl (); return enclosure->mrl ();
return Mrl::linkNode (); return Mrl::linkNode ();
} }
KDE_NO_EXPORT void RSS::Item::activate () { TDE_NO_EXPORT void RSS::Item::activate () {
PlayListNotify * n = document()->notify_listener; PlayListNotify * n = document()->notify_listener;
if (n) { if (n) {
for (NodePtr c = firstChild (); c; c = c->nextSibling ()) for (NodePtr c = firstChild (); c; c = c->nextSibling ())
@ -106,7 +106,7 @@ KDE_NO_EXPORT void RSS::Item::activate () {
Mrl::activate (); Mrl::activate ();
} }
KDE_NO_EXPORT void RSS::Item::deactivate () { TDE_NO_EXPORT void RSS::Item::deactivate () {
if (timer) { if (timer) {
document ()->cancelTimer (timer); document ()->cancelTimer (timer);
timer = 0L; timer = 0L;
@ -117,7 +117,7 @@ KDE_NO_EXPORT void RSS::Item::deactivate () {
Mrl::deactivate (); Mrl::deactivate ();
} }
KDE_NO_EXPORT bool RSS::Item::handleEvent (EventPtr event) { TDE_NO_EXPORT bool RSS::Item::handleEvent (EventPtr event) {
if (event->id () == event_timer) { if (event->id () == event_timer) {
timer = 0L; timer = 0L;
finish (); finish ();
@ -125,6 +125,6 @@ KDE_NO_EXPORT bool RSS::Item::handleEvent (EventPtr event) {
return true; return true;
} }
KDE_NO_EXPORT void RSS::Enclosure::closed () { TDE_NO_EXPORT void RSS::Enclosure::closed () {
src = getAttribute (StringPool::attr_url); src = getAttribute (StringPool::attr_url);
} }

8
src/kmplayer_rss.h
Unescape View File

@ -43,7 +43,7 @@ class KMPLAYER_NO_EXPORT Rss : public Mrl {
public: public:
KDE_NO_CDTOR_EXPORT Rss (NodePtr & d) : Mrl (d, id_node_rss) {} KDE_NO_CDTOR_EXPORT Rss (NodePtr & d) : Mrl (d, id_node_rss) {}
NodePtr childFromTag (const TQString & tag); NodePtr childFromTag (const TQString & tag);
KDE_NO_EXPORT const char * nodeName () const { return "rss"; } TDE_NO_EXPORT const char * nodeName () const { return "rss"; }
bool expose () const { return false; } bool expose () const { return false; }
}; };
@ -51,7 +51,7 @@ class KMPLAYER_NO_EXPORT Channel : public Mrl {
public: public:
KDE_NO_CDTOR_EXPORT Channel (NodePtr & d) : Mrl (d, id_node_channel) {} KDE_NO_CDTOR_EXPORT Channel (NodePtr & d) : Mrl (d, id_node_channel) {}
NodePtr childFromTag (const TQString & tag); NodePtr childFromTag (const TQString & tag);
KDE_NO_EXPORT const char * nodeName () const { return "channel"; } TDE_NO_EXPORT const char * nodeName () const { return "channel"; }
PlayType playType () { return play_type_none; } PlayType playType () { return play_type_none; }
void closed (); void closed ();
bool expose () const; bool expose () const;
@ -61,7 +61,7 @@ class KMPLAYER_NO_EXPORT Item : public Mrl {
public: public:
KDE_NO_CDTOR_EXPORT Item (NodePtr & d) : Mrl (d, id_node_item) {} KDE_NO_CDTOR_EXPORT Item (NodePtr & d) : Mrl (d, id_node_item) {}
NodePtr childFromTag (const TQString & tag); NodePtr childFromTag (const TQString & tag);
KDE_NO_EXPORT const char * nodeName () const { return "item"; } TDE_NO_EXPORT const char * nodeName () const { return "item"; }
PlayType playType () { return cached_play_type; } PlayType playType () { return cached_play_type; }
Mrl * linkNode (); Mrl * linkNode ();
void closed (); void closed ();
@ -75,7 +75,7 @@ public:
class KMPLAYER_NO_EXPORT Enclosure : public Mrl { class KMPLAYER_NO_EXPORT Enclosure : public Mrl {
public: public:
KDE_NO_CDTOR_EXPORT Enclosure(NodePtr &d) : Mrl(d, id_node_enclosure) {} KDE_NO_CDTOR_EXPORT Enclosure(NodePtr &d) : Mrl(d, id_node_enclosure) {}
KDE_NO_EXPORT const char * nodeName () const { return "enclosure"; } TDE_NO_EXPORT const char * nodeName () const { return "enclosure"; }
void closed (); void closed ();
bool expose () const { return false; } bool expose () const { return false; }
}; };

356
src/kmplayer_smil.cpp
View File

File diff suppressed because it is too large Load Diff

62
src/kmplayer_smil.h
Unescape View File

@ -152,9 +152,9 @@ public:
} durations [(const int) durtime_last]; } durations [(const int) durtime_last];
virtual void started (); virtual void started ();
virtual void stopped (); virtual void stopped ();
KDE_NO_EXPORT DurationItem & beginTime () { return durations[begin_time]; } TDE_NO_EXPORT DurationItem & beginTime () { return durations[begin_time]; }
KDE_NO_EXPORT DurationItem & durTime () { return durations[duration_time]; } TDE_NO_EXPORT DurationItem & durTime () { return durations[duration_time]; }
KDE_NO_EXPORT DurationItem & endTime () { return durations [end_time]; } TDE_NO_EXPORT DurationItem & endTime () { return durations [end_time]; }
private: private:
void setDurationItem (DurationTime item, const TQString & val); void setDurationItem (DurationTime item, const TQString & val);
public: public:
@ -394,7 +394,7 @@ class Smil : public Mrl {
public: public:
KDE_NO_CDTOR_EXPORT Smil (NodePtr & d) : Mrl (d, id_node_smil) {} KDE_NO_CDTOR_EXPORT Smil (NodePtr & d) : Mrl (d, id_node_smil) {}
NodePtr childFromTag (const TQString & tag); NodePtr childFromTag (const TQString & tag);
KDE_NO_EXPORT const char * nodeName () const { return "smil"; } TDE_NO_EXPORT const char * nodeName () const { return "smil"; }
PlayType playType () { return play_type_video; } PlayType playType () { return play_type_video; }
void activate (); void activate ();
void deactivate (); void deactivate ();
@ -422,7 +422,7 @@ class KMPLAYER_NO_EXPORT Head : public Element {
public: public:
KDE_NO_CDTOR_EXPORT Head (NodePtr & d) : Element (d, id_node_head) {} KDE_NO_CDTOR_EXPORT Head (NodePtr & d) : Element (d, id_node_head) {}
NodePtr childFromTag (const TQString & tag); NodePtr childFromTag (const TQString & tag);
KDE_NO_EXPORT const char * nodeName () const { return "head"; } TDE_NO_EXPORT const char * nodeName () const { return "head"; }
void closed (); void closed ();
void childDone (NodePtr child); void childDone (NodePtr child);
bool expose () const; bool expose () const;
@ -477,7 +477,7 @@ class KMPLAYER_NO_EXPORT Layout : public RegionBase {
public: public:
Layout (NodePtr & d); Layout (NodePtr & d);
NodePtr childFromTag (const TQString & tag); NodePtr childFromTag (const TQString & tag);
KDE_NO_EXPORT const char * nodeName () const { return "layout"; } TDE_NO_EXPORT const char * nodeName () const { return "layout"; }
void activate (); void activate ();
void closed (); void closed ();
virtual void accept (Visitor *); virtual void accept (Visitor *);
@ -496,7 +496,7 @@ public:
class KMPLAYER_NO_EXPORT Region : public RegionBase { class KMPLAYER_NO_EXPORT Region : public RegionBase {
public: public:
Region (NodePtr & d); Region (NodePtr & d);
KDE_NO_EXPORT const char * nodeName () const { return "region"; } TDE_NO_EXPORT const char * nodeName () const { return "region"; }
NodePtr childFromTag (const TQString & tag); NodePtr childFromTag (const TQString & tag);
void calculateBounds (Single w, Single h); void calculateBounds (Single w, Single h);
virtual NodeRefListPtr listeners (unsigned int event_id); virtual NodeRefListPtr listeners (unsigned int event_id);
@ -517,7 +517,7 @@ class KMPLAYER_NO_EXPORT RootLayout : public RegionBase {
public: public:
KDE_NO_CDTOR_EXPORT RootLayout (NodePtr & d) KDE_NO_CDTOR_EXPORT RootLayout (NodePtr & d)
: RegionBase (d, id_node_root_layout) {} : RegionBase (d, id_node_root_layout) {}
KDE_NO_EXPORT const char * nodeName () const { return "root-layout"; } TDE_NO_EXPORT const char * nodeName () const { return "root-layout"; }
}; };
/** /**
@ -527,8 +527,8 @@ class KMPLAYER_NO_EXPORT RegPoint : public Element {
public: public:
KDE_NO_CDTOR_EXPORT RegPoint (NodePtr & d) : Element(d, id_node_regpoint) {} KDE_NO_CDTOR_EXPORT RegPoint (NodePtr & d) : Element(d, id_node_regpoint) {}
KDE_NO_CDTOR_EXPORT ~RegPoint () {} KDE_NO_CDTOR_EXPORT ~RegPoint () {}
KDE_NO_EXPORT const char * nodeName () const { return "regPoint"; } TDE_NO_EXPORT const char * nodeName () const { return "regPoint"; }
KDE_NO_EXPORT bool expose () const { return false; } TDE_NO_EXPORT bool expose () const { return false; }
void parseParam (const TrieString & name, const TQString & value); void parseParam (const TrieString & name, const TQString & value);
CalculatedSizer sizes; CalculatedSizer sizes;
}; };
@ -569,10 +569,10 @@ public:
Transition (NodePtr & d); Transition (NodePtr & d);
KDE_NO_CDTOR_EXPORT ~Transition () {} KDE_NO_CDTOR_EXPORT ~Transition () {}
void activate (); void activate ();
KDE_NO_EXPORT void accept (Visitor * v) { v->visit (this); } TDE_NO_EXPORT void accept (Visitor * v) { v->visit (this); }
KDE_NO_EXPORT const char * nodeName () const { return "transition"; } TDE_NO_EXPORT const char * nodeName () const { return "transition"; }
void parseParam (const TrieString & name, const TQString & value); void parseParam (const TrieString & name, const TQString & value);
KDE_NO_EXPORT bool expose () const { return false; } TDE_NO_EXPORT bool expose () const { return false; }
bool supported (); bool supported ();
TransType type; TransType type;
TransSubType sub_type; TransSubType sub_type;
@ -604,7 +604,7 @@ public:
void childDone (NodePtr child); void childDone (NodePtr child);
virtual bool handleEvent (EventPtr event); virtual bool handleEvent (EventPtr event);
virtual NodeRefListPtr listeners (unsigned int event_id); virtual NodeRefListPtr listeners (unsigned int event_id);
KDE_NO_EXPORT void accept (Visitor * v) { v->visit (this); } TDE_NO_EXPORT void accept (Visitor * v) { v->visit (this); }
void init (); void init ();
virtual void parseParam (const TrieString &, const TQString &); virtual void parseParam (const TrieString &, const TQString &);
Runtime * runtime (); Runtime * runtime ();
@ -627,13 +627,13 @@ protected:
Runtime * m_runtime; Runtime * m_runtime;
}; };
KDE_NO_EXPORT inline Runtime * TimedMrl::runtime () { TDE_NO_EXPORT inline Runtime * TimedMrl::runtime () {
if (!m_runtime) if (!m_runtime)
m_runtime = getNewRuntime (); m_runtime = getNewRuntime ();
return m_runtime; return m_runtime;
} }
KDE_NO_EXPORT inline bool TimedMrl::isTimedMrl (const Node *n) { TDE_NO_EXPORT inline bool TimedMrl::isTimedMrl (const Node *n) {
return n && return n &&
n->id >= id_node_first_timed_mrl && n->id >= id_node_first_timed_mrl &&
n->id <= id_node_last_timed_mrl; n->id <= id_node_last_timed_mrl;
@ -661,7 +661,7 @@ protected:
class KMPLAYER_NO_EXPORT Par : public GroupBase { class KMPLAYER_NO_EXPORT Par : public GroupBase {
public: public:
KDE_NO_CDTOR_EXPORT Par (NodePtr & d) : GroupBase (d, id_node_par) {} KDE_NO_CDTOR_EXPORT Par (NodePtr & d) : GroupBase (d, id_node_par) {}
KDE_NO_EXPORT const char * nodeName () const { return "par"; } TDE_NO_EXPORT const char * nodeName () const { return "par"; }
void begin (); void begin ();
void reset (); void reset ();
void childDone (NodePtr child); void childDone (NodePtr child);
@ -673,7 +673,7 @@ public:
class KMPLAYER_NO_EXPORT Seq : public GroupBase { class KMPLAYER_NO_EXPORT Seq : public GroupBase {
public: public:
KDE_NO_CDTOR_EXPORT Seq (NodePtr & d) : GroupBase(d, id_node_seq) {} KDE_NO_CDTOR_EXPORT Seq (NodePtr & d) : GroupBase(d, id_node_seq) {}
KDE_NO_EXPORT const char * nodeName () const { return "seq"; } TDE_NO_EXPORT const char * nodeName () const { return "seq"; }
void begin (); void begin ();
void childDone (NodePtr child); void childDone (NodePtr child);
protected: protected:
@ -687,7 +687,7 @@ protected:
class KMPLAYER_NO_EXPORT Body : public Seq { class KMPLAYER_NO_EXPORT Body : public Seq {
public: public:
KDE_NO_CDTOR_EXPORT Body (NodePtr & d) : Seq (d, id_node_body) {} KDE_NO_CDTOR_EXPORT Body (NodePtr & d) : Seq (d, id_node_body) {}
KDE_NO_EXPORT const char * nodeName () const { return "body"; } TDE_NO_EXPORT const char * nodeName () const { return "body"; }
}; };
/** /**
@ -696,7 +696,7 @@ public:
class KMPLAYER_NO_EXPORT Excl : public GroupBase { class KMPLAYER_NO_EXPORT Excl : public GroupBase {
public: public:
KDE_NO_CDTOR_EXPORT Excl (NodePtr & d) : GroupBase (d, id_node_excl) {} KDE_NO_CDTOR_EXPORT Excl (NodePtr & d) : GroupBase (d, id_node_excl) {}
KDE_NO_EXPORT const char * nodeName () const { return "excl"; } TDE_NO_EXPORT const char * nodeName () const { return "excl"; }
void begin (); void begin ();
void deactivate (); void deactivate ();
void childDone (NodePtr child); void childDone (NodePtr child);
@ -712,7 +712,7 @@ private:
class KMPLAYER_NO_EXPORT Switch : public GroupBase { class KMPLAYER_NO_EXPORT Switch : public GroupBase {
public: public:
KDE_NO_CDTOR_EXPORT Switch (NodePtr &d) : GroupBase (d, id_node_switch) {} KDE_NO_CDTOR_EXPORT Switch (NodePtr &d) : GroupBase (d, id_node_switch) {}
KDE_NO_EXPORT const char * nodeName () const { return "switch"; } TDE_NO_EXPORT const char * nodeName () const { return "switch"; }
// Condition // Condition
void begin (); void begin ();
void deactivate (); void deactivate ();
@ -725,7 +725,7 @@ class KMPLAYER_NO_EXPORT LinkingBase : public Element {
public: public:
KDE_NO_CDTOR_EXPORT ~LinkingBase () {} KDE_NO_CDTOR_EXPORT ~LinkingBase () {}
void deactivate (); void deactivate ();
KDE_NO_EXPORT bool expose () const { return false; } TDE_NO_EXPORT bool expose () const { return false; }
void parseParam (const TrieString & name, const TQString & value); void parseParam (const TrieString & name, const TQString & value);
ConnectionPtr mediatype_activated; ConnectionPtr mediatype_activated;
ConnectionPtr mediatype_attach; ConnectionPtr mediatype_attach;
@ -741,9 +741,9 @@ public:
KDE_NO_CDTOR_EXPORT ~Anchor () {} KDE_NO_CDTOR_EXPORT ~Anchor () {}
void activate (); void activate ();
void childDone (NodePtr child); void childDone (NodePtr child);
KDE_NO_EXPORT const char * nodeName () const { return "a"; } TDE_NO_EXPORT const char * nodeName () const { return "a"; }
NodePtr childFromTag (const TQString & tag); NodePtr childFromTag (const TQString & tag);
KDE_NO_EXPORT void accept (Visitor * v) { v->visit (this); } TDE_NO_EXPORT void accept (Visitor * v) { v->visit (this); }
}; };
class KMPLAYER_NO_EXPORT Area : public LinkingBase { class KMPLAYER_NO_EXPORT Area : public LinkingBase {
@ -751,8 +751,8 @@ public:
Area (NodePtr & d, const TQString & tag); Area (NodePtr & d, const TQString & tag);
~Area (); ~Area ();
void activate (); void activate ();
KDE_NO_EXPORT const char * nodeName () const { return tag.ascii (); } TDE_NO_EXPORT const char * nodeName () const { return tag.ascii (); }
KDE_NO_EXPORT void accept (Visitor * v) { v->visit (this); } TDE_NO_EXPORT void accept (Visitor * v) { v->visit (this); }
void parseParam (const TrieString & name, const TQString & value); void parseParam (const TrieString & name, const TQString & value);
NodeRefListPtr listeners (unsigned int event_id); NodeRefListPtr listeners (unsigned int event_id);
SizeType * coords; SizeType * coords;
@ -768,7 +768,7 @@ class KMPLAYER_NO_EXPORT MediaType : public TimedMrl {
public: public:
MediaType (NodePtr & d, const TQString & t, short id); MediaType (NodePtr & d, const TQString & t, short id);
NodePtr childFromTag (const TQString & tag); NodePtr childFromTag (const TQString & tag);
KDE_NO_EXPORT const char * nodeName () const { return m_type.latin1 (); } TDE_NO_EXPORT const char * nodeName () const { return m_type.latin1 (); }
void closed (); void closed ();
void activate (); void activate ();
void deactivate (); void deactivate ();
@ -858,7 +858,7 @@ public:
class KMPLAYER_NO_EXPORT Set : public TimedMrl { class KMPLAYER_NO_EXPORT Set : public TimedMrl {
public: public:
KDE_NO_CDTOR_EXPORT Set (NodePtr & d) : TimedMrl (d, id_node_set) {} KDE_NO_CDTOR_EXPORT Set (NodePtr & d) : TimedMrl (d, id_node_set) {}
KDE_NO_EXPORT const char * nodeName () const { return "set"; } TDE_NO_EXPORT const char * nodeName () const { return "set"; }
virtual Runtime * getNewRuntime (); virtual Runtime * getNewRuntime ();
PlayType playType () { return play_type_none; } PlayType playType () { return play_type_none; }
}; };
@ -866,7 +866,7 @@ public:
class KMPLAYER_NO_EXPORT Animate : public TimedMrl { class KMPLAYER_NO_EXPORT Animate : public TimedMrl {
public: public:
KDE_NO_CDTOR_EXPORT Animate (NodePtr & d) : TimedMrl (d, id_node_animate) {} KDE_NO_CDTOR_EXPORT Animate (NodePtr & d) : TimedMrl (d, id_node_animate) {}
KDE_NO_EXPORT const char * nodeName () const { return "animate"; } TDE_NO_EXPORT const char * nodeName () const { return "animate"; }
virtual Runtime * getNewRuntime (); virtual Runtime * getNewRuntime ();
PlayType playType () { return play_type_none; } PlayType playType () { return play_type_none; }
bool handleEvent (EventPtr event); bool handleEvent (EventPtr event);
@ -876,7 +876,7 @@ class KMPLAYER_NO_EXPORT AnimateMotion : public TimedMrl {
public: public:
KDE_NO_CDTOR_EXPORT AnimateMotion (NodePtr & d) KDE_NO_CDTOR_EXPORT AnimateMotion (NodePtr & d)
: TimedMrl (d, id_node_animate) {} : TimedMrl (d, id_node_animate) {}
KDE_NO_EXPORT const char * nodeName () const { return "animateMotion"; } TDE_NO_EXPORT const char * nodeName () const { return "animateMotion"; }
virtual Runtime *getNewRuntime (); virtual Runtime *getNewRuntime ();
PlayType playType () { return play_type_none; } PlayType playType () { return play_type_none; }
bool handleEvent (EventPtr event); bool handleEvent (EventPtr event);
@ -887,7 +887,7 @@ public:
class KMPLAYER_NO_EXPORT Param : public Element { class KMPLAYER_NO_EXPORT Param : public Element {
public: public:
KDE_NO_CDTOR_EXPORT Param (NodePtr & d) : Element (d, id_node_param) {} KDE_NO_CDTOR_EXPORT Param (NodePtr & d) : Element (d, id_node_param) {}
KDE_NO_EXPORT const char * nodeName () const { return "param"; } TDE_NO_EXPORT const char * nodeName () const { return "param"; }
void activate (); void activate ();
bool expose () const { return false; } bool expose () const { return false; }
}; };

16
src/kmplayer_xspf.cpp
Unescape View File

@ -25,7 +25,7 @@
using namespace KMPlayer; using namespace KMPlayer;
KDE_NO_EXPORT NodePtr XSPF::Playlist::childFromTag (const TQString & tag) { TDE_NO_EXPORT NodePtr XSPF::Playlist::childFromTag (const TQString & tag) {
const char * name = tag.latin1 (); const char * name = tag.latin1 ();
if (!strcasecmp (name, "tracklist")) if (!strcasecmp (name, "tracklist"))
return new Tracklist (m_doc); return new Tracklist (m_doc);
@ -58,7 +58,7 @@ KDE_NO_EXPORT NodePtr XSPF::Playlist::childFromTag (const TQString & tag) {
return 0L; return 0L;
} }
KDE_NO_EXPORT void XSPF::Playlist::closed () { TDE_NO_EXPORT void XSPF::Playlist::closed () {
for (NodePtr e = firstChild (); e; e = e->nextSibling ()) { for (NodePtr e = firstChild (); e; e = e->nextSibling ()) {
if (e->id == id_node_title) if (e->id == id_node_title)
pretty_name = e->innerText ().simplifyWhiteSpace (); pretty_name = e->innerText ().simplifyWhiteSpace ();
@ -69,7 +69,7 @@ KDE_NO_EXPORT void XSPF::Playlist::closed () {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
KDE_NO_EXPORT NodePtr XSPF::Tracklist::childFromTag (const TQString & tag) { TDE_NO_EXPORT NodePtr XSPF::Tracklist::childFromTag (const TQString & tag) {
const char * name = tag.latin1 (); const char * name = tag.latin1 ();
if (!strcasecmp (name, "track")) if (!strcasecmp (name, "track"))
return new XSPF::Track (m_doc); return new XSPF::Track (m_doc);
@ -78,7 +78,7 @@ KDE_NO_EXPORT NodePtr XSPF::Tracklist::childFromTag (const TQString & tag) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
KDE_NO_EXPORT NodePtr XSPF::Track::childFromTag (const TQString & tag) { TDE_NO_EXPORT NodePtr XSPF::Track::childFromTag (const TQString & tag) {
const char * name = tag.latin1 (); const char * name = tag.latin1 ();
if (!strcasecmp (name, "location")) if (!strcasecmp (name, "location"))
return new Location (m_doc); return new Location (m_doc);
@ -109,7 +109,7 @@ KDE_NO_EXPORT NodePtr XSPF::Track::childFromTag (const TQString & tag) {
return 0L; return 0L;
} }
KDE_NO_EXPORT void XSPF::Track::closed () { TDE_NO_EXPORT void XSPF::Track::closed () {
for (NodePtr e = firstChild (); e; e = e->nextSibling ()) { for (NodePtr e = firstChild (); e; e = e->nextSibling ()) {
switch (e->id) { switch (e->id) {
case id_node_title: case id_node_title:
@ -123,7 +123,7 @@ KDE_NO_EXPORT void XSPF::Track::closed () {
} }
} }
KDE_NO_EXPORT void XSPF::Track::activate () { TDE_NO_EXPORT void XSPF::Track::activate () {
for (NodePtr e = firstChild (); e; e = e->nextSibling ()) for (NodePtr e = firstChild (); e; e = e->nextSibling ())
if (e->id == id_node_annotation) { if (e->id == id_node_annotation) {
PlayListNotify * n = document ()->notify_listener; PlayListNotify * n = document ()->notify_listener;
@ -134,13 +134,13 @@ KDE_NO_EXPORT void XSPF::Track::activate () {
Mrl::activate (); Mrl::activate ();
} }
KDE_NO_EXPORT Node::PlayType XSPF::Track::playType () { TDE_NO_EXPORT Node::PlayType XSPF::Track::playType () {
if (location) if (location)
return location->playType (); return location->playType ();
return Mrl::playType (); return Mrl::playType ();
} }
KDE_NO_EXPORT Mrl * XSPF::Track::linkNode () { TDE_NO_EXPORT Mrl * XSPF::Track::linkNode () {
if (location) if (location)
return location->mrl (); return location->mrl ();
return Mrl::linkNode (); return Mrl::linkNode ();

8
src/kmplayer_xspf.h
Unescape View File

@ -53,7 +53,7 @@ class KMPLAYER_NO_EXPORT Playlist : public Mrl {
public: public:
KDE_NO_CDTOR_EXPORT Playlist (NodePtr & d) : Mrl (d, id_node_playlist) {} KDE_NO_CDTOR_EXPORT Playlist (NodePtr & d) : Mrl (d, id_node_playlist) {}
NodePtr childFromTag (const TQString & tag); NodePtr childFromTag (const TQString & tag);
KDE_NO_EXPORT const char * nodeName () const { return "playlist"; } TDE_NO_EXPORT const char * nodeName () const { return "playlist"; }
bool expose () const { return !pretty_name.isEmpty (); } bool expose () const { return !pretty_name.isEmpty (); }
void closed (); void closed ();
}; };
@ -62,7 +62,7 @@ class KMPLAYER_NO_EXPORT Tracklist : public Element {
public: public:
KDE_NO_CDTOR_EXPORT Tracklist (NodePtr & d) : Element (d, id_node_tracklist) {} KDE_NO_CDTOR_EXPORT Tracklist (NodePtr & d) : Element (d, id_node_tracklist) {}
NodePtr childFromTag (const TQString & tag); NodePtr childFromTag (const TQString & tag);
KDE_NO_EXPORT const char * nodeName () const { return "tracklist"; } TDE_NO_EXPORT const char * nodeName () const { return "tracklist"; }
bool expose () const { return false; } bool expose () const { return false; }
}; };
@ -73,7 +73,7 @@ public:
void activate (); void activate ();
PlayType playType (); PlayType playType ();
Mrl * linkNode (); Mrl * linkNode ();
KDE_NO_EXPORT const char * nodeName () const { return "track"; } TDE_NO_EXPORT const char * nodeName () const { return "track"; }
NodePtr childFromTag (const TQString & tag); NodePtr childFromTag (const TQString & tag);
NodePtrW location; NodePtrW location;
}; };
@ -81,7 +81,7 @@ public:
class KMPLAYER_NO_EXPORT Location : public Mrl { class KMPLAYER_NO_EXPORT Location : public Mrl {
public: public:
KDE_NO_CDTOR_EXPORT Location (NodePtr &d) : Mrl (d, id_node_location) {} KDE_NO_CDTOR_EXPORT Location (NodePtr &d) : Mrl (d, id_node_location) {}
KDE_NO_EXPORT const char * nodeName () const { return "location"; } TDE_NO_EXPORT const char * nodeName () const { return "location"; }
void closed (); void closed ();
bool expose () const { return false; } bool expose () const { return false; }
}; };

324
src/kmplayerapp.cpp
View File

File diff suppressed because it is too large Load Diff

58
src/kmplayerbroadcast.cpp
Unescape View File

@ -70,7 +70,7 @@ KDE_NO_CDTOR_EXPORT FFServerSetting::FFServerSetting (int i, const TQString & n,
width (w > 0 ? TQString::number (w) : TQString ()), width (w > 0 ? TQString::number (w) : TQString ()),
height (h > 0 ? TQString::number (h) : TQString ()) {} height (h > 0 ? TQString::number (h) : TQString ()) {}
KDE_NO_EXPORT FFServerSetting & FFServerSetting::operator = (const FFServerSetting & fs) { TDE_NO_EXPORT FFServerSetting & FFServerSetting::operator = (const FFServerSetting & fs) {
format = fs.format; format = fs.format;
audiocodec = fs.audiocodec; audiocodec = fs.audiocodec;
audiobitrate = fs.audiobitrate; audiobitrate = fs.audiobitrate;
@ -85,7 +85,7 @@ KDE_NO_EXPORT FFServerSetting & FFServerSetting::operator = (const FFServerSetti
return *this; return *this;
} }
KDE_NO_EXPORT FFServerSetting & FFServerSetting::operator = (const TQStringList & sl) { TDE_NO_EXPORT FFServerSetting & FFServerSetting::operator = (const TQStringList & sl) {
if (sl.count () < 11) { if (sl.count () < 11) {
return *this; return *this;
} }
@ -108,7 +108,7 @@ KDE_NO_EXPORT FFServerSetting & FFServerSetting::operator = (const TQStringList
return *this; return *this;
} }
KDE_NO_EXPORT TQString & FFServerSetting::ffconfig (TQString & buf) { TDE_NO_EXPORT TQString & FFServerSetting::ffconfig (TQString & buf) {
TQString nl ("\n"); TQString nl ("\n");
buf = TQString ("Format ") + format + nl; buf = TQString ("Format ") + format + nl;
if (!audiocodec.isEmpty ()) if (!audiocodec.isEmpty ())
@ -132,7 +132,7 @@ KDE_NO_EXPORT TQString & FFServerSetting::ffconfig (TQString & buf) {
return buf; return buf;
} }
KDE_NO_EXPORT const TQStringList FFServerSetting::list () { TDE_NO_EXPORT const TQStringList FFServerSetting::list () {
TQStringList sl; TQStringList sl;
sl.push_back (format); sl.push_back (format);
sl.push_back (audiocodec); sl.push_back (audiocodec);
@ -282,7 +282,7 @@ KDE_NO_CDTOR_EXPORT KMPlayerPrefBroadcastFormatPage::KMPlayerPrefBroadcastFormat
#undef ADDPROPERTY #undef ADDPROPERTY
KDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::setSettings (const FFServerSetting & fs) { TDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::setSettings (const FFServerSetting & fs) {
if (!fs.format.isEmpty ()) if (!fs.format.isEmpty ())
format->setCurrentText (fs.format); format->setCurrentText (fs.format);
audiocodec->setText (fs.audiocodec); audiocodec->setText (fs.audiocodec);
@ -303,7 +303,7 @@ KDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::setSettings (const FFServerS
accesslist->setItem (i, 0, new TQTableItem (accesslist, TQTableItem::Always, *it)); accesslist->setItem (i, 0, new TQTableItem (accesslist, TQTableItem::Always, *it));
} }
KDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::getSettings (FFServerSetting & fs) { TDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::getSettings (FFServerSetting & fs) {
fs.format = format->currentText (); fs.format = format->currentText ();
fs.audiocodec = audiocodec->text (); fs.audiocodec = audiocodec->text ();
fs.audiobitrate = audiobitrate->text (); fs.audiobitrate = audiobitrate->text ();
@ -322,17 +322,17 @@ KDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::getSettings (FFServerSetting
} }
} }
KDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::slotIndexChanged (int index) { TDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::slotIndexChanged (int index) {
slotItemHighlighted (index); slotItemHighlighted (index);
if (index >= 0 && index < (int) profiles.size ()) if (index >= 0 && index < (int) profiles.size ())
setSettings (*profiles[index]); setSettings (*profiles[index]);
} }
KDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::slotTextChanged (const TQString & txt) { TDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::slotTextChanged (const TQString & txt) {
save->setEnabled (txt.length ()); save->setEnabled (txt.length ());
} }
KDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::slotItemHighlighted (int index) { TDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::slotItemHighlighted (int index) {
if (index < 0 || index >= (int) profiles.size ()) { if (index < 0 || index >= (int) profiles.size ()) {
load->setEnabled (false); load->setEnabled (false);
del->setEnabled (false); del->setEnabled (false);
@ -344,7 +344,7 @@ KDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::slotItemHighlighted (int ind
} }
} }
KDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::slotSave () { TDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::slotSave () {
for (int i = 0; i < (int) profiles.size (); ++i) for (int i = 0; i < (int) profiles.size (); ++i)
if (profiles[i]->name == profile->text ()) { if (profiles[i]->name == profile->text ()) {
getSettings (*profiles[i]); getSettings (*profiles[i]);
@ -357,11 +357,11 @@ KDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::slotSave () {
profilelist->insertItem (fs->name); profilelist->insertItem (fs->name);
} }
KDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::slotLoad () { TDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::slotLoad () {
setSettings (*profiles[profilelist->currentItem ()]); setSettings (*profiles[profilelist->currentItem ()]);
} }
KDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::slotDelete () { TDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::slotDelete () {
FFServerSettingList::iterator it = profiles.begin(); FFServerSettingList::iterator it = profiles.begin();
for (int i = 0; i < profilelist->currentItem (); i++) for (int i = 0; i < profilelist->currentItem (); i++)
++it; ++it;
@ -412,7 +412,7 @@ KDE_NO_CDTOR_EXPORT KMPlayerBroadcastConfig::~KMPlayerBroadcastConfig () {
stopServer (); stopServer ();
} }
KDE_NO_EXPORT void KMPlayerBroadcastConfig::write (TDEConfig * config) { TDE_NO_EXPORT void KMPlayerBroadcastConfig::write (TDEConfig * config) {
config->setGroup (strBroadcast); config->setGroup (strBroadcast);
config->writeEntry (strFFServerCustomSetting, ffserversettings.list (), ';'); config->writeEntry (strFFServerCustomSetting, ffserversettings.list (), ';');
TQStringList sl; TQStringList sl;
@ -423,7 +423,7 @@ KDE_NO_EXPORT void KMPlayerBroadcastConfig::write (TDEConfig * config) {
config->writeEntry (strFFServerProfiles, sl, ';'); config->writeEntry (strFFServerProfiles, sl, ';');
} }
KDE_NO_EXPORT void KMPlayerBroadcastConfig::read (TDEConfig * config) { TDE_NO_EXPORT void KMPlayerBroadcastConfig::read (TDEConfig * config) {
std::for_each (ffserversettingprofiles.begin (), ffserversettingprofiles.end (), KMPlayer::Deleter<FFServerSetting>()); std::for_each (ffserversettingprofiles.begin (), ffserversettingprofiles.end (), KMPlayer::Deleter<FFServerSetting>());
ffserversettingprofiles.clear (); ffserversettingprofiles.clear ();
config->setGroup (strBroadcast); config->setGroup (strBroadcast);
@ -441,7 +441,7 @@ KDE_NO_EXPORT void KMPlayerBroadcastConfig::read (TDEConfig * config) {
} }
} }
KDE_NO_EXPORT void KMPlayerBroadcastConfig::sync (bool fromUI) { TDE_NO_EXPORT void KMPlayerBroadcastConfig::sync (bool fromUI) {
if (fromUI) { if (fromUI) {
m_configpage->getSettings(ffserversettings); m_configpage->getSettings(ffserversettings);
} else { } else {
@ -450,7 +450,7 @@ KDE_NO_EXPORT void KMPlayerBroadcastConfig::sync (bool fromUI) {
} }
} }
KDE_NO_EXPORT void KMPlayerBroadcastConfig::prefLocation (TQString & item, TQString & icon, TQString & tab) { TDE_NO_EXPORT void KMPlayerBroadcastConfig::prefLocation (TQString & item, TQString & icon, TQString & tab) {
item = i18n ("Broadcasting"); item = i18n ("Broadcasting");
icon = TQString ("share"); icon = TQString ("share");
tab = i18n ("Profiles"); tab = i18n ("Profiles");
@ -467,7 +467,7 @@ TQFrame * KMPlayerBroadcastConfig::prefPage (TQWidget * parent) {
return m_configpage; return m_configpage;
} }
KDE_NO_EXPORT bool KMPlayerBroadcastConfig::broadcasting () const { TDE_NO_EXPORT bool KMPlayerBroadcastConfig::broadcasting () const {
return m_ffserver_process && m_ffserver_process->isRunning (); return m_ffserver_process && m_ffserver_process->isRunning ();
} }
#include <tdeglobal.h> #include <tdeglobal.h>
@ -480,7 +480,7 @@ static const char ffserverconf[] =
"<Stream video.%s>\nFeed kmplayer.ffm\n%s\n%s%s\n</Stream>\n" "<Stream video.%s>\nFeed kmplayer.ffm\n%s\n%s%s\n</Stream>\n"
"<Stream stat.html>\nFormat status\nACL allow localhost\n</Stream>\n"; "<Stream stat.html>\nFormat status\nACL allow localhost\n</Stream>\n";
KDE_NO_EXPORT void KMPlayerBroadcastConfig::startServer () { TDE_NO_EXPORT void KMPlayerBroadcastConfig::startServer () {
if (broadcasting ()) { if (broadcasting ()) {
stopServer (); stopServer ();
return; return;
@ -523,7 +523,7 @@ KDE_NO_EXPORT void KMPlayerBroadcastConfig::startServer () {
TQTimer::singleShot (500, this, TQ_SLOT (startFeed ())); TQTimer::singleShot (500, this, TQ_SLOT (startFeed ()));
} }
KDE_NO_EXPORT void KMPlayerBroadcastConfig::stopServer () { TDE_NO_EXPORT void KMPlayerBroadcastConfig::stopServer () {
m_endserver = true; m_endserver = true;
if (m_ffmpeg_process) if (m_ffmpeg_process)
m_ffmpeg_process->stop (); m_ffmpeg_process->stop ();
@ -531,12 +531,12 @@ KDE_NO_EXPORT void KMPlayerBroadcastConfig::stopServer () {
KMessageBox::error (m_configpage, i18n ("Failed to end ffserver process."), i18n ("Error")); KMessageBox::error (m_configpage, i18n ("Failed to end ffserver process."), i18n ("Error"));
} }
KDE_NO_EXPORT void KMPlayerBroadcastConfig::processOutput (TDEProcess * p, char * s, int) { TDE_NO_EXPORT void KMPlayerBroadcastConfig::processOutput (TDEProcess * p, char * s, int) {
if (p == m_ffserver_process) if (p == m_ffserver_process)
m_ffserver_out += TQString (s); m_ffserver_out += TQString (s);
} }
KDE_NO_EXPORT void KMPlayerBroadcastConfig::startFeed () { TDE_NO_EXPORT void KMPlayerBroadcastConfig::startFeed () {
if (!m_configpage) { if (!m_configpage) {
stopServer (); stopServer ();
return; return;
@ -573,7 +573,7 @@ bail_out:
m_configpage->setCursor (TQCursor (TQt::ArrowCursor)); m_configpage->setCursor (TQCursor (TQt::ArrowCursor));
} }
KDE_NO_EXPORT void KMPlayerBroadcastConfig::stateChange (KMPlayer::Process::State old, KMPlayer::Process::State state) { TDE_NO_EXPORT void KMPlayerBroadcastConfig::stateChange (KMPlayer::Process::State old, KMPlayer::Process::State state) {
if (state < KMPlayer::Process::Buffering && old >KMPlayer::Process::Ready) { if (state < KMPlayer::Process::Buffering && old >KMPlayer::Process::Ready) {
if (m_configpage) if (m_configpage)
m_configpage->feedled->setState (KLed::Off); m_configpage->feedled->setState (KLed::Off);
@ -590,7 +590,7 @@ KDE_NO_EXPORT void KMPlayerBroadcastConfig::stateChange (KMPlayer::Process::Stat
} }
} }
KDE_NO_EXPORT void KMPlayerBroadcastConfig::processStopped (TDEProcess *) { TDE_NO_EXPORT void KMPlayerBroadcastConfig::processStopped (TDEProcess *) {
kdDebug () << "ffserver process stopped" << endl; kdDebug () << "ffserver process stopped" << endl;
if (m_configpage) { if (m_configpage) {
m_configpage->serverled->setState (KLed::Off); m_configpage->serverled->setState (KLed::Off);
@ -603,7 +603,7 @@ KDE_NO_EXPORT void KMPlayerBroadcastConfig::processStopped (TDEProcess *) {
emit broadcastStopped (); emit broadcastStopped ();
} }
KDE_NO_EXPORT void KMPlayerBroadcastConfig::sourceChanged (KMPlayer::Source *, KMPlayer::Source * source) { TDE_NO_EXPORT void KMPlayerBroadcastConfig::sourceChanged (KMPlayer::Source *, KMPlayer::Source * source) {
if (m_configpage) if (m_configpage)
m_configpage->startbutton->setEnabled (broadcasting () || (source && !source->videoDevice ().isEmpty ())); m_configpage->startbutton->setEnabled (broadcasting () || (source && !source->videoDevice ().isEmpty ()));
} }
@ -612,7 +612,7 @@ KDE_NO_EXPORT void KMPlayerBroadcastConfig::sourceChanged (KMPlayer::Source *, K
KDE_NO_CDTOR_EXPORT KMPlayerFFServerConfig::KMPlayerFFServerConfig () { KDE_NO_CDTOR_EXPORT KMPlayerFFServerConfig::KMPlayerFFServerConfig () {
} }
KDE_NO_EXPORT void KMPlayerFFServerConfig::write (TDEConfig * config) { TDE_NO_EXPORT void KMPlayerFFServerConfig::write (TDEConfig * config) {
config->setGroup (strBroadcast); config->setGroup (strBroadcast);
config->writeEntry (strBindAddress, bindaddress); config->writeEntry (strBindAddress, bindaddress);
config->writeEntry (strFFServerPort, ffserverport); config->writeEntry (strFFServerPort, ffserverport);
@ -622,7 +622,7 @@ KDE_NO_EXPORT void KMPlayerFFServerConfig::write (TDEConfig * config) {
config->writeEntry (strFeedFileSize, feedfilesize); config->writeEntry (strFeedFileSize, feedfilesize);
} }
KDE_NO_EXPORT void KMPlayerFFServerConfig::read (TDEConfig * config) { TDE_NO_EXPORT void KMPlayerFFServerConfig::read (TDEConfig * config) {
config->setGroup (strBroadcast); config->setGroup (strBroadcast);
bindaddress = config->readEntry (strBindAddress, "0.0.0.0"); bindaddress = config->readEntry (strBindAddress, "0.0.0.0");
ffserverport = config->readNumEntry (strFFServerPort, 8090); ffserverport = config->readNumEntry (strFFServerPort, 8090);
@ -632,7 +632,7 @@ KDE_NO_EXPORT void KMPlayerFFServerConfig::read (TDEConfig * config) {
feedfilesize = config->readNumEntry (strFeedFileSize, 512); feedfilesize = config->readNumEntry (strFeedFileSize, 512);
} }
KDE_NO_EXPORT void KMPlayerFFServerConfig::sync (bool fromUI) { TDE_NO_EXPORT void KMPlayerFFServerConfig::sync (bool fromUI) {
if (fromUI) { if (fromUI) {
bindaddress = m_configpage->bindaddress->text (); bindaddress = m_configpage->bindaddress->text ();
ffserverport = m_configpage->port->text ().toInt (); ffserverport = m_configpage->port->text ().toInt ();
@ -650,13 +650,13 @@ KDE_NO_EXPORT void KMPlayerFFServerConfig::sync (bool fromUI) {
} }
} }
KDE_NO_EXPORT void KMPlayerFFServerConfig::prefLocation (TQString & item, TQString & icon, TQString & tab) { TDE_NO_EXPORT void KMPlayerFFServerConfig::prefLocation (TQString & item, TQString & icon, TQString & tab) {
item = i18n ("Broadcasting"); item = i18n ("Broadcasting");
icon = TQString ("share"); icon = TQString ("share");
tab = i18n ("FFServer"); tab = i18n ("FFServer");
} }
KDE_NO_EXPORT TQFrame *KMPlayerFFServerConfig::prefPage (TQWidget * parent) { TDE_NO_EXPORT TQFrame *KMPlayerFFServerConfig::prefPage (TQWidget * parent) {
if (!m_configpage) if (!m_configpage)
m_configpage = new KMPlayerPrefBroadcastPage (parent); m_configpage = new KMPlayerPrefBroadcastPage (parent);
return m_configpage; return m_configpage;

2
src/kmplayerbroadcast.h
Unescape View File

@ -168,7 +168,7 @@ public:
bool broadcasting () const; bool broadcasting () const;
void stopServer (); void stopServer ();
KDE_NO_EXPORT const TQString & serverURL () const { return m_ffserver_url; } TDE_NO_EXPORT const TQString & serverURL () const { return m_ffserver_url; }
FFServerSetting ffserversettings; FFServerSetting ffserversettings;
FFServerSettingList ffserversettingprofiles; FFServerSettingList ffserversettingprofiles;

10
src/kmplayerconfig.cpp
Unescape View File

@ -128,7 +128,7 @@ KDE_NO_CDTOR_EXPORT Settings::~Settings () {
//delete configdialog; //delete configdialog;
} }
KDE_EXPORT const char * strMPlayerGroup = "MPlayer"; TDE_EXPORT const char * strMPlayerGroup = "MPlayer";
const char * strGeneralGroup = "General Options"; const char * strGeneralGroup = "General Options";
static const char * strKeepSizeRatio = "Keep Size Ratio"; static const char * strKeepSizeRatio = "Keep Size Ratio";
static const char * strRememberSize = "Remember Size"; static const char * strRememberSize = "Remember Size";
@ -206,7 +206,7 @@ static const char * strAutoPlayAfterRecording = "Auto Play After Recording";
static const char * strAutoPlayAfterTime = "Auto Play After Recording Time"; static const char * strAutoPlayAfterTime = "Auto Play After Recording Time";
static const char * strRecordingCopy = "Recording Is Copy"; static const char * strRecordingCopy = "Recording Is Copy";
KDE_NO_EXPORT void Settings::applyColorSetting (bool only_changed_ones) { TDE_NO_EXPORT void Settings::applyColorSetting (bool only_changed_ones) {
View *view = static_cast <View *> (m_player->view ()); View *view = static_cast <View *> (m_player->view ());
if (!view) return; if (!view) return;
for (int i = 0; i < int (ColorSetting::last_target); i++) for (int i = 0; i < int (ColorSetting::last_target); i++)
@ -265,7 +265,7 @@ View * Settings::defaultView () {
return static_cast <View *> (m_player->view ()); return static_cast <View *> (m_player->view ());
} }
KDE_NO_EXPORT void Settings::readConfig () { TDE_NO_EXPORT void Settings::readConfig () {
m_config->setGroup (strGeneralGroup); m_config->setGroup (strGeneralGroup);
no_intro = m_config->readBoolEntry (strNoIntro, false); no_intro = m_config->readBoolEntry (strNoIntro, false);
urllist = m_config->readListEntry (strURLList, ';'); urllist = m_config->readListEntry (strURLList, ';');
@ -355,7 +355,7 @@ KDE_NO_EXPORT void Settings::readConfig () {
emit configChanged (); emit configChanged ();
} }
KDE_NO_EXPORT bool Settings::createDialog () { TDE_NO_EXPORT bool Settings::createDialog () {
if (configdialog) return false; if (configdialog) return false;
configdialog = new Preferences (m_player, this); configdialog = new Preferences (m_player, this);
int id = 0; int id = 0;
@ -733,7 +733,7 @@ void Settings::okPressed () {
} }
} }
KDE_NO_EXPORT void Settings::getHelp () { TDE_NO_EXPORT void Settings::getHelp () {
TDEApplication::kApplication()->invokeBrowser ("man:/mplayer"); TDEApplication::kApplication()->invokeBrowser ("man:/mplayer");
} }

4
src/kmplayerconfig.h
Unescape View File

@ -99,7 +99,7 @@ class KMPLAYER_EXPORT Settings : public TQObject {
public: public:
Settings (PartBase *, TDEConfig * part); Settings (PartBase *, TDEConfig * part);
~Settings (); ~Settings ();
bool createDialog () KDE_NO_EXPORT; bool createDialog () TDE_NO_EXPORT;
void show (const char * pagename = 0L); void show (const char * pagename = 0L);
void addPage (PreferencesPage *); void addPage (PreferencesPage *);
void removePage (PreferencesPage *); void removePage (PreferencesPage *);
@ -189,7 +189,7 @@ public:
signals: signals:
void configChanged (); void configChanged ();
public slots: public slots:
void readConfig () KDE_NO_EXPORT; void readConfig () TDE_NO_EXPORT;
void writeConfig (); void writeConfig ();
private slots: private slots:
void okPressed (); void okPressed ();

34
src/kmplayercontrolpanel.cpp
Unescape View File

@ -275,7 +275,7 @@ KMPlayerMenuButton::KMPlayerMenuButton (TQWidget * parent, TQBoxLayout * l, cons
l->addWidget (this); l->addWidget (this);
} }
KDE_NO_EXPORT void KMPlayerMenuButton::enterEvent (TQEvent *) { TDE_NO_EXPORT void KMPlayerMenuButton::enterEvent (TQEvent *) {
emit mouseEntered (); emit mouseEntered ();
} }
@ -284,7 +284,7 @@ KDE_NO_EXPORT void KMPlayerMenuButton::enterEvent (TQEvent *) {
KDE_NO_CDTOR_EXPORT KMPlayerPopupMenu::KMPlayerPopupMenu (TQWidget * parent) KDE_NO_CDTOR_EXPORT KMPlayerPopupMenu::KMPlayerPopupMenu (TQWidget * parent)
: TDEPopupMenu (parent, "kde_kmplayer_popupmenu") {} : TDEPopupMenu (parent, "kde_kmplayer_popupmenu") {}
KDE_NO_EXPORT void KMPlayerPopupMenu::leaveEvent (TQEvent *) { TDE_NO_EXPORT void KMPlayerPopupMenu::leaveEvent (TQEvent *) {
emit mouseLeft (); emit mouseLeft ();
} }
@ -440,7 +440,7 @@ KDE_NO_CDTOR_EXPORT ControlPanel::ControlPanel(TQWidget * parent, View * view)
connect (m_audioMenu, TQ_SIGNAL (mouseLeft ()), this, TQ_SLOT (menuMouseLeft ())); connect (m_audioMenu, TQ_SIGNAL (mouseLeft ()), this, TQ_SLOT (menuMouseLeft ()));
} }
KDE_NO_EXPORT void ControlPanel::setPalette (const TQPalette & pal) { TDE_NO_EXPORT void ControlPanel::setPalette (const TQPalette & pal) {
TQWidget::setPalette (pal); TQWidget::setPalette (pal);
TQColor c = paletteForegroundColor (); TQColor c = paletteForegroundColor ();
strncpy (xpm_fg_color, TQString(TQString().sprintf(". c #%02x%02x%02x", c.red(), c.green(),c.blue())).ascii(), 31); strncpy (xpm_fg_color, TQString(TQString().sprintf(". c #%02x%02x%02x", c.red(), c.green(),c.blue())).ascii(), 31);
@ -461,7 +461,7 @@ KDE_NO_EXPORT void ControlPanel::setPalette (const TQPalette & pal) {
m_buttons[button_blue]->setIconSet (TQIconSet (TQPixmap (blue_xpm))); m_buttons[button_blue]->setIconSet (TQIconSet (TQPixmap (blue_xpm)));
} }
KDE_NO_EXPORT void ControlPanel::timerEvent (TQTimerEvent * e) { TDE_NO_EXPORT void ControlPanel::timerEvent (TQTimerEvent * e) {
if (e->timerId () == m_popup_timer) { if (e->timerId () == m_popup_timer) {
m_popup_timer = 0; m_popup_timer = 0;
if (m_button_monitored == button_config) { if (m_button_monitored == button_config) {
@ -519,12 +519,12 @@ void ControlPanel::setAutoControls (bool b) {
m_view->updateLayout (); m_view->updateLayout ();
} }
KDE_NO_EXPORT void ControlPanel::showPopupMenu () { TDE_NO_EXPORT void ControlPanel::showPopupMenu () {
m_view->updateVolume (); m_view->updateVolume ();
m_popupMenu->exec (m_buttons [button_config]->mapToGlobal (TQPoint (0, maximumSize ().height ()))); m_popupMenu->exec (m_buttons [button_config]->mapToGlobal (TQPoint (0, maximumSize ().height ())));
} }
KDE_NO_EXPORT void ControlPanel::showLanguageMenu () { TDE_NO_EXPORT void ControlPanel::showLanguageMenu () {
m_languageMenu->exec (m_buttons [button_language]->mapToGlobal (TQPoint (0, maximumSize ().height ()))); m_languageMenu->exec (m_buttons [button_language]->mapToGlobal (TQPoint (0, maximumSize ().height ())));
} }
@ -536,7 +536,7 @@ void ControlPanel::showPositionSlider (bool show) {
m_view->updateLayout (); m_view->updateLayout ();
} }
KDE_NO_EXPORT void ControlPanel::setupPositionSlider (bool show) { TDE_NO_EXPORT void ControlPanel::setupPositionSlider (bool show) {
int h = show ? button_height_with_slider : button_height_only_buttons; int h = show ? button_height_with_slider : button_height_only_buttons;
m_posSlider->setEnabled (false); m_posSlider->setEnabled (false);
m_posSlider->setValue (0); m_posSlider->setValue (0);
@ -558,7 +558,7 @@ KDE_NO_EXPORT void ControlPanel::setupPositionSlider (bool show) {
setMaximumSize (2500, h + (show ? 8 : 2 )); setMaximumSize (2500, h + (show ? 8 : 2 ));
} }
KDE_NO_EXPORT int ControlPanel::preferedHeight () { TDE_NO_EXPORT int ControlPanel::preferedHeight () {
return m_posSlider->isVisible () ? return m_posSlider->isVisible () ?
button_height_with_slider + 8 : button_height_only_buttons + 2; button_height_with_slider + 8 : button_height_only_buttons + 2;
} }
@ -593,12 +593,12 @@ void ControlPanel::setPlaying (bool play) {
} }
} }
KDE_NO_EXPORT void ControlPanel::setRecording (bool record) { TDE_NO_EXPORT void ControlPanel::setRecording (bool record) {
if (record != m_buttons[button_record]->isOn ()) if (record != m_buttons[button_record]->isOn ())
m_buttons[button_record]->toggle (); m_buttons[button_record]->toggle ();
} }
KDE_NO_EXPORT void ControlPanel::setPlayingProgress (int pos, int len) { TDE_NO_EXPORT void ControlPanel::setPlayingProgress (int pos, int len) {
m_posSlider->setEnabled (false); m_posSlider->setEnabled (false);
m_progress_length = len; m_progress_length = len;
showPositionSlider (len > 0); showPositionSlider (len > 0);
@ -616,7 +616,7 @@ KDE_NO_EXPORT void ControlPanel::setPlayingProgress (int pos, int len) {
m_posSlider->setEnabled (true); m_posSlider->setEnabled (true);
} }
KDE_NO_EXPORT void ControlPanel::setLoadingProgress (int pos) { TDE_NO_EXPORT void ControlPanel::setLoadingProgress (int pos) {
if (pos > 0 && pos < 100 && !m_posSlider->isVisible ()) if (pos > 0 && pos < 100 && !m_posSlider->isVisible ())
showPositionSlider (true); showPositionSlider (true);
m_posSlider->setEnabled (false); m_posSlider->setEnabled (false);
@ -627,7 +627,7 @@ KDE_NO_EXPORT void ControlPanel::setLoadingProgress (int pos) {
m_posSlider->setValue (pos); m_posSlider->setValue (pos);
} }
KDE_NO_EXPORT void ControlPanel::buttonClicked () { TDE_NO_EXPORT void ControlPanel::buttonClicked () {
if (m_popup_timer) { if (m_popup_timer) {
killTimer (m_popup_timer); killTimer (m_popup_timer);
m_popup_timer = 0; m_popup_timer = 0;
@ -639,7 +639,7 @@ KDE_NO_EXPORT void ControlPanel::buttonClicked () {
showPopupMenu (); showPopupMenu ();
} }
KDE_NO_EXPORT void ControlPanel::buttonMouseEntered () { TDE_NO_EXPORT void ControlPanel::buttonMouseEntered () {
if (!m_popup_timer) { if (!m_popup_timer) {
if (sender () == m_buttons [button_config]) { if (sender () == m_buttons [button_config]) {
if (!m_popupMenu->isVisible ()) { if (!m_popupMenu->isVisible ()) {
@ -655,12 +655,12 @@ KDE_NO_EXPORT void ControlPanel::buttonMouseEntered () {
} }
} }
KDE_NO_EXPORT void ControlPanel::menuMouseLeft () { TDE_NO_EXPORT void ControlPanel::menuMouseLeft () {
if (!m_popdown_timer && !m_popup_clicked) if (!m_popdown_timer && !m_popup_clicked)
m_popdown_timer = startTimer (400); m_popdown_timer = startTimer (400);
} }
KDE_NO_EXPORT void ControlPanel::setLanguages (const TQStringList & alang, const TQStringList & slang) { TDE_NO_EXPORT void ControlPanel::setLanguages (const TQStringList & alang, const TQStringList & slang) {
int sz = (int) alang.size (); int sz = (int) alang.size ();
bool showbutton = (sz > 0); bool showbutton = (sz > 0);
m_audioMenu->clear (); m_audioMenu->clear ();
@ -677,7 +677,7 @@ KDE_NO_EXPORT void ControlPanel::setLanguages (const TQStringList & alang, const
m_buttons [button_language]->hide (); m_buttons [button_language]->hide ();
} }
KDE_NO_EXPORT void ControlPanel::selectSubtitle (int id) { TDE_NO_EXPORT void ControlPanel::selectSubtitle (int id) {
if (m_subtitleMenu->isItemChecked (id)) if (m_subtitleMenu->isItemChecked (id))
return; return;
int size = m_subtitleMenu->count (); int size = m_subtitleMenu->count ();
@ -689,7 +689,7 @@ KDE_NO_EXPORT void ControlPanel::selectSubtitle (int id) {
m_subtitleMenu->setItemChecked (id, true); m_subtitleMenu->setItemChecked (id, true);
} }
KDE_NO_EXPORT void ControlPanel::selectAudioLanguage (int id) { TDE_NO_EXPORT void ControlPanel::selectAudioLanguage (int id) {
kdDebug () << "ControlPanel::selectAudioLanguage " << id << endl; kdDebug () << "ControlPanel::selectAudioLanguage " << id << endl;
if (m_audioMenu->isItemChecked (id)) if (m_audioMenu->isItemChecked (id))
return; return;

34
src/kmplayercontrolpanel.h
Unescape View File

@ -77,7 +77,7 @@ class KMPLAYER_EXPORT VolumeBar : public TQWidget {
public: public:
VolumeBar (TQWidget * parent, View * view); VolumeBar (TQWidget * parent, View * view);
~VolumeBar (); ~VolumeBar ();
KDE_NO_EXPORT int value () const { return m_value; } TDE_NO_EXPORT int value () const { return m_value; }
void setValue (int v); void setValue (int v);
signals: signals:
void volumeChanged (int); // 0 - 100 void volumeChanged (int); // 0 - 100
@ -122,23 +122,23 @@ public:
void setAutoControls (bool b); void setAutoControls (bool b);
void setPalette (const TQPalette &); void setPalette (const TQPalette &);
int preferedHeight (); int preferedHeight ();
KDE_NO_EXPORT bool autoControls () const { return m_auto_controls; } TDE_NO_EXPORT bool autoControls () const { return m_auto_controls; }
KDE_NO_EXPORT TQSlider * positionSlider () const { return m_posSlider; } TDE_NO_EXPORT TQSlider * positionSlider () const { return m_posSlider; }
KDE_NO_EXPORT TQSlider * contrastSlider () const { return m_contrastSlider; } TDE_NO_EXPORT TQSlider * contrastSlider () const { return m_contrastSlider; }
KDE_NO_EXPORT TQSlider * brightnessSlider () const { return m_brightnessSlider; } TDE_NO_EXPORT TQSlider * brightnessSlider () const { return m_brightnessSlider; }
KDE_NO_EXPORT TQSlider * hueSlider () const { return m_hueSlider; } TDE_NO_EXPORT TQSlider * hueSlider () const { return m_hueSlider; }
KDE_NO_EXPORT TQSlider * saturationSlider () const { return m_saturationSlider; } TDE_NO_EXPORT TQSlider * saturationSlider () const { return m_saturationSlider; }
TQPushButton * button (Button b) const { return m_buttons [(int) b]; } TQPushButton * button (Button b) const { return m_buttons [(int) b]; }
KDE_NO_EXPORT TQPushButton * broadcastButton () const { return m_buttons[button_broadcast]; } TDE_NO_EXPORT TQPushButton * broadcastButton () const { return m_buttons[button_broadcast]; }
KDE_NO_EXPORT VolumeBar * volumeBar () const { return m_volume; } TDE_NO_EXPORT VolumeBar * volumeBar () const { return m_volume; }
KDE_NO_EXPORT KMPlayerPopupMenu * popupMenu () const { return m_popupMenu; } TDE_NO_EXPORT KMPlayerPopupMenu * popupMenu () const { return m_popupMenu; }
KDE_NO_EXPORT TDEPopupMenu * bookmarkMenu () const { return m_bookmarkMenu; } TDE_NO_EXPORT TDEPopupMenu * bookmarkMenu () const { return m_bookmarkMenu; }
KDE_NO_EXPORT TQPopupMenu * zoomMenu () const { return m_zoomMenu; } TDE_NO_EXPORT TQPopupMenu * zoomMenu () const { return m_zoomMenu; }
KDE_NO_EXPORT TQPopupMenu * playerMenu () const { return m_playerMenu; } TDE_NO_EXPORT TQPopupMenu * playerMenu () const { return m_playerMenu; }
KDE_NO_EXPORT TQPopupMenu * colorMenu () const { return m_colorMenu; } TDE_NO_EXPORT TQPopupMenu * colorMenu () const { return m_colorMenu; }
KDE_NO_EXPORT TQPopupMenu * audioMenu () const { return m_audioMenu; } TDE_NO_EXPORT TQPopupMenu * audioMenu () const { return m_audioMenu; }
KDE_NO_EXPORT TQPopupMenu * subtitleMenu () const { return m_subtitleMenu; } TDE_NO_EXPORT TQPopupMenu * subtitleMenu () const { return m_subtitleMenu; }
KDE_NO_EXPORT View * view () const { return m_view; } TDE_NO_EXPORT View * view () const { return m_view; }
public slots: public slots:
void setLanguages (const TQStringList & al, const TQStringList & sl); void setLanguages (const TQStringList & al, const TQStringList & sl);
void selectSubtitle (int id); void selectSubtitle (int id);

96
src/kmplayerpartbase.cpp
Unescape View File

@ -87,15 +87,15 @@ using namespace KMPlayer;
KDE_NO_CDTOR_EXPORT BookmarkOwner::BookmarkOwner (PartBase * player) KDE_NO_CDTOR_EXPORT BookmarkOwner::BookmarkOwner (PartBase * player)
: m_player (player) {} : m_player (player) {}
KDE_NO_EXPORT void BookmarkOwner::openBookmarkURL (const TQString & url) { TDE_NO_EXPORT void BookmarkOwner::openBookmarkURL (const TQString & url) {
m_player->openURL (KURL (url)); m_player->openURL (KURL (url));
} }
KDE_NO_EXPORT TQString BookmarkOwner::currentTitle () const { TDE_NO_EXPORT TQString BookmarkOwner::currentTitle () const {
return m_player->source ()->prettyName (); return m_player->source ()->prettyName ();
} }
KDE_NO_EXPORT TQString BookmarkOwner::currentURL () const { TDE_NO_EXPORT TQString BookmarkOwner::currentURL () const {
return m_player->source ()->url ().url (); return m_player->source ()->url ().url ();
} }
@ -149,7 +149,7 @@ void PartBase::showConfigDialog () {
m_settings->show ("URLPage"); m_settings->show ("URLPage");
} }
KDE_NO_EXPORT void PartBase::showPlayListWindow () { TDE_NO_EXPORT void PartBase::showPlayListWindow () {
// note, this is also the slot of application's view_playlist action, but // note, this is also the slot of application's view_playlist action, but
// anyhow, actions don't work for the fullscreen out-of-the-box, so ... // anyhow, actions don't work for the fullscreen out-of-the-box, so ...
if (m_view->viewArea ()->isFullScreen ()) if (m_view->viewArea ()->isFullScreen ())
@ -160,7 +160,7 @@ KDE_NO_EXPORT void PartBase::showPlayListWindow () {
m_view->toggleShowPlaylist (); m_view->toggleShowPlaylist ();
} }
KDE_NO_EXPORT void PartBase::addBookMark (const TQString & t, const TQString & url) { TDE_NO_EXPORT void PartBase::addBookMark (const TQString & t, const TQString & url) {
KBookmarkGroup b = m_bookmark_manager->root (); KBookmarkGroup b = m_bookmark_manager->root ();
b.addBookmark (m_bookmark_manager, t, KURL (url)); b.addBookmark (m_bookmark_manager, t, KURL (url));
m_bookmark_manager->emitChanged (b); m_bookmark_manager->emitChanged (b);
@ -360,7 +360,7 @@ void PartBase::setRecorder (const char * name) {
m_recorder = recorder; m_recorder = recorder;
} }
KDE_NO_EXPORT void PartBase::slotPlayerMenu (int id) { TDE_NO_EXPORT void PartBase::slotPlayerMenu (int id) {
bool playing = m_process->playing (); bool playing = m_process->playing ();
const char * srcname = m_source->name (); const char * srcname = m_source->name ();
TQPopupMenu * menu = m_view->controlPanel ()->playerMenu (); TQPopupMenu * menu = m_view->controlPanel ()->playerMenu ();
@ -468,7 +468,7 @@ void PartBase::setSource (Source * _source) {
emit sourceChanged (old_source, m_source); emit sourceChanged (old_source, m_source);
} }
KDE_NO_EXPORT void PartBase::changeURL (const TQString & url) { TDE_NO_EXPORT void PartBase::changeURL (const TQString & url) {
emit urlChanged (url); emit urlChanged (url);
} }
@ -586,7 +586,7 @@ void PartBase::playingStopped () {
m_bPosSliderPressed = false; m_bPosSliderPressed = false;
} }
KDE_NO_EXPORT void PartBase::setPosition (int position, int length) { TDE_NO_EXPORT void PartBase::setPosition (int position, int length) {
if (m_view && !m_bPosSliderPressed) if (m_view && !m_bPosSliderPressed)
emit positioned (position, length); emit positioned (position, length);
} }
@ -617,7 +617,7 @@ void PartBase::forward () {
m_source->forward (); m_source->forward ();
} }
KDE_NO_EXPORT void PartBase::playListItemClicked (TQListViewItem * item) { TDE_NO_EXPORT void PartBase::playListItemClicked (TQListViewItem * item) {
if (!item) if (!item)
return; return;
PlayListItem * vi = static_cast <PlayListItem *> (item); PlayListItem * vi = static_cast <PlayListItem *> (item);
@ -636,7 +636,7 @@ KDE_NO_EXPORT void PartBase::playListItemClicked (TQListViewItem * item) {
updateTree (); // items already deleted updateTree (); // items already deleted
} }
KDE_NO_EXPORT void PartBase::playListItemExecuted (TQListViewItem * item) { TDE_NO_EXPORT void PartBase::playListItemExecuted (TQListViewItem * item) {
if (m_in_update_tree) return; if (m_in_update_tree) return;
if (m_view->editMode ()) return; if (m_view->editMode ()) return;
PlayListItem * vi = static_cast <PlayListItem *> (item); PlayListItem * vi = static_cast <PlayListItem *> (item);
@ -712,11 +712,11 @@ void PartBase::setLanguages (const TQStringList & al, const TQStringList & sl) {
emit languagesUpdated (al, sl); emit languagesUpdated (al, sl);
} }
KDE_NO_EXPORT void PartBase::audioSelected (int id) { TDE_NO_EXPORT void PartBase::audioSelected (int id) {
emit audioIsSelected (id); emit audioIsSelected (id);
} }
KDE_NO_EXPORT void PartBase::subtitleSelected (int id) { TDE_NO_EXPORT void PartBase::subtitleSelected (int id) {
emit subtitleIsSelected (id); emit subtitleIsSelected (id);
} }
@ -810,45 +810,45 @@ void PartBase::decreaseVolume () {
m_view->controlPanel ()->volumeBar ()->setValue (m_view->controlPanel ()->volumeBar ()->value () - 2); m_view->controlPanel ()->volumeBar ()->setValue (m_view->controlPanel ()->volumeBar ()->value () - 2);
} }
KDE_NO_EXPORT void PartBase::posSliderPressed () { TDE_NO_EXPORT void PartBase::posSliderPressed () {
m_bPosSliderPressed=true; m_bPosSliderPressed=true;
} }
KDE_NO_EXPORT void PartBase::posSliderReleased () { TDE_NO_EXPORT void PartBase::posSliderReleased () {
m_bPosSliderPressed=false; m_bPosSliderPressed=false;
const TQSlider * posSlider = ::tqt_cast<const TQSlider *> (sender ()); const TQSlider * posSlider = ::tqt_cast<const TQSlider *> (sender ());
if (posSlider) if (posSlider)
m_process->seek (posSlider->value(), true); m_process->seek (posSlider->value(), true);
} }
KDE_NO_EXPORT void PartBase::volumeChanged (int val) { TDE_NO_EXPORT void PartBase::volumeChanged (int val) {
if (m_process) { if (m_process) {
m_settings->volume = val; m_settings->volume = val;
m_process->volume (val, true); m_process->volume (val, true);
} }
} }
KDE_NO_EXPORT void PartBase::contrastValueChanged (int val) { TDE_NO_EXPORT void PartBase::contrastValueChanged (int val) {
m_settings->contrast = val; m_settings->contrast = val;
m_process->contrast (val, true); m_process->contrast (val, true);
} }
KDE_NO_EXPORT void PartBase::brightnessValueChanged (int val) { TDE_NO_EXPORT void PartBase::brightnessValueChanged (int val) {
m_settings->brightness = val; m_settings->brightness = val;
m_process->brightness (val, true); m_process->brightness (val, true);
} }
KDE_NO_EXPORT void PartBase::hueValueChanged (int val) { TDE_NO_EXPORT void PartBase::hueValueChanged (int val) {
m_settings->hue = val; m_settings->hue = val;
m_process->hue (val, true); m_process->hue (val, true);
} }
KDE_NO_EXPORT void PartBase::saturationValueChanged (int val) { TDE_NO_EXPORT void PartBase::saturationValueChanged (int val) {
m_settings->saturation = val; m_settings->saturation = val;
m_process->saturation (val, true); m_process->saturation (val, true);
} }
KDE_NO_EXPORT void PartBase::sourceHasChangedAspects () { TDE_NO_EXPORT void PartBase::sourceHasChangedAspects () {
if (m_view && m_source) { if (m_view && m_source) {
//kdDebug () << "sourceHasChangedAspects " << m_source->aspect () << endl; //kdDebug () << "sourceHasChangedAspects " << m_source->aspect () << endl;
m_view->viewer ()->setAspect (m_source->aspect ()); m_view->viewer ()->setAspect (m_source->aspect ());
@ -857,30 +857,30 @@ KDE_NO_EXPORT void PartBase::sourceHasChangedAspects () {
emit sourceDimensionChanged (); emit sourceDimensionChanged ();
} }
KDE_NO_EXPORT void PartBase::positionValueChanged (int pos) { TDE_NO_EXPORT void PartBase::positionValueChanged (int pos) {
TQSlider * slider = ::tqt_cast <TQSlider *> (sender ()); TQSlider * slider = ::tqt_cast <TQSlider *> (sender ());
if (slider && slider->isEnabled ()) if (slider && slider->isEnabled ())
m_process->seek (pos, true); m_process->seek (pos, true);
} }
KDE_NO_EXPORT void PartBase::fullScreen () { TDE_NO_EXPORT void PartBase::fullScreen () {
if (m_view) if (m_view)
m_view->fullScreen (); m_view->fullScreen ();
} }
KDE_NO_EXPORT void PartBase::toggleFullScreen () { TDE_NO_EXPORT void PartBase::toggleFullScreen () {
m_view->fullScreen (); m_view->fullScreen ();
} }
KDE_NO_EXPORT void PartBase::minimalMode () { TDE_NO_EXPORT void PartBase::minimalMode () {
emit toggleMinimalMode (); emit toggleMinimalMode ();
} }
KDE_NO_EXPORT bool PartBase::isPlaying () { TDE_NO_EXPORT bool PartBase::isPlaying () {
return playing (); return playing ();
} }
KDE_NO_EXPORT bool PartBase::isPaused () { TDE_NO_EXPORT bool PartBase::isPaused () {
NodePtr doc = m_source ? m_source->document () : 0L; NodePtr doc = m_source ? m_source->document () : 0L;
return doc && doc->state == Node::state_deferred; return doc && doc->state == Node::state_deferred;
} }
@ -917,7 +917,7 @@ void Source::init () {
m_recordcmd.truncate (0); m_recordcmd.truncate (0);
} }
KDE_NO_EXPORT void Source::setLanguages (const TQStringList & alang, const TQStringList & slang) { TDE_NO_EXPORT void Source::setLanguages (const TQStringList & alang, const TQStringList & slang) {
m_player->setLanguages (alang, slang); m_player->setLanguages (alang, slang);
} }
@ -968,12 +968,12 @@ void Source::setLength (NodePtr, int len) {
m_player->setPosition (m_position, m_length); m_player->setPosition (m_position, m_length);
} }
KDE_NO_EXPORT void Source::setPosition (int pos) { TDE_NO_EXPORT void Source::setPosition (int pos) {
m_position = pos; m_position = pos;
m_player->setPosition (pos, m_length); m_player->setPosition (pos, m_length);
} }
KDE_NO_EXPORT void Source::setLoading (int percentage) { TDE_NO_EXPORT void Source::setLoading (int percentage) {
m_player->setLoaded (percentage); m_player->setLoaded (percentage);
} }
@ -1012,13 +1012,13 @@ void Source::setTitle (const TQString & title) {
emit titleChanged (title); emit titleChanged (title);
} }
KDE_NO_EXPORT void Source::setAudioLang (int id) { TDE_NO_EXPORT void Source::setAudioLang (int id) {
View * v = static_cast <View *> (m_player->view()); View * v = static_cast <View *> (m_player->view());
if (v && m_player->process ()) if (v && m_player->process ())
m_player->process ()->setAudioLang (id, v->controlPanel ()->audioMenu ()->text (id)); m_player->process ()->setAudioLang (id, v->controlPanel ()->audioMenu ()->text (id));
} }
KDE_NO_EXPORT void Source::setSubtitle (int id) { TDE_NO_EXPORT void Source::setSubtitle (int id) {
View * v = static_cast <View *> (m_player->view()); View * v = static_cast <View *> (m_player->view());
if (v && m_player->process ()) if (v && m_player->process ())
m_player->process ()->setSubtitle (id, v->controlPanel ()->subtitleMenu ()->text (id)); m_player->process ()->setSubtitle (id, v->controlPanel ()->subtitleMenu ()->text (id));
@ -1496,7 +1496,7 @@ bool URLSource::hasLength () {
return !!length (); return !!length ();
} }
KDE_NO_EXPORT void URLSource::activate () { TDE_NO_EXPORT void URLSource::activate () {
if (activated) if (activated)
return; return;
activated = true; activated = true;
@ -1508,7 +1508,7 @@ KDE_NO_EXPORT void URLSource::activate () {
play (); play ();
} }
KDE_NO_EXPORT void URLSource::stopResolving () { TDE_NO_EXPORT void URLSource::stopResolving () {
if (m_resolve_info) { if (m_resolve_info) {
for (SharedPtr <ResolveInfo> ri = m_resolve_info; ri; ri = ri->next) for (SharedPtr <ResolveInfo> ri = m_resolve_info; ri; ri = ri->next)
ri->job->kill (); ri->job->kill ();
@ -1602,7 +1602,7 @@ static bool isPlayListMime (const TQString & mime) {
!strcmp (mimestr, "application/x-mplayer2")); !strcmp (mimestr, "application/x-mplayer2"));
} }
KDE_NO_EXPORT void URLSource::read (NodePtr root, TQTextStream & textstream) { TDE_NO_EXPORT void URLSource::read (NodePtr root, TQTextStream & textstream) {
TQString line; TQString line;
do { do {
line = textstream.readLine (); line = textstream.readLine ();
@ -1679,7 +1679,7 @@ KDE_NO_EXPORT void URLSource::read (NodePtr root, TQTextStream & textstream) {
} }
} }
KDE_NO_EXPORT void URLSource::kioData (TDEIO::Job * job, const TQByteArray & d) { TDE_NO_EXPORT void URLSource::kioData (TDEIO::Job * job, const TQByteArray & d) {
SharedPtr <ResolveInfo> rinfo = m_resolve_info; SharedPtr <ResolveInfo> rinfo = m_resolve_info;
while (rinfo && rinfo->job != job) while (rinfo && rinfo->job != job)
rinfo = rinfo->next; rinfo = rinfo->next;
@ -1711,7 +1711,7 @@ KDE_NO_EXPORT void URLSource::kioData (TDEIO::Job * job, const TQByteArray & d)
} }
} }
KDE_NO_EXPORT void URLSource::kioMimetype (TDEIO::Job * job, const TQString & mimestr) { TDE_NO_EXPORT void URLSource::kioMimetype (TDEIO::Job * job, const TQString & mimestr) {
SharedPtr <ResolveInfo> rinfo = m_resolve_info; SharedPtr <ResolveInfo> rinfo = m_resolve_info;
while (rinfo && rinfo->job != job) while (rinfo && rinfo->job != job)
rinfo = rinfo->next; rinfo = rinfo->next;
@ -1725,7 +1725,7 @@ KDE_NO_EXPORT void URLSource::kioMimetype (TDEIO::Job * job, const TQString & mi
job->kill (false); job->kill (false);
} }
KDE_NO_EXPORT void URLSource::kioResult (TDEIO::Job * job) { TDE_NO_EXPORT void URLSource::kioResult (TDEIO::Job * job) {
SharedPtr <ResolveInfo> previnfo, rinfo = m_resolve_info; SharedPtr <ResolveInfo> previnfo, rinfo = m_resolve_info;
while (rinfo && rinfo->job != job) { while (rinfo && rinfo->job != job) {
previnfo = rinfo; previnfo = rinfo;
@ -1925,7 +1925,7 @@ RemoteObjectPrivate::~RemoteObjectPrivate () {
clear (); clear ();
} }
KDE_NO_EXPORT bool RemoteObjectPrivate::download (const TQString & str) { TDE_NO_EXPORT bool RemoteObjectPrivate::download (const TQString & str) {
url = str; url = str;
KURL kurl (str); KURL kurl (str);
if (kurl.isLocalFile ()) { if (kurl.isLocalFile ()) {
@ -1960,7 +1960,7 @@ KDE_NO_EXPORT bool RemoteObjectPrivate::download (const TQString & str) {
return false; return false;
} }
KDE_NO_EXPORT void RemoteObjectPrivate::clear () { TDE_NO_EXPORT void RemoteObjectPrivate::clear () {
if (job) { if (job) {
job->kill (); // quiet, no result signal job->kill (); // quiet, no result signal
job = 0L; job = 0L;
@ -1972,7 +1972,7 @@ KDE_NO_EXPORT void RemoteObjectPrivate::clear () {
} }
} }
KDE_NO_EXPORT void RemoteObjectPrivate::slotResult (TDEIO::Job * kjob) { TDE_NO_EXPORT void RemoteObjectPrivate::slotResult (TDEIO::Job * kjob) {
if (!kjob->error ()) if (!kjob->error ())
memory_cache->add (url, data); memory_cache->add (url, data);
else else
@ -1981,7 +1981,7 @@ KDE_NO_EXPORT void RemoteObjectPrivate::slotResult (TDEIO::Job * kjob) {
remote_object->remoteReady (data); remote_object->remoteReady (data);
} }
KDE_NO_EXPORT TDE_NO_EXPORT
void RemoteObjectPrivate::cachePreserveRemoved (const TQString & str) { void RemoteObjectPrivate::cachePreserveRemoved (const TQString & str) {
if (str == url && !memory_cache->isPreserved (str)) { if (str == url && !memory_cache->isPreserved (str)) {
preserve_wait = false; preserve_wait = false;
@ -1991,7 +1991,7 @@ void RemoteObjectPrivate::cachePreserveRemoved (const TQString & str) {
} }
} }
KDE_NO_EXPORT TDE_NO_EXPORT
void RemoteObjectPrivate::slotData (TDEIO::Job*, const TQByteArray& qb) { void RemoteObjectPrivate::slotData (TDEIO::Job*, const TQByteArray& qb) {
if (qb.size ()) { if (qb.size ()) {
int old_size = data.size (); int old_size = data.size ();
@ -2000,7 +2000,7 @@ void RemoteObjectPrivate::slotData (TDEIO::Job*, const TQByteArray& qb) {
} }
} }
KDE_NO_EXPORT TDE_NO_EXPORT
void RemoteObjectPrivate::slotMimetype (TDEIO::Job *, const TQString & m) { void RemoteObjectPrivate::slotMimetype (TDEIO::Job *, const TQString & m) {
mime = m; mime = m;
} }
@ -2015,19 +2015,19 @@ KDE_NO_CDTOR_EXPORT RemoteObject::~RemoteObject () {
/** /**
* abort previous wget job * abort previous wget job
*/ */
KDE_NO_EXPORT void RemoteObject::killWGet () { TDE_NO_EXPORT void RemoteObject::killWGet () {
d->clear (); // assume data is invalid d->clear (); // assume data is invalid
} }
/** /**
* Gets contents from url and puts it in m_data * Gets contents from url and puts it in m_data
*/ */
KDE_NO_EXPORT bool RemoteObject::wget (const TQString & url) { TDE_NO_EXPORT bool RemoteObject::wget (const TQString & url) {
clear (); clear ();
return d->download (url); return d->download (url);
} }
KDE_NO_EXPORT TQString RemoteObject::mimetype () { TDE_NO_EXPORT TQString RemoteObject::mimetype () {
if (d->data.size () > 0 && d->mime.isEmpty ()) { if (d->data.size () > 0 && d->mime.isEmpty ()) {
int accuraty; int accuraty;
KMimeType::Ptr mime = KMimeType::findByContent (d->data, &accuraty); KMimeType::Ptr mime = KMimeType::findByContent (d->data, &accuraty);
@ -2037,14 +2037,14 @@ KDE_NO_EXPORT TQString RemoteObject::mimetype () {
return d->mime; return d->mime;
} }
KDE_NO_EXPORT void RemoteObject::clear () { TDE_NO_EXPORT void RemoteObject::clear () {
killWGet (); killWGet ();
d->url.truncate (0); d->url.truncate (0);
d->mime.truncate (0); d->mime.truncate (0);
d->data.resize (0); d->data.resize (0);
} }
KDE_NO_EXPORT bool RemoteObject::downloading () const { TDE_NO_EXPORT bool RemoteObject::downloading () const {
return !!d->job; return !!d->job;
} }

20
src/kmplayerplaylist.cpp
Unescape View File

@ -104,7 +104,7 @@ Connection::Connection (NodeRefListPtr ls, NodePtr node, NodePtr inv)
} }
} }
KDE_NO_EXPORT void Connection::disconnect () { TDE_NO_EXPORT void Connection::disconnect () {
if (listen_item && listeners) if (listen_item && listeners)
listeners->remove (listen_item); listeners->remove (listen_item);
listen_item = 0L; listen_item = 0L;
@ -336,7 +336,7 @@ void Node::removeChild (NodePtr c) {
TreeNode <Node>::removeChild (c); TreeNode <Node>::removeChild (c);
} }
KDE_NO_EXPORT void Node::replaceChild (NodePtr _new, NodePtr old) { TDE_NO_EXPORT void Node::replaceChild (NodePtr _new, NodePtr old) {
document()->m_tree_version++; document()->m_tree_version++;
if (old->m_prev) { if (old->m_prev) {
old->m_prev->m_next = _new; old->m_prev->m_next = _new;
@ -362,7 +362,7 @@ NodePtr Node::childFromTag (const TQString &) {
return NodePtr (); return NodePtr ();
} }
KDE_NO_EXPORT void Node::characterData (const TQString & s) { TDE_NO_EXPORT void Node::characterData (const TQString & s) {
document()->m_tree_version++; document()->m_tree_version++;
if (!m_last_child || m_last_child->id != id_node_text) if (!m_last_child || m_last_child->id != id_node_text)
appendChild (new TextNode (m_doc, s)); appendChild (new TextNode (m_doc, s));
@ -455,7 +455,7 @@ NodeRefListPtr Node::listeners (unsigned int /*event_id*/) {
bool Node::handleEvent (EventPtr /*event*/) { return false; } bool Node::handleEvent (EventPtr /*event*/) { return false; }
KDE_NO_EXPORT void Node::propagateEvent (EventPtr event) { TDE_NO_EXPORT void Node::propagateEvent (EventPtr event) {
NodeRefListPtr nl = listeners (event->id ()); NodeRefListPtr nl = listeners (event->id ());
if (nl) if (nl)
for (NodeRefItemPtr c = nl->first(); c; c = c->nextSibling ()) for (NodeRefItemPtr c = nl->first(); c; c = c->nextSibling ())
@ -467,7 +467,7 @@ void Node::accept (Visitor * v) {
v->visit (this); v->visit (this);
} }
KDE_NO_EXPORT TDE_NO_EXPORT
ConnectionPtr Node::connectTo (NodePtr node, unsigned int evt_id) { ConnectionPtr Node::connectTo (NodePtr node, unsigned int evt_id) {
NodeRefListPtr nl = listeners (evt_id); NodeRefListPtr nl = listeners (evt_id);
if (nl) if (nl)
@ -516,7 +516,7 @@ namespace KMPlayer {
}; };
} }
KDE_NO_EXPORT TQString ParamValue::value () { TDE_NO_EXPORT TQString ParamValue::value () {
return modifications && modifications->size () return modifications && modifications->size ()
? modifications->back () : val; ? modifications->back () : val;
} }
@ -525,7 +525,7 @@ KDE_NO_CDTOR_EXPORT ElementPrivate::~ElementPrivate () {
clear (); clear ();
} }
KDE_NO_EXPORT void ElementPrivate::clear () { TDE_NO_EXPORT void ElementPrivate::clear () {
const ParamMap::iterator e = params.end (); const ParamMap::iterator e = params.end ();
for (ParamMap::iterator i = params.begin (); i != e; ++i) for (ParamMap::iterator i = params.begin (); i != e; ++i)
delete i.data (); delete i.data ();
@ -1077,7 +1077,7 @@ TQString TextNode::nodeValue () const {
return text; return text;
} }
KDE_NO_EXPORT bool TextNode::expose () const { TDE_NO_EXPORT bool TextNode::expose () const {
return false; return false;
} }
@ -1096,7 +1096,7 @@ NodePtr DarkNode::childFromTag (const TQString & tag) {
return new DarkNode (m_doc, tag); return new DarkNode (m_doc, tag);
} }
KDE_NO_EXPORT bool DarkNode::expose () const { TDE_NO_EXPORT bool DarkNode::expose () const {
return false; return false;
} }
@ -1110,7 +1110,7 @@ GenericURL::GenericURL (NodePtr & d, const TQString & s, const TQString & name)
pretty_name = name; pretty_name = name;
} }
KDE_NO_EXPORT void GenericURL::closed () { TDE_NO_EXPORT void GenericURL::closed () {
if (src.isEmpty ()) if (src.isEmpty ())
src = getAttribute (StringPool::attr_src); src = getAttribute (StringPool::attr_src);
} }

20
src/kmplayerplaylist.h
Unescape View File

@ -224,7 +224,7 @@ class KMPLAYER_EXPORT Event : public Item <Event> {
public: public:
KDE_NO_CDTOR_EXPORT Event (unsigned int event_id) : m_event_id (event_id) {} KDE_NO_CDTOR_EXPORT Event (unsigned int event_id) : m_event_id (event_id) {}
KDE_NO_CDTOR_EXPORT virtual ~Event () {} KDE_NO_CDTOR_EXPORT virtual ~Event () {}
KDE_NO_EXPORT unsigned int id () const { return m_event_id; } TDE_NO_EXPORT unsigned int id () const { return m_event_id; }
protected: protected:
unsigned int m_event_id; unsigned int m_event_id;
}; };
@ -431,9 +431,9 @@ public:
* Get rid of whitespace only text nodes * Get rid of whitespace only text nodes
*/ */
void normalize (); void normalize ();
KDE_NO_EXPORT bool isDocument () const { return m_doc == m_self; } TDE_NO_EXPORT bool isDocument () const { return m_doc == m_self; }
KDE_NO_EXPORT NodeListPtr childNodes () const; TDE_NO_EXPORT NodeListPtr childNodes () const;
void setState (State nstate); void setState (State nstate);
/* /*
* Open tag is found by parser, attributes are set * Open tag is found by parser, attributes are set
@ -477,7 +477,7 @@ public:
void setAttributes (AttributeListPtr attrs); void setAttributes (AttributeListPtr attrs);
void setAttribute (const TrieString & name, const TQString & value); void setAttribute (const TrieString & name, const TQString & value);
TQString getAttribute (const TrieString & name); TQString getAttribute (const TrieString & name);
KDE_NO_EXPORT AttributeListPtr attributes () const { return m_attributes; } TDE_NO_EXPORT AttributeListPtr attributes () const { return m_attributes; }
virtual void init (); virtual void init ();
virtual void reset (); virtual void reset ();
virtual void clear (); virtual void clear ();
@ -516,7 +516,7 @@ protected:
}; };
template <class T> template <class T>
inline KDE_NO_EXPORT T * convertNode (NodePtr e) { inline TDE_NO_EXPORT T * convertNode (NodePtr e) {
return static_cast <T *> (e.ptr ()); return static_cast <T *> (e.ptr ());
} }
@ -618,7 +618,7 @@ public:
void clear (); void clear ();
TQString mimetype (); TQString mimetype ();
protected: protected:
KDE_NO_EXPORT virtual void remoteReady (TQByteArray &) {} TDE_NO_EXPORT virtual void remoteReady (TQByteArray &) {}
bool downloading () const; bool downloading () const;
private: private:
RemoteObjectPrivate *d; RemoteObjectPrivate *d;
@ -719,7 +719,7 @@ public:
* */ * */
void dispose (); void dispose ();
virtual NodePtr childFromTag (const TQString & tag); virtual NodePtr childFromTag (const TQString & tag);
KDE_NO_EXPORT const char * nodeName () const { return "document"; } TDE_NO_EXPORT const char * nodeName () const { return "document"; }
virtual void activate (); virtual void activate ();
virtual void defer (); virtual void defer ();
virtual void undefer (); virtual void undefer ();
@ -861,7 +861,7 @@ public:
class KMPLAYER_EXPORT GenericURL : public Mrl { class KMPLAYER_EXPORT GenericURL : public Mrl {
public: public:
GenericURL(NodePtr &d, const TQString &s, const TQString &n=TQString ()); GenericURL(NodePtr &d, const TQString &s, const TQString &n=TQString ());
KDE_NO_EXPORT const char * nodeName () const { return "url"; } TDE_NO_EXPORT const char * nodeName () const { return "url"; }
void closed (); void closed ();
}; };
@ -872,7 +872,7 @@ class KMPLAYER_EXPORT GenericMrl : public Mrl {
public: public:
KDE_NO_CDTOR_EXPORT GenericMrl (NodePtr & d) : Mrl (d), node_name ("mrl") {} KDE_NO_CDTOR_EXPORT GenericMrl (NodePtr & d) : Mrl (d), node_name ("mrl") {}
GenericMrl(NodePtr &d, const TQString &s, const TQString & name=TQString (), const TQString &tag=TQString ("mrl")); GenericMrl(NodePtr &d, const TQString &s, const TQString & name=TQString (), const TQString &tag=TQString ("mrl"));
KDE_NO_EXPORT const char * nodeName () const { return node_name.ascii (); } TDE_NO_EXPORT const char * nodeName () const { return node_name.ascii (); }
void closed (); void closed ();
bool expose () const; bool expose () const;
TQString node_name; TQString node_name;
@ -970,7 +970,7 @@ inline void TreeNode<T>::removeChild (typename Item<T>::SharedType c) {
c->m_parent = 0L; c->m_parent = 0L;
} }
inline KDE_NO_EXPORT NodeListPtr Node::childNodes () const { inline TDE_NO_EXPORT NodeListPtr Node::childNodes () const {
return new NodeList (m_first_child, m_last_child); return new NodeList (m_first_child, m_last_child);
} }

164
src/kmplayerprocess.cpp
Unescape View File

@ -195,7 +195,7 @@ void Process::setState (State newstate) {
} }
} }
KDE_NO_EXPORT void Process::rescheduledStateChanged () { TDE_NO_EXPORT void Process::rescheduledStateChanged () {
State old_state = m_old_state; State old_state = m_old_state;
m_old_state = m_state; m_old_state = m_state;
m_source->stateChange (this, old_state, m_state); m_source->stateChange (this, old_state, m_state);
@ -273,7 +273,7 @@ KDE_NO_CDTOR_EXPORT MPlayerBase::MPlayerBase (TQObject * parent, Settings * sett
KDE_NO_CDTOR_EXPORT MPlayerBase::~MPlayerBase () { KDE_NO_CDTOR_EXPORT MPlayerBase::~MPlayerBase () {
} }
KDE_NO_EXPORT void MPlayerBase::initProcess (Viewer * viewer) { TDE_NO_EXPORT void MPlayerBase::initProcess (Viewer * viewer) {
Process::initProcess (viewer); Process::initProcess (viewer);
const KURL & url (m_source->url ()); const KURL & url (m_source->url ());
if (!url.isEmpty ()) { if (!url.isEmpty ()) {
@ -287,7 +287,7 @@ KDE_NO_EXPORT void MPlayerBase::initProcess (Viewer * viewer) {
this, TQ_SLOT (processStopped (TDEProcess *))); this, TQ_SLOT (processStopped (TDEProcess *)));
} }
KDE_NO_EXPORT bool MPlayerBase::sendCommand (const TQString & cmd) { TDE_NO_EXPORT bool MPlayerBase::sendCommand (const TQString & cmd) {
if (playing () && m_use_slave) { if (playing () && m_use_slave) {
commands.push_front (cmd + '\n'); commands.push_front (cmd + '\n');
fprintf (stderr, "eval %s", commands.last ().latin1 ()); fprintf (stderr, "eval %s", commands.last ().latin1 ());
@ -299,14 +299,14 @@ KDE_NO_EXPORT bool MPlayerBase::sendCommand (const TQString & cmd) {
return false; return false;
} }
KDE_NO_EXPORT bool MPlayerBase::stop () { TDE_NO_EXPORT bool MPlayerBase::stop () {
terminateJobs (); terminateJobs ();
if (!m_source || !m_process || !m_process->isRunning ()) if (!m_source || !m_process || !m_process->isRunning ())
return true; return true;
return true; return true;
} }
KDE_NO_EXPORT bool MPlayerBase::quit () { TDE_NO_EXPORT bool MPlayerBase::quit () {
if (playing ()) { if (playing ()) {
stop (); stop ();
disconnect (m_process, TQ_SIGNAL (processExited (TDEProcess *)), disconnect (m_process, TQ_SIGNAL (processExited (TDEProcess *)),
@ -333,7 +333,7 @@ KDE_NO_EXPORT bool MPlayerBase::quit () {
return Process::quit (); return Process::quit ();
} }
KDE_NO_EXPORT void MPlayerBase::dataWritten (TDEProcess *) { TDE_NO_EXPORT void MPlayerBase::dataWritten (TDEProcess *) {
if (!commands.size ()) return; if (!commands.size ()) return;
kdDebug() << "eval done " << commands.last () << endl; kdDebug() << "eval done " << commands.last () << endl;
commands.pop_back (); commands.pop_back ();
@ -342,7 +342,7 @@ KDE_NO_EXPORT void MPlayerBase::dataWritten (TDEProcess *) {
commands.last ().length ()); commands.last ().length ());
} }
KDE_NO_EXPORT void MPlayerBase::processStopped (TDEProcess *) { TDE_NO_EXPORT void MPlayerBase::processStopped (TDEProcess *) {
kdDebug() << "process stopped" << endl; kdDebug() << "process stopped" << endl;
commands.clear (); commands.clear ();
setState (Ready); setState (Ready);
@ -370,24 +370,24 @@ KDE_NO_CDTOR_EXPORT MPlayer::~MPlayer () {
delete m_configpage; delete m_configpage;
} }
KDE_NO_EXPORT void MPlayer::init () { TDE_NO_EXPORT void MPlayer::init () {
} }
TQString MPlayer::menuName () const { TQString MPlayer::menuName () const {
return i18n ("&MPlayer"); return i18n ("&MPlayer");
} }
KDE_NO_EXPORT WId MPlayer::widget () { TDE_NO_EXPORT WId MPlayer::widget () {
return viewer ()->embeddedWinId (); return viewer ()->embeddedWinId ();
} }
KDE_NO_EXPORT bool MPlayer::ready (Viewer * viewer) { TDE_NO_EXPORT bool MPlayer::ready (Viewer * viewer) {
Process::ready (viewer); Process::ready (viewer);
viewer->changeProtocol (QXEmbed::XPLAIN); viewer->changeProtocol (QXEmbed::XPLAIN);
return false; return false;
} }
KDE_NO_EXPORT bool MPlayer::deMediafiedPlay () { TDE_NO_EXPORT bool MPlayer::deMediafiedPlay () {
if (playing ()) if (playing ())
return sendCommand (TQString ("gui_play")); return sendCommand (TQString ("gui_play"));
if (!m_needs_restarted && playing ()) if (!m_needs_restarted && playing ())
@ -448,7 +448,7 @@ KDE_NO_EXPORT bool MPlayer::deMediafiedPlay () {
return run (args.ascii (), m_source->pipeCmd ().ascii ()); return run (args.ascii (), m_source->pipeCmd ().ascii ());
} }
KDE_NO_EXPORT bool MPlayer::stop () { TDE_NO_EXPORT bool MPlayer::stop () {
terminateJobs (); terminateJobs ();
if (!m_source || !m_process || !m_process->isRunning ()) return true; if (!m_source || !m_process || !m_process->isRunning ()) return true;
if (m_use_slave) if (m_use_slave)
@ -456,11 +456,11 @@ KDE_NO_EXPORT bool MPlayer::stop () {
return MPlayerBase::stop (); return MPlayerBase::stop ();
} }
KDE_NO_EXPORT bool MPlayer::pause () { TDE_NO_EXPORT bool MPlayer::pause () {
return sendCommand (TQString ("pause")); return sendCommand (TQString ("pause"));
} }
KDE_NO_EXPORT bool MPlayer::seek (int pos, bool absolute) { TDE_NO_EXPORT bool MPlayer::seek (int pos, bool absolute) {
if (!m_source || !m_source->hasLength () || if (!m_source || !m_source->hasLength () ||
(absolute && m_source->position () == pos)) (absolute && m_source->position () == pos))
return false; return false;
@ -487,7 +487,7 @@ KDE_NO_EXPORT bool MPlayer::seek (int pos, bool absolute) {
return sendCommand (cmd); return sendCommand (cmd);
} }
KDE_NO_EXPORT bool MPlayer::volume (int incdec, bool absolute) { TDE_NO_EXPORT bool MPlayer::volume (int incdec, bool absolute) {
if (absolute) if (absolute)
incdec -= old_volume; incdec -= old_volume;
if (incdec == 0) if (incdec == 0)
@ -496,25 +496,25 @@ KDE_NO_EXPORT bool MPlayer::volume (int incdec, bool absolute) {
return sendCommand (TQString ("volume ") + TQString::number (incdec)); return sendCommand (TQString ("volume ") + TQString::number (incdec));
} }
KDE_NO_EXPORT bool MPlayer::saturation (int val, bool absolute) { TDE_NO_EXPORT bool MPlayer::saturation (int val, bool absolute) {
TQString cmd; TQString cmd;
cmd.sprintf ("saturation %d %d", val, absolute ? 1 : 0); cmd.sprintf ("saturation %d %d", val, absolute ? 1 : 0);
return sendCommand (cmd); return sendCommand (cmd);
} }
KDE_NO_EXPORT bool MPlayer::hue (int val, bool absolute) { TDE_NO_EXPORT bool MPlayer::hue (int val, bool absolute) {
TQString cmd; TQString cmd;
cmd.sprintf ("hue %d %d", val, absolute ? 1 : 0); cmd.sprintf ("hue %d %d", val, absolute ? 1 : 0);
return sendCommand (cmd); return sendCommand (cmd);
} }
KDE_NO_EXPORT bool MPlayer::contrast (int val, bool /*absolute*/) { TDE_NO_EXPORT bool MPlayer::contrast (int val, bool /*absolute*/) {
TQString cmd; TQString cmd;
cmd.sprintf ("contrast %d 1", val); cmd.sprintf ("contrast %d 1", val);
return sendCommand (cmd); return sendCommand (cmd);
} }
KDE_NO_EXPORT bool MPlayer::brightness (int val, bool /*absolute*/) { TDE_NO_EXPORT bool MPlayer::brightness (int val, bool /*absolute*/) {
TQString cmd; TQString cmd;
cmd.sprintf ("brightness %d 1", val); cmd.sprintf ("brightness %d 1", val);
return sendCommand (cmd); return sendCommand (cmd);
@ -629,7 +629,7 @@ bool MPlayer::run (const char * args, const char * pipe) {
return false; return false;
} }
KDE_NO_EXPORT bool MPlayer::grabPicture (const KURL & url, int pos) { TDE_NO_EXPORT bool MPlayer::grabPicture (const KURL & url, int pos) {
stop (); stop ();
initProcess (viewer ()); initProcess (viewer ());
TQString outdir = locateLocal ("data", "kmplayer/"); TQString outdir = locateLocal ("data", "kmplayer/");
@ -652,7 +652,7 @@ KDE_NO_EXPORT bool MPlayer::grabPicture (const KURL & url, int pos) {
return m_process->isRunning (); return m_process->isRunning ();
} }
KDE_NO_EXPORT void MPlayer::processOutput (TDEProcess *, char * str, int slen) { TDE_NO_EXPORT void MPlayer::processOutput (TDEProcess *, char * str, int slen) {
if (!viewer () || slen <= 0) return; if (!viewer () || slen <= 0) return;
View * v = viewer ()->view (); View * v = viewer ()->view ();
@ -809,7 +809,7 @@ KDE_NO_EXPORT void MPlayer::processOutput (TDEProcess *, char * str, int slen) {
} while (slen > 0); } while (slen > 0);
} }
KDE_NO_EXPORT void MPlayer::processStopped (TDEProcess * p) { TDE_NO_EXPORT void MPlayer::processStopped (TDEProcess * p) {
if (p && !m_grabfile.isEmpty ()) { if (p && !m_grabfile.isEmpty ()) {
emit grabReady (m_grabfile); emit grabReady (m_grabfile);
m_grabfile.truncate (0); m_grabfile.truncate (0);
@ -926,7 +926,7 @@ KDE_NO_CDTOR_EXPORT MPlayerPreferencesPage::MPlayerPreferencesPage (MPlayer * p)
: m_process (p), m_configframe (0L) { : m_process (p), m_configframe (0L) {
} }
KDE_NO_EXPORT void MPlayerPreferencesPage::write (TDEConfig * config) { TDE_NO_EXPORT void MPlayerPreferencesPage::write (TDEConfig * config) {
config->setGroup (strMPlayerPatternGroup); config->setGroup (strMPlayerPatternGroup);
for (int i = 0; i < int (pat_last); i++) for (int i = 0; i < int (pat_last); i++)
config->writeEntry config->writeEntry
@ -938,7 +938,7 @@ KDE_NO_EXPORT void MPlayerPreferencesPage::write (TDEConfig * config) {
config->writeEntry (strAlwaysBuildIndex, alwaysbuildindex); config->writeEntry (strAlwaysBuildIndex, alwaysbuildindex);
} }
KDE_NO_EXPORT void MPlayerPreferencesPage::read (TDEConfig * config) { TDE_NO_EXPORT void MPlayerPreferencesPage::read (TDEConfig * config) {
config->setGroup (strMPlayerPatternGroup); config->setGroup (strMPlayerPatternGroup);
for (int i = 0; i < int (pat_last); i++) for (int i = 0; i < int (pat_last); i++)
m_patterns[i].setPattern (config->readEntry m_patterns[i].setPattern (config->readEntry
@ -950,7 +950,7 @@ KDE_NO_EXPORT void MPlayerPreferencesPage::read (TDEConfig * config) {
alwaysbuildindex = config->readBoolEntry (strAlwaysBuildIndex, false); alwaysbuildindex = config->readBoolEntry (strAlwaysBuildIndex, false);
} }
KDE_NO_EXPORT void MPlayerPreferencesPage::sync (bool fromUI) { TDE_NO_EXPORT void MPlayerPreferencesPage::sync (bool fromUI) {
TQTable * table = m_configframe->table; TQTable * table = m_configframe->table;
TQSpinBox * cacheSize = static_cast<TQSpinBox *>(table->cellWidget (2, 1)); TQSpinBox * cacheSize = static_cast<TQSpinBox *>(table->cellWidget (2, 1));
TQCheckBox * buildIndex = static_cast<TQCheckBox *>(table->cellWidget (3, 1)); TQCheckBox * buildIndex = static_cast<TQCheckBox *>(table->cellWidget (3, 1));
@ -972,13 +972,13 @@ KDE_NO_EXPORT void MPlayerPreferencesPage::sync (bool fromUI) {
} }
} }
KDE_NO_EXPORT void MPlayerPreferencesPage::prefLocation (TQString & item, TQString & icon, TQString & tab) { TDE_NO_EXPORT void MPlayerPreferencesPage::prefLocation (TQString & item, TQString & icon, TQString & tab) {
item = i18n ("General Options"); item = i18n ("General Options");
icon = TQString ("kmplayer"); icon = TQString ("kmplayer");
tab = i18n ("MPlayer"); tab = i18n ("MPlayer");
} }
KDE_NO_EXPORT TQFrame * MPlayerPreferencesPage::prefPage (TQWidget * parent) { TDE_NO_EXPORT TQFrame * MPlayerPreferencesPage::prefPage (TQWidget * parent) {
m_configframe = new MPlayerPreferencesFrame (parent); m_configframe = new MPlayerPreferencesFrame (parent);
return m_configframe; return m_configframe;
} }
@ -997,7 +997,7 @@ KDE_NO_CDTOR_EXPORT MEncoder::MEncoder (TQObject * parent, Settings * settings)
KDE_NO_CDTOR_EXPORT MEncoder::~MEncoder () { KDE_NO_CDTOR_EXPORT MEncoder::~MEncoder () {
} }
KDE_NO_EXPORT void MEncoder::init () { TDE_NO_EXPORT void MEncoder::init () {
} }
bool MEncoder::deMediafiedPlay () { bool MEncoder::deMediafiedPlay () {
@ -1038,7 +1038,7 @@ bool MEncoder::deMediafiedPlay () {
return success; return success;
} }
KDE_NO_EXPORT bool MEncoder::stop () { TDE_NO_EXPORT bool MEncoder::stop () {
terminateJobs (); terminateJobs ();
if (!m_source || !m_process || !m_process->isRunning ()) return true; if (!m_source || !m_process || !m_process->isRunning ()) return true;
kdDebug () << "MEncoder::stop ()" << endl; kdDebug () << "MEncoder::stop ()" << endl;
@ -1062,7 +1062,7 @@ MPlayerDumpstream::MPlayerDumpstream (TQObject * parent, Settings * settings)
KDE_NO_CDTOR_EXPORT MPlayerDumpstream::~MPlayerDumpstream () { KDE_NO_CDTOR_EXPORT MPlayerDumpstream::~MPlayerDumpstream () {
} }
KDE_NO_EXPORT void MPlayerDumpstream::init () { TDE_NO_EXPORT void MPlayerDumpstream::init () {
} }
bool MPlayerDumpstream::deMediafiedPlay () { bool MPlayerDumpstream::deMediafiedPlay () {
@ -1100,7 +1100,7 @@ bool MPlayerDumpstream::deMediafiedPlay () {
return success; return success;
} }
KDE_NO_EXPORT bool MPlayerDumpstream::stop () { TDE_NO_EXPORT bool MPlayerDumpstream::stop () {
terminateJobs (); terminateJobs ();
if (!m_source || !m_process || !m_process->isRunning ()) return true; if (!m_source || !m_process || !m_process->isRunning ()) return true;
kdDebug () << "MPlayerDumpstream::stop ()" << endl; kdDebug () << "MPlayerDumpstream::stop ()" << endl;
@ -1435,12 +1435,12 @@ void CallbackProcess::initProcess (Viewer * viewer) {
this, TQ_SLOT (processOutput (TDEProcess *, char *, int))); this, TQ_SLOT (processOutput (TDEProcess *, char *, int)));
} }
KDE_NO_EXPORT void CallbackProcess::processOutput (TDEProcess *, char * str, int slen) { TDE_NO_EXPORT void CallbackProcess::processOutput (TDEProcess *, char * str, int slen) {
if (viewer () && slen > 0) if (viewer () && slen > 0)
viewer ()->view ()->addText (TQString::fromLocal8Bit (str, slen)); viewer ()->view ()->addText (TQString::fromLocal8Bit (str, slen));
} }
KDE_NO_EXPORT void CallbackProcess::processStopped (TDEProcess *) { TDE_NO_EXPORT void CallbackProcess::processStopped (TDEProcess *) {
if (m_source) if (m_source)
((PlayListNotify *) m_source)->setInfoMessage (TQString ()); ((PlayListNotify *) m_source)->setInfoMessage (TQString ());
delete m_backend; delete m_backend;
@ -1584,18 +1584,18 @@ KDE_NO_CDTOR_EXPORT XMLPreferencesPage::XMLPreferencesPage (CallbackProcess * p)
KDE_NO_CDTOR_EXPORT XMLPreferencesPage::~XMLPreferencesPage () { KDE_NO_CDTOR_EXPORT XMLPreferencesPage::~XMLPreferencesPage () {
} }
KDE_NO_EXPORT void XMLPreferencesFrame::showEvent (TQShowEvent *) { TDE_NO_EXPORT void XMLPreferencesFrame::showEvent (TQShowEvent *) {
if (!m_process->haveConfig ()) if (!m_process->haveConfig ())
m_process->getConfigData (); m_process->getConfigData ();
} }
KDE_NO_EXPORT void XMLPreferencesPage::write (TDEConfig *) { TDE_NO_EXPORT void XMLPreferencesPage::write (TDEConfig *) {
} }
KDE_NO_EXPORT void XMLPreferencesPage::read (TDEConfig *) { TDE_NO_EXPORT void XMLPreferencesPage::read (TDEConfig *) {
} }
KDE_NO_EXPORT void XMLPreferencesPage::sync (bool fromUI) { TDE_NO_EXPORT void XMLPreferencesPage::sync (bool fromUI) {
if (!m_configframe) return; if (!m_configframe) return;
TQTable * table = m_configframe->table; TQTable * table = m_configframe->table;
int row = 0; int row = 0;
@ -1663,13 +1663,13 @@ KDE_NO_EXPORT void XMLPreferencesPage::sync (bool fromUI) {
} }
} }
KDE_NO_EXPORT void XMLPreferencesPage::prefLocation (TQString & item, TQString & icon, TQString & tab) { TDE_NO_EXPORT void XMLPreferencesPage::prefLocation (TQString & item, TQString & icon, TQString & tab) {
item = i18n ("General Options"); item = i18n ("General Options");
icon = TQString ("kmplayer"); icon = TQString ("kmplayer");
tab = m_process->menuName (); tab = m_process->menuName ();
} }
KDE_NO_EXPORT TQFrame * XMLPreferencesPage::prefPage (TQWidget * parent) { TDE_NO_EXPORT TQFrame * XMLPreferencesPage::prefPage (TQWidget * parent) {
m_configframe = new XMLPreferencesFrame (parent, m_process); m_configframe = new XMLPreferencesFrame (parent, m_process);
return m_configframe; return m_configframe;
} }
@ -1766,7 +1766,7 @@ KDE_NO_CDTOR_EXPORT GStreamer::GStreamer (TQObject * parent, Settings * settings
KDE_NO_CDTOR_EXPORT GStreamer::~GStreamer () {} KDE_NO_CDTOR_EXPORT GStreamer::~GStreamer () {}
KDE_NO_EXPORT bool GStreamer::ready (Viewer * viewer) { TDE_NO_EXPORT bool GStreamer::ready (Viewer * viewer) {
initProcess (viewer); initProcess (viewer);
viewer->changeProtocol (QXEmbed::XPLAIN); viewer->changeProtocol (QXEmbed::XPLAIN);
m_request_seek = -1; m_request_seek = -1;
@ -1816,7 +1816,7 @@ FFMpeg::FFMpeg (TQObject * parent, Settings * settings)
KDE_NO_CDTOR_EXPORT FFMpeg::~FFMpeg () { KDE_NO_CDTOR_EXPORT FFMpeg::~FFMpeg () {
} }
KDE_NO_EXPORT void FFMpeg::init () { TDE_NO_EXPORT void FFMpeg::init () {
} }
bool FFMpeg::deMediafiedPlay () { bool FFMpeg::deMediafiedPlay () {
@ -1867,7 +1867,7 @@ bool FFMpeg::deMediafiedPlay () {
return m_process->isRunning (); return m_process->isRunning ();
} }
KDE_NO_EXPORT bool FFMpeg::stop () { TDE_NO_EXPORT bool FFMpeg::stop () {
terminateJobs (); terminateJobs ();
if (!playing ()) return true; if (!playing ()) return true;
kdDebug () << "FFMpeg::stop" << endl; kdDebug () << "FFMpeg::stop" << endl;
@ -1875,7 +1875,7 @@ KDE_NO_EXPORT bool FFMpeg::stop () {
return true; return true;
} }
KDE_NO_EXPORT bool FFMpeg::quit () { TDE_NO_EXPORT bool FFMpeg::quit () {
stop (); stop ();
if (!playing ()) return true; if (!playing ()) return true;
TQTime t; TQTime t;
@ -1886,7 +1886,7 @@ KDE_NO_EXPORT bool FFMpeg::quit () {
return Process::quit (); return Process::quit ();
} }
KDE_NO_EXPORT void FFMpeg::processStopped (TDEProcess *) { TDE_NO_EXPORT void FFMpeg::processStopped (TDEProcess *) {
setState (NotRunning); setState (NotRunning);
} }
@ -2014,7 +2014,7 @@ KDE_NO_CDTOR_EXPORT NpStream::~NpStream () {
close (); close ();
} }
KDE_NO_EXPORT void NpStream::open () { TDE_NO_EXPORT void NpStream::open () {
kdDebug () << "NpStream " << stream_id << " open " << url.url () << endl; kdDebug () << "NpStream " << stream_id << " open " << url.url () << endl;
if (url.url().startsWith ("javascript:")) { if (url.url().startsWith ("javascript:")) {
NpPlayer *npp = static_cast <NpPlayer *> (parent ()); NpPlayer *npp = static_cast <NpPlayer *> (parent ());
@ -2046,7 +2046,7 @@ KDE_NO_EXPORT void NpStream::open () {
} }
} }
KDE_NO_EXPORT void NpStream::close () { TDE_NO_EXPORT void NpStream::close () {
if (job) { if (job) {
job->kill (); // quiet, no result signal job->kill (); // quiet, no result signal
job = 0L; job = 0L;
@ -2055,14 +2055,14 @@ KDE_NO_EXPORT void NpStream::close () {
} }
} }
KDE_NO_EXPORT void NpStream::slotResult (TDEIO::Job *jb) { TDE_NO_EXPORT void NpStream::slotResult (TDEIO::Job *jb) {
kdDebug() << "slotResult " << bytes << " err:" << jb->error () << endl; kdDebug() << "slotResult " << bytes << " err:" << jb->error () << endl;
finish_reason = jb->error () ? BecauseError : BecauseDone; finish_reason = jb->error () ? BecauseError : BecauseDone;
job = 0L; // signal TDEIO::Job::result deletes itself job = 0L; // signal TDEIO::Job::result deletes itself
emit stateChanged (); emit stateChanged ();
} }
KDE_NO_EXPORT void NpStream::slotData (TDEIO::Job*, const TQByteArray& qb) { TDE_NO_EXPORT void NpStream::slotData (TDEIO::Job*, const TQByteArray& qb) {
pending_buf = qb; // we suspend job, so qb should be valid until resume pending_buf = qb; // we suspend job, so qb should be valid until resume
if (qb.size()) { if (qb.size()) {
job->suspend (); job->suspend ();
@ -2071,7 +2071,7 @@ KDE_NO_EXPORT void NpStream::slotData (TDEIO::Job*, const TQByteArray& qb) {
} }
} }
KDE_NO_EXPORT void NpStream::redirection (TDEIO::Job *, const KURL &u) { TDE_NO_EXPORT void NpStream::redirection (TDEIO::Job *, const KURL &u) {
url = u; url = u;
emit redirected (stream_id, url); emit redirected (stream_id, url);
} }
@ -2111,10 +2111,10 @@ KDE_NO_CDTOR_EXPORT NpPlayer::~NpPlayer () {
} }
} }
KDE_NO_EXPORT void NpPlayer::init () { TDE_NO_EXPORT void NpPlayer::init () {
} }
KDE_NO_EXPORT void NpPlayer::initProcess (Viewer * viewer) { TDE_NO_EXPORT void NpPlayer::initProcess (Viewer * viewer) {
Process::initProcess (viewer); Process::initProcess (viewer);
connect (m_process, TQ_SIGNAL (processExited (TDEProcess *)), connect (m_process, TQ_SIGNAL (processExited (TDEProcess *)),
this, TQ_SLOT (processStopped (TDEProcess *))); this, TQ_SLOT (processStopped (TDEProcess *)));
@ -2165,7 +2165,7 @@ KDE_NO_EXPORT void NpPlayer::initProcess (Viewer * viewer) {
} }
} }
KDE_NO_EXPORT bool NpPlayer::deMediafiedPlay () { TDE_NO_EXPORT bool NpPlayer::deMediafiedPlay () {
kdDebug() << "NpPlayer::play '" << m_url << "'" << endl; kdDebug() << "NpPlayer::play '" << m_url << "'" << endl;
// if we change from XPLAIN to XEMBED, the DestroyNotify may come later // if we change from XPLAIN to XEMBED, the DestroyNotify may come later
viewer ()->changeProtocol (QXEmbed::XEMBED); viewer ()->changeProtocol (QXEmbed::XEMBED);
@ -2249,7 +2249,7 @@ KDE_NO_EXPORT bool NpPlayer::deMediafiedPlay () {
return false; return false;
} }
KDE_NO_EXPORT bool NpPlayer::ready (Viewer * viewer) { TDE_NO_EXPORT bool NpPlayer::ready (Viewer * viewer) {
if (playing ()) if (playing ())
return true; // wait for callback return true; // wait for callback
initProcess (viewer); initProcess (viewer);
@ -2267,13 +2267,13 @@ KDE_NO_EXPORT bool NpPlayer::ready (Viewer * viewer) {
return m_process->isRunning (); return m_process->isRunning ();
} }
KDE_NO_EXPORT void NpPlayer::setStarted (const TQString & srv) { TDE_NO_EXPORT void NpPlayer::setStarted (const TQString & srv) {
remote_service = srv; remote_service = srv;
kdDebug () << "NpPlayer::setStarted " << srv << endl; kdDebug () << "NpPlayer::setStarted " << srv << endl;
setState (Ready); setState (Ready);
} }
KDE_NO_EXPORT TQString NpPlayer::evaluateScript (const TQString & script) { TDE_NO_EXPORT TQString NpPlayer::evaluateScript (const TQString & script) {
TQString result; TQString result;
emit evaluate (script, result); emit evaluate (script, result);
//kdDebug () << "evaluateScript " << script << " => " << result << endl; //kdDebug () << "evaluateScript " << script << " => " << result << endl;
@ -2295,7 +2295,7 @@ static int getStreamId (const TQString &path) {
return sid; return sid;
} }
KDE_NO_EXPORT TDE_NO_EXPORT
void NpPlayer::requestStream (const TQString &path, const TQString & url, const TQString & target) { void NpPlayer::requestStream (const TQString &path, const TQString & url, const TQString & target) {
KURL uri (m_base_url.isEmpty () ? m_url : m_base_url, url); KURL uri (m_base_url.isEmpty () ? m_url : m_base_url, url);
kdDebug () << "NpPlayer::request " << path << " '" << uri << "'" << endl; kdDebug () << "NpPlayer::request " << path << " '" << uri << "'" << endl;
@ -2327,7 +2327,7 @@ void NpPlayer::requestStream (const TQString &path, const TQString & url, const
} }
} }
KDE_NO_EXPORT void NpPlayer::destroyStream (const TQString &s) { TDE_NO_EXPORT void NpPlayer::destroyStream (const TQString &s) {
int sid = getStreamId (s); int sid = getStreamId (s);
if (sid >= 0 && streams.contains ((TQ_UINT32) sid)) { if (sid >= 0 && streams.contains ((TQ_UINT32) sid)) {
NpStream *ns = streams[(TQ_UINT32) sid]; NpStream *ns = streams[(TQ_UINT32) sid];
@ -2339,7 +2339,7 @@ KDE_NO_EXPORT void NpPlayer::destroyStream (const TQString &s) {
} }
} }
KDE_NO_EXPORT TDE_NO_EXPORT
void NpPlayer::sendFinish (TQ_UINT32 sid, TQ_UINT32 bytes, NpStream::Reason because) { void NpPlayer::sendFinish (TQ_UINT32 sid, TQ_UINT32 bytes, NpStream::Reason because) {
if (playing () && dbus_static->dbus_connnection) { if (playing () && dbus_static->dbus_connnection) {
TQ_UINT32 reason = (int) because; TQ_UINT32 reason = (int) because;
@ -2360,7 +2360,7 @@ void NpPlayer::sendFinish (TQ_UINT32 sid, TQ_UINT32 bytes, NpStream::Reason beca
} }
} }
KDE_NO_EXPORT void NpPlayer::terminateJobs () { TDE_NO_EXPORT void NpPlayer::terminateJobs () {
Process::terminateJobs (); Process::terminateJobs ();
const StreamMap::iterator e = streams.end (); const StreamMap::iterator e = streams.end ();
for (StreamMap::iterator i = streams.begin (); i != e; ++i) for (StreamMap::iterator i = streams.begin (); i != e; ++i)
@ -2368,7 +2368,7 @@ KDE_NO_EXPORT void NpPlayer::terminateJobs () {
streams.clear (); streams.clear ();
} }
KDE_NO_EXPORT bool NpPlayer::stop () { TDE_NO_EXPORT bool NpPlayer::stop () {
terminateJobs (); terminateJobs ();
if (!playing ()) return true; if (!playing ()) return true;
kdDebug () << "NpPlayer::stop " << endl; kdDebug () << "NpPlayer::stop " << endl;
@ -2386,7 +2386,7 @@ KDE_NO_EXPORT bool NpPlayer::stop () {
return true; return true;
} }
KDE_NO_EXPORT bool NpPlayer::quit () { TDE_NO_EXPORT bool NpPlayer::quit () {
if (playing ()) { if (playing ()) {
stop (); stop ();
TQTime t; TQTime t;
@ -2399,25 +2399,25 @@ KDE_NO_EXPORT bool NpPlayer::quit () {
return true; return true;
} }
KDE_NO_EXPORT void NpPlayer::processOutput (TDEProcess *, char * str, int slen) { TDE_NO_EXPORT void NpPlayer::processOutput (TDEProcess *, char * str, int slen) {
if (viewer () && slen > 0) if (viewer () && slen > 0)
viewer ()->view ()->addText (TQString::fromLocal8Bit (str, slen)); viewer ()->view ()->addText (TQString::fromLocal8Bit (str, slen));
} }
KDE_NO_EXPORT void NpPlayer::processStopped (TDEProcess *) { TDE_NO_EXPORT void NpPlayer::processStopped (TDEProcess *) {
terminateJobs (); terminateJobs ();
if (m_source) if (m_source)
((PlayListNotify *) m_source)->setInfoMessage (TQString ()); ((PlayListNotify *) m_source)->setInfoMessage (TQString ());
setState (NotRunning); setState (NotRunning);
} }
KDE_NO_EXPORT void NpPlayer::streamStateChanged () { TDE_NO_EXPORT void NpPlayer::streamStateChanged () {
setState (Playing); // hmm, this doesn't really fit in current states setState (Playing); // hmm, this doesn't really fit in current states
if (!write_in_progress) if (!write_in_progress)
processStreams (); processStreams ();
} }
KDE_NO_EXPORT void NpPlayer::streamRedirected (TQ_UINT32 sid, const KURL &u) { TDE_NO_EXPORT void NpPlayer::streamRedirected (TQ_UINT32 sid, const KURL &u) {
if (playing () && dbus_static->dbus_connnection) { if (playing () && dbus_static->dbus_connnection) {
kdDebug() << "redirected " << sid << " to " << u.url() << endl; kdDebug() << "redirected " << sid << " to " << u.url() << endl;
char *cu = strdup (u.url ().local8Bit().data ()); char *cu = strdup (u.url ().local8Bit().data ());
@ -2436,7 +2436,7 @@ KDE_NO_EXPORT void NpPlayer::streamRedirected (TQ_UINT32 sid, const KURL &u) {
} }
} }
KDE_NO_EXPORT void NpPlayer::processStreams () { TDE_NO_EXPORT void NpPlayer::processStreams () {
NpStream *stream = 0L; NpStream *stream = 0L;
TQ_UINT32 stream_id; TQ_UINT32 stream_id;
timeval tv = { 0x7fffffff, 0 }; timeval tv = { 0x7fffffff, 0 };
@ -2520,13 +2520,13 @@ KDE_NO_EXPORT void NpPlayer::processStreams () {
} }
} }
KDE_NO_EXPORT void NpPlayer::wroteStdin (TDEProcess *) { TDE_NO_EXPORT void NpPlayer::wroteStdin (TDEProcess *) {
write_in_progress = false; write_in_progress = false;
if (playing ()) if (playing ())
processStreams (); processStreams ();
} }
KDE_NO_EXPORT TQString NpPlayer::menuName () const { TDE_NO_EXPORT TQString NpPlayer::menuName () const {
return i18n ("&Ice Ape"); return i18n ("&Ice Ape");
} }
@ -2547,20 +2547,20 @@ KDE_NO_CDTOR_EXPORT
NpPlayer::NpPlayer (TQObject * parent, Settings * settings, const TQString &) NpPlayer::NpPlayer (TQObject * parent, Settings * settings, const TQString &)
: Process (parent, settings, "npp") {} : Process (parent, settings, "npp") {}
KDE_NO_CDTOR_EXPORT NpPlayer::~NpPlayer () {} KDE_NO_CDTOR_EXPORT NpPlayer::~NpPlayer () {}
KDE_NO_EXPORT void NpPlayer::init () {} TDE_NO_EXPORT void NpPlayer::init () {}
KDE_NO_EXPORT bool NpPlayer::deMediafiedPlay () { return false; } TDE_NO_EXPORT bool NpPlayer::deMediafiedPlay () { return false; }
KDE_NO_EXPORT void NpPlayer::initProcess (Viewer *) {} TDE_NO_EXPORT void NpPlayer::initProcess (Viewer *) {}
KDE_NO_EXPORT TQString NpPlayer::menuName () const { return TQString (); } TDE_NO_EXPORT TQString NpPlayer::menuName () const { return TQString (); }
KDE_NO_EXPORT void NpPlayer::setStarted (const TQString &) {} TDE_NO_EXPORT void NpPlayer::setStarted (const TQString &) {}
KDE_NO_EXPORT bool NpPlayer::stop () { return false; } TDE_NO_EXPORT bool NpPlayer::stop () { return false; }
KDE_NO_EXPORT bool NpPlayer::quit () { return false; } TDE_NO_EXPORT bool NpPlayer::quit () { return false; }
KDE_NO_EXPORT bool NpPlayer::ready (Viewer *) { return false; } TDE_NO_EXPORT bool NpPlayer::ready (Viewer *) { return false; }
KDE_NO_EXPORT void NpPlayer::processOutput (TDEProcess *, char *, int) {} TDE_NO_EXPORT void NpPlayer::processOutput (TDEProcess *, char *, int) {}
KDE_NO_EXPORT void NpPlayer::processStopped (TDEProcess *) {} TDE_NO_EXPORT void NpPlayer::processStopped (TDEProcess *) {}
KDE_NO_EXPORT void NpPlayer::wroteStdin (TDEProcess *) {} TDE_NO_EXPORT void NpPlayer::wroteStdin (TDEProcess *) {}
KDE_NO_EXPORT void NpPlayer::streamStateChanged () {} TDE_NO_EXPORT void NpPlayer::streamStateChanged () {}
KDE_NO_EXPORT void NpPlayer::streamRedirected (TQ_UINT32, const KURL &) {} TDE_NO_EXPORT void NpPlayer::streamRedirected (TQ_UINT32, const KURL &) {}
KDE_NO_EXPORT void NpPlayer::terminateJobs () {} TDE_NO_EXPORT void NpPlayer::terminateJobs () {}
#endif #endif

20
src/kmplayerprocess.h
Unescape View File

@ -68,8 +68,8 @@ public:
virtual void setAudioLang (int, const TQString &); virtual void setAudioLang (int, const TQString &);
virtual void setSubtitle (int, const TQString &); virtual void setSubtitle (int, const TQString &);
bool playing () const; bool playing () const;
KDE_NO_EXPORT TDEProcess * process () const { return m_process; } TDE_NO_EXPORT TDEProcess * process () const { return m_process; }
KDE_NO_EXPORT Source * source () const { return m_source; } TDE_NO_EXPORT Source * source () const { return m_source; }
virtual WId widget (); virtual WId widget ();
Viewer * viewer () const; Viewer * viewer () const;
void setSource (Source * src) { m_source = src; } void setSource (Source * src) { m_source = src; }
@ -144,7 +144,7 @@ class MPlayerPreferencesFrame;
/* /*
* MPlayer process * MPlayer process
*/ */
class KDE_EXPORT MPlayer : public MPlayerBase { class TDE_EXPORT MPlayer : public MPlayerBase {
TQ_OBJECT TQ_OBJECT
public: public:
@ -226,8 +226,8 @@ private:
*/ */
class KMPLAYER_EXPORT Recorder { class KMPLAYER_EXPORT Recorder {
public: public:
KDE_NO_EXPORT const KURL & recordURL () const { return m_recordurl; } TDE_NO_EXPORT const KURL & recordURL () const { return m_recordurl; }
KDE_NO_EXPORT void setURL (const KURL & url) { m_recordurl = url; } TDE_NO_EXPORT void setURL (const KURL & url) { m_recordurl = url; }
protected: protected:
KURL m_recordurl; KURL m_recordurl;
}; };
@ -288,8 +288,8 @@ public:
virtual void setSubtitle (int, const TQString &); virtual void setSubtitle (int, const TQString &);
virtual TQString menuName () const; virtual TQString menuName () const;
virtual WId widget (); virtual WId widget ();
KDE_NO_EXPORT TQByteArray & configData () { return m_configdata; } TDE_NO_EXPORT TQByteArray & configData () { return m_configdata; }
KDE_NO_EXPORT bool haveConfig () { return m_have_config == config_yes; } TDE_NO_EXPORT bool haveConfig () { return m_have_config == config_yes; }
bool getConfigData (); bool getConfigData ();
void setChangedData (const TQByteArray &); void setChangedData (const TQByteArray &);
TQString dcopName (); TQString dcopName ();
@ -471,9 +471,9 @@ public:
void requestStream (const TQString & path, const TQString & url, const TQString & target); void requestStream (const TQString & path, const TQString & url, const TQString & target);
void destroyStream (const TQString & path); void destroyStream (const TQString & path);
KDE_NO_EXPORT const TQString & destination () const { return service; } TDE_NO_EXPORT const TQString & destination () const { return service; }
KDE_NO_EXPORT const TQString & interface () const { return iface; } TDE_NO_EXPORT const TQString & interface () const { return iface; }
KDE_NO_EXPORT TQString objectPath () const { return path; } TDE_NO_EXPORT TQString objectPath () const { return path; }
TQString evaluateScript (const TQString & scr); TQString evaluateScript (const TQString & scr);
signals: signals:
void evaluate (const TQString & scr, TQString & result); void evaluate (const TQString & scr, TQString & result);

46
src/kmplayersource.h
Unescape View File

@ -52,31 +52,31 @@ public:
virtual bool hasLength (); virtual bool hasLength ();
virtual bool isSeekable (); virtual bool isSeekable ();
KDE_NO_EXPORT int width () const { return m_width; } TDE_NO_EXPORT int width () const { return m_width; }
KDE_NO_EXPORT int height () const { return m_height; } TDE_NO_EXPORT int height () const { return m_height; }
virtual void dimensions (int & w, int & h) { w = m_width; h = m_height; } virtual void dimensions (int & w, int & h) { w = m_width; h = m_height; }
/* length () returns length in deci-seconds */ /* length () returns length in deci-seconds */
KDE_NO_EXPORT int length () const { return m_length; } TDE_NO_EXPORT int length () const { return m_length; }
/* position () returns position in deci-seconds */ /* position () returns position in deci-seconds */
KDE_NO_EXPORT int position () const { return m_position; } TDE_NO_EXPORT int position () const { return m_position; }
KDE_NO_EXPORT float aspect () const { return m_aspect; } TDE_NO_EXPORT float aspect () const { return m_aspect; }
KDE_NO_EXPORT const KURL & url () const { return m_url; } TDE_NO_EXPORT const KURL & url () const { return m_url; }
KDE_NO_EXPORT const KURL & subUrl () const { return m_sub_url; } TDE_NO_EXPORT const KURL & subUrl () const { return m_sub_url; }
PartBase * player () { return m_player; } PartBase * player () { return m_player; }
virtual void reset (); virtual void reset ();
TQString currentMrl (); TQString currentMrl ();
KDE_NO_EXPORT const TQString & audioDevice () const { return m_audiodevice; } TDE_NO_EXPORT const TQString & audioDevice () const { return m_audiodevice; }
KDE_NO_EXPORT const TQString & videoDevice () const { return m_videodevice; } TDE_NO_EXPORT const TQString & videoDevice () const { return m_videodevice; }
KDE_NO_EXPORT const TQString & videoNorm () const { return m_videonorm; } TDE_NO_EXPORT const TQString & videoNorm () const { return m_videonorm; }
/* frequency() if set, returns frequency in kHz */ /* frequency() if set, returns frequency in kHz */
KDE_NO_EXPORT int frequency () const { return m_frequency; } TDE_NO_EXPORT int frequency () const { return m_frequency; }
KDE_NO_EXPORT int xvPort () const { return m_xvport; } TDE_NO_EXPORT int xvPort () const { return m_xvport; }
KDE_NO_EXPORT int xvEncoding () const { return m_xvencoding; } TDE_NO_EXPORT int xvEncoding () const { return m_xvencoding; }
KDE_NO_EXPORT const TQString & pipeCmd () const { return m_pipecmd; } TDE_NO_EXPORT const TQString & pipeCmd () const { return m_pipecmd; }
KDE_NO_EXPORT const TQString & options () const { return m_options; } TDE_NO_EXPORT const TQString & options () const { return m_options; }
KDE_NO_EXPORT const TQString & recordCmd () const { return m_recordcmd; } TDE_NO_EXPORT const TQString & recordCmd () const { return m_recordcmd; }
KDE_NO_EXPORT const TQString & tuner () const { return m_tuner; } TDE_NO_EXPORT const TQString & tuner () const { return m_tuner; }
KDE_NO_EXPORT NodePtr current () const { return m_current; } TDE_NO_EXPORT NodePtr current () const { return m_current; }
TQString plugin (const TQString &mime) const; TQString plugin (const TQString &mime) const;
virtual NodePtr document (); virtual NodePtr document ();
virtual NodePtr root (); virtual NodePtr root ();
@ -84,10 +84,10 @@ public:
virtual void setURL (const KURL & url); virtual void setURL (const KURL & url);
void insertURL (NodePtr mrl, const TQString & url, const TQString & title=TQString()); void insertURL (NodePtr mrl, const TQString & url, const TQString & title=TQString());
KDE_NO_EXPORT void setSubURL (const KURL & url) { m_sub_url = url; } TDE_NO_EXPORT void setSubURL (const KURL & url) { m_sub_url = url; }
void setLanguages (const TQStringList & alang, const TQStringList & slang); void setLanguages (const TQStringList & alang, const TQStringList & slang);
KDE_NO_EXPORT void setWidth (int w) { m_width = w; } TDE_NO_EXPORT void setWidth (int w) { m_width = w; }
KDE_NO_EXPORT void setHeight (int h) { m_height = h; } TDE_NO_EXPORT void setHeight (int h) { m_height = h; }
virtual void setDimensions (NodePtr, int w, int h); virtual void setDimensions (NodePtr, int w, int h);
virtual void setAspect (NodePtr, float a); virtual void setAspect (NodePtr, float a);
/* setLength (len) set length in deci-seconds */ /* setLength (len) set length in deci-seconds */
@ -97,8 +97,8 @@ public:
virtual void setIdentified (bool b = true); virtual void setIdentified (bool b = true);
// backend process state changed // backend process state changed
virtual void stateChange (Process *, Process::State os, Process::State ns); virtual void stateChange (Process *, Process::State os, Process::State ns);
KDE_NO_EXPORT void setAutoPlay (bool b) { m_auto_play = b; } TDE_NO_EXPORT void setAutoPlay (bool b) { m_auto_play = b; }
KDE_NO_EXPORT bool autoPlay () const { return m_auto_play; } TDE_NO_EXPORT bool autoPlay () const { return m_auto_play; }
void setTitle (const TQString & title); void setTitle (const TQString & title);
void setLoading (int percentage); void setLoading (int percentage);
bool setCurrent (NodePtr mrl); bool setCurrent (NodePtr mrl);

96
src/kmplayertvsource.cpp
Unescape View File

@ -135,7 +135,7 @@ KDE_NO_CDTOR_EXPORT TVDevicePage::TVDevicePage (TQWidget *parent, KMPlayer::Node
layout->addLayout (buttonlayout); layout->addLayout (buttonlayout);
} }
KDE_NO_EXPORT void TVDevicePage::slotDelete () { TDE_NO_EXPORT void TVDevicePage::slotDelete () {
if (KMessageBox::warningYesNo (this, i18n ("You are about to remove this device from the Source menu.\nContinue?"), i18n ("Confirm")) == KMessageBox::Yes) if (KMessageBox::warningYesNo (this, i18n ("You are about to remove this device from the Source menu.\nContinue?"), i18n ("Confirm")) == KMessageBox::Yes)
emit deleted (this); emit deleted (this);
} }
@ -170,7 +170,7 @@ KDE_NO_CDTOR_EXPORT KMPlayerPrefSourcePageTV::KMPlayerPrefSourcePageTV (TQWidget
notebook->insertTab (general, i18n ("General")); notebook->insertTab (general, i18n ("General"));
} }
KDE_NO_EXPORT void KMPlayerPrefSourcePageTV::showEvent (TQShowEvent *) { TDE_NO_EXPORT void KMPlayerPrefSourcePageTV::showEvent (TQShowEvent *) {
m_tvsource->readXML (); m_tvsource->readXML ();
} }
@ -181,7 +181,7 @@ KDE_NO_CDTOR_EXPORT TVNode::TVNode (KMPlayer::NodePtr &d, const TQString & s, co
editable = true; editable = true;
} }
KDE_NO_EXPORT void TVNode::setNodeName (const TQString & nn) { TDE_NO_EXPORT void TVNode::setNodeName (const TQString & nn) {
pretty_name = nn; pretty_name = nn;
setAttribute (KMPlayer::StringPool::attr_name, nn); setAttribute (KMPlayer::StringPool::attr_name, nn);
} }
@ -196,7 +196,7 @@ KDE_NO_CDTOR_EXPORT TVChannel::TVChannel (KMPlayer::NodePtr & d, const TQString
KDE_NO_CDTOR_EXPORT TVChannel::TVChannel (KMPlayer::NodePtr & d) : TVNode (d, TQString ("tv://"), "channel", id_node_tv_channel) { KDE_NO_CDTOR_EXPORT TVChannel::TVChannel (KMPlayer::NodePtr & d) : TVNode (d, TQString ("tv://"), "channel", id_node_tv_channel) {
} }
KDE_NO_EXPORT void TVChannel::closed () { TDE_NO_EXPORT void TVChannel::closed () {
pretty_name = getAttribute (KMPlayer::StringPool::attr_name); pretty_name = getAttribute (KMPlayer::StringPool::attr_name);
} }
@ -211,7 +211,7 @@ TVInput::TVInput (KMPlayer::NodePtr & d, const TQString & n, int id)
KDE_NO_CDTOR_EXPORT TVInput::TVInput (KMPlayer::NodePtr & d) : TVNode (d, TQString ("tv://"), "input", id_node_tv_input) { KDE_NO_CDTOR_EXPORT TVInput::TVInput (KMPlayer::NodePtr & d) : TVNode (d, TQString ("tv://"), "input", id_node_tv_input) {
} }
KDE_NO_EXPORT KMPlayer::NodePtr TVInput::childFromTag (const TQString & tag) { TDE_NO_EXPORT KMPlayer::NodePtr TVInput::childFromTag (const TQString & tag) {
// kdDebug () << nodeName () << " childFromTag " << tag << endl; // kdDebug () << nodeName () << " childFromTag " << tag << endl;
if (tag == TQString::fromLatin1 ("channel")) { if (tag == TQString::fromLatin1 ("channel")) {
return new TVChannel (m_doc); return new TVChannel (m_doc);
@ -219,11 +219,11 @@ KDE_NO_EXPORT KMPlayer::NodePtr TVInput::childFromTag (const TQString & tag) {
return 0L; return 0L;
} }
KDE_NO_EXPORT void TVInput::closed () { TDE_NO_EXPORT void TVInput::closed () {
//pretty_name = getAttribute (KMPlayer::StringPool::attr_name); //pretty_name = getAttribute (KMPlayer::StringPool::attr_name);
} }
KDE_NO_EXPORT void TVInput::setNodeName (const TQString & name) { TDE_NO_EXPORT void TVInput::setNodeName (const TQString & name) {
Node * p = parentNode ().ptr (); Node * p = parentNode ().ptr ();
TQString nm (name); TQString nm (name);
if (p && p->id == id_node_tv_device) { if (p && p->id == id_node_tv_device) {
@ -250,27 +250,27 @@ KDE_NO_CDTOR_EXPORT TVDevice::~TVDevice () {
device_page->deleteLater (); device_page->deleteLater ();
} }
KDE_NO_EXPORT KMPlayer::NodePtr TVDevice::childFromTag (const TQString & tag) { TDE_NO_EXPORT KMPlayer::NodePtr TVDevice::childFromTag (const TQString & tag) {
// kdDebug () << nodeName () << " childFromTag " << tag << endl; // kdDebug () << nodeName () << " childFromTag " << tag << endl;
if (tag == TQString::fromLatin1 ("input")) if (tag == TQString::fromLatin1 ("input"))
return new TVInput (m_doc); return new TVInput (m_doc);
return 0L; return 0L;
} }
KDE_NO_EXPORT void TVDevice::closed () { TDE_NO_EXPORT void TVDevice::closed () {
updateNodeName (); updateNodeName ();
} }
KDE_NO_EXPORT void TVDevice::childDone (KMPlayer::NodePtr) { TDE_NO_EXPORT void TVDevice::childDone (KMPlayer::NodePtr) {
finish (); finish ();
} }
KDE_NO_EXPORT void TVDevice::setNodeName (const TQString & name) { TDE_NO_EXPORT void TVDevice::setNodeName (const TQString & name) {
TVNode::setNodeName (name); TVNode::setNodeName (name);
updateNodeName (); updateNodeName ();
} }
KDE_NO_EXPORT void TVDevice::updateNodeName () { TDE_NO_EXPORT void TVDevice::updateNodeName () {
pretty_name = getAttribute (KMPlayer::StringPool::attr_name); pretty_name = getAttribute (KMPlayer::StringPool::attr_name);
src = getAttribute ("path"); src = getAttribute ("path");
for (KMPlayer::NodePtr c = firstChild (); c; c = c->nextSibling ()) for (KMPlayer::NodePtr c = firstChild (); c; c = c->nextSibling ())
@ -281,7 +281,7 @@ KDE_NO_EXPORT void TVDevice::updateNodeName () {
} }
} }
KDE_NO_EXPORT void TVDevice::updateDevicePage () { TDE_NO_EXPORT void TVDevice::updateDevicePage () {
if (!device_page) if (!device_page)
return; return;
pretty_name = device_page->name->text (); pretty_name = device_page->name->text ();
@ -321,18 +321,18 @@ TVDocument::TVDocument (KMPlayerTVSource * source)
pretty_name = i18n ("Television"); pretty_name = i18n ("Television");
} }
KDE_NO_EXPORT KMPlayer::NodePtr TVDocument::childFromTag (const TQString & tag) { TDE_NO_EXPORT KMPlayer::NodePtr TVDocument::childFromTag (const TQString & tag) {
// kdDebug () << nodeName () << " childFromTag " << tag << endl; // kdDebug () << nodeName () << " childFromTag " << tag << endl;
if (tag == TQString::fromLatin1 ("device")) if (tag == TQString::fromLatin1 ("device"))
return new TVDevice (m_doc); return new TVDevice (m_doc);
return FileDocument::childFromTag (tag); return FileDocument::childFromTag (tag);
} }
KDE_NO_EXPORT void TVDocument::childDone (KMPlayer::NodePtr) { TDE_NO_EXPORT void TVDocument::childDone (KMPlayer::NodePtr) {
finish (); finish ();
} }
KDE_NO_EXPORT void TVDocument::defer () { TDE_NO_EXPORT void TVDocument::defer () {
if (!resolved) { if (!resolved) {
resolved = true; resolved = true;
readFromFile (locateLocal ("data", "kmplayer/tv.xml")); readFromFile (locateLocal ("data", "kmplayer/tv.xml"));
@ -354,7 +354,7 @@ KDE_NO_CDTOR_EXPORT KMPlayerTVSource::KMPlayerTVSource (KMPlayerApp * a, TQPopup
KDE_NO_CDTOR_EXPORT KMPlayerTVSource::~KMPlayerTVSource () { KDE_NO_CDTOR_EXPORT KMPlayerTVSource::~KMPlayerTVSource () {
} }
KDE_NO_EXPORT void KMPlayerTVSource::activate () { TDE_NO_EXPORT void KMPlayerTVSource::activate () {
m_identified = true; m_identified = true;
if (m_player->settings ()->showbroadcastbutton) if (m_player->settings ()->showbroadcastbutton)
m_app->view()->controlPanel()->broadcastButton ()->show (); m_app->view()->controlPanel()->broadcastButton ()->show ();
@ -386,13 +386,13 @@ KDE_NO_EXPORT void KMPlayerTVSource::activate () {
* ffmpeg -vd /dev/video0 -r 25 -s 768x576 -f rawvideo - |mplayer -nocache -ao arts -rawvideo on:w=768:h=576:fps=25 -quiet - * ffmpeg -vd /dev/video0 -r 25 -s 768x576 -f rawvideo - |mplayer -nocache -ao arts -rawvideo on:w=768:h=576:fps=25 -quiet -
*/ */
KDE_NO_EXPORT void KMPlayerTVSource::deactivate () { TDE_NO_EXPORT void KMPlayerTVSource::deactivate () {
if (m_player->view () && !m_app->view ()->controlPanel()->broadcastButton ()->isOn ()) if (m_player->view () && !m_app->view ()->controlPanel()->broadcastButton ()->isOn ())
m_app->view ()->controlPanel()->broadcastButton ()->hide (); m_app->view ()->controlPanel()->broadcastButton ()->hide ();
reset (); reset ();
} }
KDE_NO_EXPORT void KMPlayerTVSource::buildMenu () { TDE_NO_EXPORT void KMPlayerTVSource::buildMenu () {
m_menu->clear (); m_menu->clear ();
int counter = 0; int counter = 0;
for (KMPlayer::NodePtr dp = m_document->firstChild (); dp; dp = dp->nextSibling ()) for (KMPlayer::NodePtr dp = m_document->firstChild (); dp; dp = dp->nextSibling ())
@ -400,7 +400,7 @@ KDE_NO_EXPORT void KMPlayerTVSource::buildMenu () {
m_menu->insertItem (KMPlayer::convertNode <TVDevice> (dp)->pretty_name, this, TQ_SLOT (menuClicked (int)), 0, counter++); m_menu->insertItem (KMPlayer::convertNode <TVDevice> (dp)->pretty_name, this, TQ_SLOT (menuClicked (int)), 0, counter++);
} }
KDE_NO_EXPORT void KMPlayerTVSource::menuAboutToShow () { TDE_NO_EXPORT void KMPlayerTVSource::menuAboutToShow () {
readXML (); readXML ();
} }
@ -426,11 +426,11 @@ void KMPlayerTVSource::jump (KMPlayer::NodePtr e) {
} }
} }
KDE_NO_EXPORT KMPlayer::NodePtr KMPlayerTVSource::root () { TDE_NO_EXPORT KMPlayer::NodePtr KMPlayerTVSource::root () {
return m_cur_tvinput; return m_cur_tvinput;
} }
KDE_NO_EXPORT void KMPlayerTVSource::buildArguments () { TDE_NO_EXPORT void KMPlayerTVSource::buildArguments () {
TVChannel * channel = 0L; TVChannel * channel = 0L;
TVInput * input = 0L; TVInput * input = 0L;
KMPlayer::NodePtr elm = m_current; KMPlayer::NodePtr elm = m_current;
@ -483,7 +483,7 @@ KDE_NO_EXPORT void KMPlayerTVSource::buildArguments () {
m_recordcmd.sprintf ("-tv on:%s:driver=%s:%s:width=%d:height=%d", m_audiodevice.isEmpty () ? "noaudio" : (TQString ("forceaudio:adevice=") + m_audiodevice).ascii(), tvdriver.ascii (), command.ascii (), width (), height ()); m_recordcmd.sprintf ("-tv on:%s:driver=%s:%s:width=%d:height=%d", m_audiodevice.isEmpty () ? "noaudio" : (TQString ("forceaudio:adevice=") + m_audiodevice).ascii(), tvdriver.ascii (), command.ascii (), width (), height ());
} }
KDE_NO_EXPORT void KMPlayerTVSource::playCurrent () { TDE_NO_EXPORT void KMPlayerTVSource::playCurrent () {
buildArguments (); buildArguments ();
if (m_app->broadcasting ()) if (m_app->broadcasting ())
TQTimer::singleShot (0, m_app->broadcastConfig (), TQ_SLOT (startFeed ())); TQTimer::singleShot (0, m_app->broadcastConfig (), TQ_SLOT (startFeed ()));
@ -491,7 +491,7 @@ KDE_NO_EXPORT void KMPlayerTVSource::playCurrent () {
KMPlayer::Source::playCurrent (); KMPlayer::Source::playCurrent ();
} }
KDE_NO_EXPORT void KMPlayerTVSource::menuClicked (int id) { TDE_NO_EXPORT void KMPlayerTVSource::menuClicked (int id) {
KMPlayer::NodePtr elm = m_document->firstChild (); KMPlayer::NodePtr elm = m_document->firstChild ();
for (; id > 0; --id, elm = elm->nextSibling ()) for (; id > 0; --id, elm = elm->nextSibling ())
; ;
@ -501,28 +501,28 @@ KDE_NO_EXPORT void KMPlayerTVSource::menuClicked (int id) {
m_player->setSource (this); m_player->setSource (this);
} }
KDE_NO_EXPORT TQString KMPlayerTVSource::filterOptions () { TDE_NO_EXPORT TQString KMPlayerTVSource::filterOptions () {
if (! m_player->settings ()->disableppauto) if (! m_player->settings ()->disableppauto)
return KMPlayer::Source::filterOptions (); return KMPlayer::Source::filterOptions ();
return TQString ("-vf pp=lb"); return TQString ("-vf pp=lb");
} }
KDE_NO_EXPORT bool KMPlayerTVSource::hasLength () { TDE_NO_EXPORT bool KMPlayerTVSource::hasLength () {
return false; return false;
} }
KDE_NO_EXPORT bool KMPlayerTVSource::isSeekable () { TDE_NO_EXPORT bool KMPlayerTVSource::isSeekable () {
return true; return true;
} }
KDE_NO_EXPORT TQString KMPlayerTVSource::prettyName () { TDE_NO_EXPORT TQString KMPlayerTVSource::prettyName () {
TQString name (i18n ("TV")); TQString name (i18n ("TV"));
//if (m_tvsource) //if (m_tvsource)
// name += ' ' + m_tvsource->title; // name += ' ' + m_tvsource->title;
return name; return name;
} }
KDE_NO_EXPORT void KMPlayerTVSource::write (TDEConfig * m_config) { TDE_NO_EXPORT void KMPlayerTVSource::write (TDEConfig * m_config) {
if (!config_read) return; if (!config_read) return;
m_config->setGroup (strTV); m_config->setGroup (strTV);
m_config->writeEntry (strTVDriver, tvdriver); m_config->writeEntry (strTVDriver, tvdriver);
@ -531,7 +531,7 @@ KDE_NO_EXPORT void KMPlayerTVSource::write (TDEConfig * m_config) {
kdDebug () << "KMPlayerTVSource::write XML" << endl; kdDebug () << "KMPlayerTVSource::write XML" << endl;
} }
KDE_NO_EXPORT void KMPlayerTVSource::readXML () { TDE_NO_EXPORT void KMPlayerTVSource::readXML () {
if (config_read) return; if (config_read) return;
config_read = true; config_read = true;
kdDebug () << "KMPlayerTVSource::readXML" << endl; kdDebug () << "KMPlayerTVSource::readXML" << endl;
@ -541,12 +541,12 @@ KDE_NO_EXPORT void KMPlayerTVSource::readXML () {
sync (false); sync (false);
} }
KDE_NO_EXPORT void KMPlayerTVSource::read (TDEConfig * m_config) { TDE_NO_EXPORT void KMPlayerTVSource::read (TDEConfig * m_config) {
m_config->setGroup (strTV); m_config->setGroup (strTV);
tvdriver = m_config->readEntry (strTVDriver, "v4l"); tvdriver = m_config->readEntry (strTVDriver, "v4l");
} }
KDE_NO_EXPORT void KMPlayerTVSource::sync (bool fromUI) { TDE_NO_EXPORT void KMPlayerTVSource::sync (bool fromUI) {
if (!m_configpage) return; if (!m_configpage) return;
if (m_document && m_document->hasChildNodes ()) if (m_document && m_document->hasChildNodes ())
m_app->showBroadcastConfig (); m_app->showBroadcastConfig ();
@ -565,13 +565,13 @@ KDE_NO_EXPORT void KMPlayerTVSource::sync (bool fromUI) {
} }
} }
KDE_NO_EXPORT void KMPlayerTVSource::prefLocation (TQString & item, TQString & icon, TQString & tab) { TDE_NO_EXPORT void KMPlayerTVSource::prefLocation (TQString & item, TQString & icon, TQString & tab) {
item = i18n ("Source"); item = i18n ("Source");
icon = TQString ("text-x-src"); icon = TQString ("text-x-src");
tab = i18n ("TV"); tab = i18n ("TV");
} }
KDE_NO_EXPORT TQFrame * KMPlayerTVSource::prefPage (TQWidget * parent) { TDE_NO_EXPORT TQFrame * KMPlayerTVSource::prefPage (TQWidget * parent) {
if (!m_configpage) { if (!m_configpage) {
m_configpage = new KMPlayerPrefSourcePageTV (parent, this); m_configpage = new KMPlayerPrefSourcePageTV (parent, this);
scanner = new TVDeviceScannerSource (this); scanner = new TVDeviceScannerSource (this);
@ -588,7 +588,7 @@ static bool hasTVDevice (KMPlayer::NodePtr doc, const TQString & devstr) {
return false; return false;
} }
KDE_NO_EXPORT void KMPlayerTVSource::slotScan () { TDE_NO_EXPORT void KMPlayerTVSource::slotScan () {
TQString devstr = m_configpage->device->lineEdit()->text (); TQString devstr = m_configpage->device->lineEdit()->text ();
if (!hasTVDevice(m_document, devstr)) { if (!hasTVDevice(m_document, devstr)) {
scanner->scan (devstr, m_configpage->driver->text()); scanner->scan (devstr, m_configpage->driver->text());
@ -599,7 +599,7 @@ KDE_NO_EXPORT void KMPlayerTVSource::slotScan () {
i18n ("Error")); i18n ("Error"));
} }
KDE_NO_EXPORT void KMPlayerTVSource::slotScanFinished (TVDevice * tvdevice) { TDE_NO_EXPORT void KMPlayerTVSource::slotScanFinished (TVDevice * tvdevice) {
disconnect (scanner, TQ_SIGNAL (scanFinished (TVDevice *)), disconnect (scanner, TQ_SIGNAL (scanFinished (TVDevice *)),
this, TQ_SLOT (slotScanFinished (TVDevice *))); this, TQ_SLOT (slotScanFinished (TVDevice *)));
if (tvdevice) { if (tvdevice) {
@ -609,7 +609,7 @@ KDE_NO_EXPORT void KMPlayerTVSource::slotScanFinished (TVDevice * tvdevice) {
KMessageBox::error(m_configpage,i18n("No device found."),i18n("Error")); KMessageBox::error(m_configpage,i18n("No device found."),i18n("Error"));
} }
KDE_NO_EXPORT void KMPlayerTVSource::addTVDevicePage(TVDevice *dev, bool show) { TDE_NO_EXPORT void KMPlayerTVSource::addTVDevicePage(TVDevice *dev, bool show) {
if (dev->device_page) if (dev->device_page)
dev->device_page->deleteLater (); dev->device_page->deleteLater ();
dev->device_page = new TVDevicePage (m_configpage->notebook, dev); dev->device_page = new TVDevicePage (m_configpage->notebook, dev);
@ -620,7 +620,7 @@ KDE_NO_EXPORT void KMPlayerTVSource::addTVDevicePage(TVDevice *dev, bool show) {
m_configpage->notebook->setCurrentPage (m_configpage->notebook->count ()-1); m_configpage->notebook->setCurrentPage (m_configpage->notebook->count ()-1);
} }
KDE_NO_EXPORT void KMPlayerTVSource::slotDeviceDeleted (TVDevicePage *devpage) { TDE_NO_EXPORT void KMPlayerTVSource::slotDeviceDeleted (TVDevicePage *devpage) {
m_document->removeChild (devpage->device_doc); m_document->removeChild (devpage->device_doc);
m_configpage->notebook->setCurrentPage (0); m_configpage->notebook->setCurrentPage (0);
} }
@ -631,10 +631,10 @@ KDE_NO_CDTOR_EXPORT TVDeviceScannerSource::TVDeviceScannerSource (KMPlayerTVSour
: KMPlayer::Source (i18n ("TVScanner"), src->player (), "tvscanner"), m_tvsource (src), m_tvdevice (0L) { : KMPlayer::Source (i18n ("TVScanner"), src->player (), "tvscanner"), m_tvsource (src), m_tvdevice (0L) {
} }
KDE_NO_EXPORT void TVDeviceScannerSource::init () { TDE_NO_EXPORT void TVDeviceScannerSource::init () {
} }
KDE_NO_EXPORT bool TVDeviceScannerSource::processOutput (const TQString & line) { TDE_NO_EXPORT bool TVDeviceScannerSource::processOutput (const TQString & line) {
if (m_nameRegExp.search (line) > -1) { if (m_nameRegExp.search (line) > -1) {
m_tvdevice->pretty_name = m_nameRegExp.cap (1); m_tvdevice->pretty_name = m_nameRegExp.cap (1);
m_tvdevice->setAttribute(KMPlayer::StringPool::attr_name,m_tvdevice->pretty_name); m_tvdevice->setAttribute(KMPlayer::StringPool::attr_name,m_tvdevice->pretty_name);
@ -661,19 +661,19 @@ KDE_NO_EXPORT bool TVDeviceScannerSource::processOutput (const TQString & line)
return true; return true;
} }
KDE_NO_EXPORT TQString TVDeviceScannerSource::filterOptions () { TDE_NO_EXPORT TQString TVDeviceScannerSource::filterOptions () {
return TQString (""); return TQString ("");
} }
KDE_NO_EXPORT bool TVDeviceScannerSource::hasLength () { TDE_NO_EXPORT bool TVDeviceScannerSource::hasLength () {
return false; return false;
} }
KDE_NO_EXPORT bool TVDeviceScannerSource::isSeekable () { TDE_NO_EXPORT bool TVDeviceScannerSource::isSeekable () {
return false; return false;
} }
KDE_NO_EXPORT bool TVDeviceScannerSource::scan (const TQString & dev, const TQString & dri) { TDE_NO_EXPORT bool TVDeviceScannerSource::scan (const TQString & dev, const TQString & dri) {
if (m_tvdevice) if (m_tvdevice)
return false; return false;
setURL (KURL ("tv://")); setURL (KURL ("tv://"));
@ -689,13 +689,13 @@ KDE_NO_EXPORT bool TVDeviceScannerSource::scan (const TQString & dev, const TQSt
return true; return true;
} }
KDE_NO_EXPORT void TVDeviceScannerSource::activate () { TDE_NO_EXPORT void TVDeviceScannerSource::activate () {
m_nameRegExp.setPattern ("Selected device:\\s*([^\\s].*)"); m_nameRegExp.setPattern ("Selected device:\\s*([^\\s].*)");
m_sizesRegExp.setPattern ("Supported sizes:\\s*([0-9]+)x([0-9]+) => ([0-9]+)x([0-9]+)"); m_sizesRegExp.setPattern ("Supported sizes:\\s*([0-9]+)x([0-9]+) => ([0-9]+)x([0-9]+)");
m_inputRegExp.setPattern ("\\s*([0-9]+):\\s*([^:]+):[^\\(]*\\(tuner:([01]),\\s*norm:([^\\)]+)\\)"); m_inputRegExp.setPattern ("\\s*([0-9]+):\\s*([^:]+):[^\\(]*\\(tuner:([01]),\\s*norm:([^\\)]+)\\)");
} }
KDE_NO_EXPORT void TVDeviceScannerSource::deactivate () { TDE_NO_EXPORT void TVDeviceScannerSource::deactivate () {
kdDebug () << "TVDeviceScannerSource::deactivate" << endl; kdDebug () << "TVDeviceScannerSource::deactivate" << endl;
if (m_tvdevice) { if (m_tvdevice) {
if (m_tvdevice->parentNode ()) if (m_tvdevice->parentNode ())
@ -705,7 +705,7 @@ KDE_NO_EXPORT void TVDeviceScannerSource::deactivate () {
} }
} }
KDE_NO_EXPORT void TVDeviceScannerSource::play () { TDE_NO_EXPORT void TVDeviceScannerSource::play () {
if (!m_tvdevice) if (!m_tvdevice)
return; return;
TQString args; TQString args;
@ -718,7 +718,7 @@ KDE_NO_EXPORT void TVDeviceScannerSource::play () {
deactivate (); deactivate ();
} }
KDE_NO_EXPORT void TVDeviceScannerSource::stateChange (KMPlayer::Process * p, KMPlayer::Process::State os, KMPlayer::Process::State ns) { TDE_NO_EXPORT void TVDeviceScannerSource::stateChange (KMPlayer::Process * p, KMPlayer::Process::State os, KMPlayer::Process::State ns) {
if (m_tvdevice && // can be deactivated if (m_tvdevice && // can be deactivated
ns == KMPlayer::Process::Ready && os > KMPlayer::Process::Ready) { ns == KMPlayer::Process::Ready && os > KMPlayer::Process::Ready) {
TVDevice * dev = 0L; TVDevice * dev = 0L;

2
src/kmplayertvsource.h
Unescape View File

@ -137,7 +137,7 @@ public:
TVDocument (KMPlayerTVSource *); TVDocument (KMPlayerTVSource *);
KMPlayer::NodePtr childFromTag (const TQString &); KMPlayer::NodePtr childFromTag (const TQString &);
void defer (); void defer ();
KDE_NO_EXPORT const char * nodeName () const { return "tvdevices"; } TDE_NO_EXPORT const char * nodeName () const { return "tvdevices"; }
void childDone (KMPlayer::NodePtr child); void childDone (KMPlayer::NodePtr child);
}; };

122
src/kmplayervdr.cpp
Unescape View File

@ -107,7 +107,7 @@ KDE_NO_CDTOR_EXPORT KMPlayerPrefSourcePageVDR::KMPlayerPrefSourcePageVDR (TQWidg
KDE_NO_CDTOR_EXPORT KMPlayerPrefSourcePageVDR::~KMPlayerPrefSourcePageVDR () {} KDE_NO_CDTOR_EXPORT KMPlayerPrefSourcePageVDR::~KMPlayerPrefSourcePageVDR () {}
KDE_NO_EXPORT void KMPlayerPrefSourcePageVDR::showEvent (TQShowEvent *) { TDE_NO_EXPORT void KMPlayerPrefSourcePageVDR::showEvent (TQShowEvent *) {
XVideo * xvideo = static_cast<XVideo *>(m_player->players()["xvideo"]); XVideo * xvideo = static_cast<XVideo *>(m_player->players()["xvideo"]);
if (!xvideo->configDocument ()) if (!xvideo->configDocument ())
xvideo->getConfigData (); xvideo->getConfigData ();
@ -160,19 +160,19 @@ KDE_NO_CDTOR_EXPORT void KMPlayerVDRSource::waitForConnectionClose () {
} }
} }
KDE_NO_EXPORT bool KMPlayerVDRSource::hasLength () { TDE_NO_EXPORT bool KMPlayerVDRSource::hasLength () {
return false; return false;
} }
KDE_NO_EXPORT bool KMPlayerVDRSource::isSeekable () { TDE_NO_EXPORT bool KMPlayerVDRSource::isSeekable () {
return true; return true;
} }
KDE_NO_EXPORT TQString KMPlayerVDRSource::prettyName () { TDE_NO_EXPORT TQString KMPlayerVDRSource::prettyName () {
return i18n ("VDR"); return i18n ("VDR");
} }
KDE_NO_EXPORT void KMPlayerVDRSource::activate () { TDE_NO_EXPORT void KMPlayerVDRSource::activate () {
last_channel = 0; last_channel = 0;
connect (this, TQ_SIGNAL (startPlaying ()), this, TQ_SLOT (processStarted())); connect (this, TQ_SIGNAL (startPlaying ()), this, TQ_SLOT (processStarted()));
connect (this, TQ_SIGNAL (stopPlaying ()), this, TQ_SLOT (processStopped ())); connect (this, TQ_SIGNAL (stopPlaying ()), this, TQ_SLOT (processStopped ()));
@ -195,7 +195,7 @@ KDE_NO_EXPORT void KMPlayerVDRSource::activate () {
TQTimer::singleShot (0, m_player, TQ_SLOT (play ())); TQTimer::singleShot (0, m_player, TQ_SLOT (play ()));
} }
KDE_NO_EXPORT void KMPlayerVDRSource::deactivate () { TDE_NO_EXPORT void KMPlayerVDRSource::deactivate () {
disconnect (m_socket, TQ_SIGNAL (error (int)), this, TQ_SLOT (socketError (int))); disconnect (m_socket, TQ_SIGNAL (error (int)), this, TQ_SLOT (socketError (int)));
if (m_player->view ()) { if (m_player->view ()) {
disconnect (this, TQ_SIGNAL(startPlaying()), this, TQ_SLOT(processStarted())); disconnect (this, TQ_SIGNAL(startPlaying()), this, TQ_SLOT(processStarted()));
@ -211,19 +211,19 @@ KDE_NO_EXPORT void KMPlayerVDRSource::deactivate () {
m_request_jump.truncate (0); m_request_jump.truncate (0);
} }
KDE_NO_EXPORT void KMPlayerVDRSource::playCurrent () { TDE_NO_EXPORT void KMPlayerVDRSource::playCurrent () {
if (m_player->process ()) if (m_player->process ())
m_player->process ()->play (this, current ()); // FIXME HACK m_player->process ()->play (this, current ()); // FIXME HACK
} }
KDE_NO_EXPORT void KMPlayerVDRSource::processStopped () { TDE_NO_EXPORT void KMPlayerVDRSource::processStopped () {
if (m_socket->state () == TQSocket::Connected) { if (m_socket->state () == TQSocket::Connected) {
queueCommand (TQString ("VOLU %1\n").arg (m_stored_volume).ascii ()); queueCommand (TQString ("VOLU %1\n").arg (m_stored_volume).ascii ());
queueCommand ("QUIT\n"); queueCommand ("QUIT\n");
} }
} }
KDE_NO_EXPORT void KMPlayerVDRSource::processStarted () { TDE_NO_EXPORT void KMPlayerVDRSource::processStarted () {
m_socket->connectToHost ("127.0.0.1", tcp_port); m_socket->connectToHost ("127.0.0.1", tcp_port);
commands = new VDRCommand ("connect", commands); commands = new VDRCommand ("connect", commands);
} }
@ -232,7 +232,7 @@ KDE_NO_EXPORT void KMPlayerVDRSource::processStarted () {
m_actions [i] = new TDEAction (text, TQString (pix), TDEShortcut (scut), this, slot, m_app->actionCollection (), name); \ m_actions [i] = new TDEAction (text, TQString (pix), TDEShortcut (scut), this, slot, m_app->actionCollection (), name); \
m_fullscreen_actions [i] = new TDEAction (text, TDEShortcut (scut), this, slot, m_app->view ()->viewArea ()->actionCollection (), name) m_fullscreen_actions [i] = new TDEAction (text, TDEShortcut (scut), this, slot, m_app->view ()->viewArea ()->actionCollection (), name)
KDE_NO_EXPORT void KMPlayerVDRSource::connected () { TDE_NO_EXPORT void KMPlayerVDRSource::connected () {
queueCommand (cmd_list_channels); queueCommand (cmd_list_channels);
queueCommand (cmd_volume_query); queueCommand (cmd_volume_query);
killTimer (channel_timer); killTimer (channel_timer);
@ -272,7 +272,7 @@ KDE_NO_EXPORT void KMPlayerVDRSource::connected () {
#undef DEF_ACT #undef DEF_ACT
KDE_NO_EXPORT void KMPlayerVDRSource::disconnected () { TDE_NO_EXPORT void KMPlayerVDRSource::disconnected () {
kdDebug() << "disconnected " << commands << endl; kdDebug() << "disconnected " << commands << endl;
if (finish_timer) { if (finish_timer) {
deleteCommands (); deleteCommands ();
@ -295,7 +295,7 @@ KDE_NO_EXPORT void KMPlayerVDRSource::disconnected () {
m_app->initMenu (); m_app->initMenu ();
} }
KDE_NO_EXPORT void KMPlayerVDRSource::toggleConnected () { TDE_NO_EXPORT void KMPlayerVDRSource::toggleConnected () {
if (m_socket->state () == TQSocket::Connected) { if (m_socket->state () == TQSocket::Connected) {
queueCommand ("QUIT\n"); queueCommand ("QUIT\n");
killTimer (channel_timer); killTimer (channel_timer);
@ -306,7 +306,7 @@ KDE_NO_EXPORT void KMPlayerVDRSource::toggleConnected () {
} }
} }
KDE_NO_EXPORT void KMPlayerVDRSource::volumeChanged (int val) { TDE_NO_EXPORT void KMPlayerVDRSource::volumeChanged (int val) {
queueCommand (TQString ("VOLU %1\n").arg (int (sqrt (255 * 255 * val / 100))).ascii ()); queueCommand (TQString ("VOLU %1\n").arg (int (sqrt (255 * 255 * val / 100))).ascii ());
} }
@ -317,7 +317,7 @@ static struct ReadBuf {
KDE_NO_CDTOR_EXPORT ~ReadBuf () { KDE_NO_CDTOR_EXPORT ~ReadBuf () {
clear (); clear ();
} }
KDE_NO_EXPORT void operator += (const char * s) { TDE_NO_EXPORT void operator += (const char * s) {
int l = strlen (s); int l = strlen (s);
char * b = new char [length + l + 1]; char * b = new char [length + l + 1];
if (length) if (length)
@ -327,21 +327,21 @@ static struct ReadBuf {
delete buf; delete buf;
buf = b; buf = b;
} }
KDE_NO_EXPORT TQCString mid (int p) { TDE_NO_EXPORT TQCString mid (int p) {
return TQCString (buf + p); return TQCString (buf + p);
} }
KDE_NO_EXPORT TQCString left (int p) { TDE_NO_EXPORT TQCString left (int p) {
return TQCString (buf, p); return TQCString (buf, p);
} }
KDE_NO_EXPORT TQCString getReadLine (); TDE_NO_EXPORT TQCString getReadLine ();
KDE_NO_EXPORT void clear () { TDE_NO_EXPORT void clear () {
delete [] buf; delete [] buf;
buf = 0; buf = 0;
length = 0; length = 0;
} }
} readbuf; } readbuf;
KDE_NO_EXPORT TQCString ReadBuf::getReadLine () { TDE_NO_EXPORT TQCString ReadBuf::getReadLine () {
TQCString out; TQCString out;
if (!length) if (!length)
return out; return out;
@ -356,7 +356,7 @@ KDE_NO_EXPORT TQCString ReadBuf::getReadLine () {
return out; return out;
} }
KDE_NO_EXPORT void KMPlayerVDRSource::readyRead () { TDE_NO_EXPORT void KMPlayerVDRSource::readyRead () {
KMPlayer::View * v = finish_timer ? 0L : static_cast <KMPlayer::View *> (m_player->view ()); KMPlayer::View * v = finish_timer ? 0L : static_cast <KMPlayer::View *> (m_player->view ());
long nr = m_socket->bytesAvailable(); long nr = m_socket->bytesAvailable();
char * data = new char [nr + 1]; char * data = new char [nr + 1];
@ -445,7 +445,7 @@ KDE_NO_EXPORT void KMPlayerVDRSource::readyRead () {
delete [] data; delete [] data;
} }
KDE_NO_EXPORT void KMPlayerVDRSource::socketError (int code) { TDE_NO_EXPORT void KMPlayerVDRSource::socketError (int code) {
if (code == TQSocket::ErrHostNotFound) { if (code == TQSocket::ErrHostNotFound) {
KMessageBox::error (m_configpage, i18n ("Host not found"), i18n ("Error")); KMessageBox::error (m_configpage, i18n ("Host not found"), i18n ("Error"));
} else if (code == TQSocket::ErrConnectionRefused) { } else if (code == TQSocket::ErrConnectionRefused) {
@ -453,7 +453,7 @@ KDE_NO_EXPORT void KMPlayerVDRSource::socketError (int code) {
} }
} }
KDE_NO_EXPORT void KMPlayerVDRSource::queueCommand (const char * cmd) { TDE_NO_EXPORT void KMPlayerVDRSource::queueCommand (const char * cmd) {
if (m_player->source () != this) if (m_player->source () != this)
return; return;
if (!commands) { if (!commands) {
@ -475,13 +475,13 @@ KDE_NO_EXPORT void KMPlayerVDRSource::queueCommand (const char * cmd) {
} }
} }
KDE_NO_EXPORT void KMPlayerVDRSource::queueCommand (const char * cmd, int t) { TDE_NO_EXPORT void KMPlayerVDRSource::queueCommand (const char * cmd, int t) {
queueCommand (cmd); queueCommand (cmd);
killTimer (channel_timer); killTimer (channel_timer);
channel_timer = startTimer (t); channel_timer = startTimer (t);
} }
KDE_NO_EXPORT void KMPlayerVDRSource::sendCommand () { TDE_NO_EXPORT void KMPlayerVDRSource::sendCommand () {
//kdDebug () << "sendCommand " << commands->command << endl; //kdDebug () << "sendCommand " << commands->command << endl;
m_socket->writeBlock (commands->command, strlen(commands->command)); m_socket->writeBlock (commands->command, strlen(commands->command));
m_socket->flush (); m_socket->flush ();
@ -489,7 +489,7 @@ KDE_NO_EXPORT void KMPlayerVDRSource::sendCommand () {
timeout_timer = startTimer (30000); timeout_timer = startTimer (30000);
} }
KDE_NO_EXPORT void KMPlayerVDRSource::customCmd () { TDE_NO_EXPORT void KMPlayerVDRSource::customCmd () {
#if KDE_IS_VERSION(3, 1, 90) #if KDE_IS_VERSION(3, 1, 90)
TQString cmd = KInputDialog::getText (i18n ("Custom VDR command"), i18n ("You can pass commands to VDR.\nEnter 'HELP' to see a list of available commands.\nYou can see VDR response in the console window.\n\nVDR Command:"), TQString(), 0, m_player->view ()); TQString cmd = KInputDialog::getText (i18n ("Custom VDR command"), i18n ("You can pass commands to VDR.\nEnter 'HELP' to see a list of available commands.\nYou can see VDR response in the console window.\n\nVDR Command:"), TQString(), 0, m_player->view ());
if (!cmd.isEmpty ()) if (!cmd.isEmpty ())
@ -497,7 +497,7 @@ KDE_NO_EXPORT void KMPlayerVDRSource::customCmd () {
#endif #endif
} }
KDE_NO_EXPORT void KMPlayerVDRSource::timerEvent (TQTimerEvent * e) { TDE_NO_EXPORT void KMPlayerVDRSource::timerEvent (TQTimerEvent * e) {
if (e->timerId () == timeout_timer || e->timerId () == finish_timer) { if (e->timerId () == timeout_timer || e->timerId () == finish_timer) {
deleteCommands (); deleteCommands ();
} else if (e->timerId () == channel_timer) { } else if (e->timerId () == channel_timer) {
@ -507,7 +507,7 @@ KDE_NO_EXPORT void KMPlayerVDRSource::timerEvent (TQTimerEvent * e) {
} }
} }
KDE_NO_EXPORT void KMPlayerVDRSource::deleteCommands () { TDE_NO_EXPORT void KMPlayerVDRSource::deleteCommands () {
killTimer (timeout_timer); killTimer (timeout_timer);
timeout_timer = 0; timeout_timer = 0;
killTimer (channel_timer); killTimer (channel_timer);
@ -523,13 +523,13 @@ KDE_NO_EXPORT void KMPlayerVDRSource::deleteCommands () {
} }
} }
KDE_NO_EXPORT void KMPlayerVDRSource::jump (KMPlayer::NodePtr e) { TDE_NO_EXPORT void KMPlayerVDRSource::jump (KMPlayer::NodePtr e) {
if (!e->isPlayable ()) return; if (!e->isPlayable ()) return;
m_current = e; m_current = e;
jump (e->mrl ()->pretty_name); jump (e->mrl ()->pretty_name);
} }
KDE_NO_EXPORT void KMPlayerVDRSource::jump (const TQString & channel) { TDE_NO_EXPORT void KMPlayerVDRSource::jump (const TQString & channel) {
TQCString c ("CHAN "); TQCString c ("CHAN ");
TQCString ch = channel.local8Bit (); TQCString ch = channel.local8Bit ();
int p = ch.find (' '); int p = ch.find (' ');
@ -541,99 +541,99 @@ KDE_NO_EXPORT void KMPlayerVDRSource::jump (const TQString & channel) {
queueCommand (c); queueCommand (c);
} }
KDE_NO_EXPORT void KMPlayerVDRSource::forward () { TDE_NO_EXPORT void KMPlayerVDRSource::forward () {
queueCommand ("CHAN +\n", 1000); queueCommand ("CHAN +\n", 1000);
} }
KDE_NO_EXPORT void KMPlayerVDRSource::backward () { TDE_NO_EXPORT void KMPlayerVDRSource::backward () {
queueCommand ("CHAN -\n", 1000); queueCommand ("CHAN -\n", 1000);
} }
KDE_NO_EXPORT void KMPlayerVDRSource::keyUp () { TDE_NO_EXPORT void KMPlayerVDRSource::keyUp () {
queueCommand ("HITK UP\n", 1000); queueCommand ("HITK UP\n", 1000);
} }
KDE_NO_EXPORT void KMPlayerVDRSource::keyDown () { TDE_NO_EXPORT void KMPlayerVDRSource::keyDown () {
queueCommand ("HITK DOWN\n", 1000); queueCommand ("HITK DOWN\n", 1000);
} }
KDE_NO_EXPORT void KMPlayerVDRSource::keyBack () { TDE_NO_EXPORT void KMPlayerVDRSource::keyBack () {
queueCommand ("HITK BACK\n"); queueCommand ("HITK BACK\n");
} }
KDE_NO_EXPORT void KMPlayerVDRSource::keyOk () { TDE_NO_EXPORT void KMPlayerVDRSource::keyOk () {
queueCommand ("HITK OK\n"); queueCommand ("HITK OK\n");
} }
KDE_NO_EXPORT void KMPlayerVDRSource::keySetup () { TDE_NO_EXPORT void KMPlayerVDRSource::keySetup () {
queueCommand ("HITK SETUP\n"); queueCommand ("HITK SETUP\n");
} }
KDE_NO_EXPORT void KMPlayerVDRSource::keyChannels () { TDE_NO_EXPORT void KMPlayerVDRSource::keyChannels () {
queueCommand ("HITK CHANNELS\n"); queueCommand ("HITK CHANNELS\n");
} }
KDE_NO_EXPORT void KMPlayerVDRSource::keyMenu () { TDE_NO_EXPORT void KMPlayerVDRSource::keyMenu () {
queueCommand ("HITK MENU\n"); queueCommand ("HITK MENU\n");
} }
KDE_NO_EXPORT void KMPlayerVDRSource::key0 () { TDE_NO_EXPORT void KMPlayerVDRSource::key0 () {
queueCommand ("HITK 0\n", 2000); queueCommand ("HITK 0\n", 2000);
} }
KDE_NO_EXPORT void KMPlayerVDRSource::key1 () { TDE_NO_EXPORT void KMPlayerVDRSource::key1 () {
queueCommand ("HITK 1\n", 2000); queueCommand ("HITK 1\n", 2000);
} }
KDE_NO_EXPORT void KMPlayerVDRSource::key2 () { TDE_NO_EXPORT void KMPlayerVDRSource::key2 () {
queueCommand ("HITK 2\n", 2000); queueCommand ("HITK 2\n", 2000);
} }
KDE_NO_EXPORT void KMPlayerVDRSource::key3 () { TDE_NO_EXPORT void KMPlayerVDRSource::key3 () {
queueCommand ("HITK 3\n", 2000); queueCommand ("HITK 3\n", 2000);
} }
KDE_NO_EXPORT void KMPlayerVDRSource::key4 () { TDE_NO_EXPORT void KMPlayerVDRSource::key4 () {
queueCommand ("HITK 4\n", 2000); queueCommand ("HITK 4\n", 2000);
} }
KDE_NO_EXPORT void KMPlayerVDRSource::key5 () { TDE_NO_EXPORT void KMPlayerVDRSource::key5 () {
queueCommand ("HITK 5\n", 2000); queueCommand ("HITK 5\n", 2000);
} }
KDE_NO_EXPORT void KMPlayerVDRSource::key6 () { TDE_NO_EXPORT void KMPlayerVDRSource::key6 () {
queueCommand ("HITK 6\n", 2000); queueCommand ("HITK 6\n", 2000);
} }
KDE_NO_EXPORT void KMPlayerVDRSource::key7 () { TDE_NO_EXPORT void KMPlayerVDRSource::key7 () {
queueCommand ("HITK 7\n", 2000); queueCommand ("HITK 7\n", 2000);
} }
KDE_NO_EXPORT void KMPlayerVDRSource::key8 () { TDE_NO_EXPORT void KMPlayerVDRSource::key8 () {
queueCommand ("HITK 8\n", 2000); queueCommand ("HITK 8\n", 2000);
} }
KDE_NO_EXPORT void KMPlayerVDRSource::key9 () { TDE_NO_EXPORT void KMPlayerVDRSource::key9 () {
queueCommand ("HITK 9\n", 2000); queueCommand ("HITK 9\n", 2000);
} }
KDE_NO_EXPORT void KMPlayerVDRSource::keyRed () { TDE_NO_EXPORT void KMPlayerVDRSource::keyRed () {
queueCommand ("HITK RED\n"); queueCommand ("HITK RED\n");
} }
KDE_NO_EXPORT void KMPlayerVDRSource::keyGreen () { TDE_NO_EXPORT void KMPlayerVDRSource::keyGreen () {
queueCommand ("HITK GREEN\n"); queueCommand ("HITK GREEN\n");
} }
KDE_NO_EXPORT void KMPlayerVDRSource::keyYellow () { TDE_NO_EXPORT void KMPlayerVDRSource::keyYellow () {
queueCommand ("HITK YELLOW\n"); queueCommand ("HITK YELLOW\n");
} }
KDE_NO_EXPORT void KMPlayerVDRSource::keyBlue () { TDE_NO_EXPORT void KMPlayerVDRSource::keyBlue () {
queueCommand ("HITK BLUE\n"); queueCommand ("HITK BLUE\n");
} }
KDE_NO_EXPORT void KMPlayerVDRSource::write (TDEConfig * m_config) { TDE_NO_EXPORT void KMPlayerVDRSource::write (TDEConfig * m_config) {
m_config->setGroup (strVDR); m_config->setGroup (strVDR);
m_config->writeEntry (strVDRPort, tcp_port); m_config->writeEntry (strVDRPort, tcp_port);
m_config->writeEntry (strXVPort, m_xvport); m_config->writeEntry (strXVPort, m_xvport);
@ -641,7 +641,7 @@ KDE_NO_EXPORT void KMPlayerVDRSource::write (TDEConfig * m_config) {
m_config->writeEntry (strXVScale, scale); m_config->writeEntry (strXVScale, scale);
} }
KDE_NO_EXPORT void KMPlayerVDRSource::read (TDEConfig * m_config) { TDE_NO_EXPORT void KMPlayerVDRSource::read (TDEConfig * m_config) {
m_config->setGroup (strVDR); m_config->setGroup (strVDR);
tcp_port = m_config->readNumEntry (strVDRPort, 2001); tcp_port = m_config->readNumEntry (strVDRPort, 2001);
m_xvport = m_config->readNumEntry (strXVPort, 0); m_xvport = m_config->readNumEntry (strXVPort, 0);
@ -656,7 +656,7 @@ struct XVTreeItem : public TQListViewItem {
int encoding; int encoding;
}; };
KDE_NO_EXPORT void KMPlayerVDRSource::sync (bool fromUI) { TDE_NO_EXPORT void KMPlayerVDRSource::sync (bool fromUI) {
XVideo * xvideo = static_cast<XVideo *>(m_player->players()["xvideo"]); XVideo * xvideo = static_cast<XVideo *>(m_player->players()["xvideo"]);
if (fromUI) { if (fromUI) {
tcp_port = m_configpage->tcp_port->text ().toInt (); tcp_port = m_configpage->tcp_port->text ().toInt ();
@ -714,29 +714,29 @@ KDE_NO_EXPORT void KMPlayerVDRSource::sync (bool fromUI) {
} }
} }
KDE_NO_EXPORT void KMPlayerVDRSource::configReceived () { TDE_NO_EXPORT void KMPlayerVDRSource::configReceived () {
XVideo * xvideo = static_cast<XVideo *>(m_player->players()["xvideo"]); XVideo * xvideo = static_cast<XVideo *>(m_player->players()["xvideo"]);
disconnect (xvideo, TQ_SIGNAL (configReceived()), this, TQ_SLOT (configReceived())); disconnect (xvideo, TQ_SIGNAL (configReceived()), this, TQ_SLOT (configReceived()));
sync (false); sync (false);
} }
KDE_NO_EXPORT void KMPlayerVDRSource::prefLocation (TQString & item, TQString & icon, TQString & tab) { TDE_NO_EXPORT void KMPlayerVDRSource::prefLocation (TQString & item, TQString & icon, TQString & tab) {
item = i18n ("Source"); item = i18n ("Source");
icon = TQString ("text-x-src"); icon = TQString ("text-x-src");
tab = i18n ("VDR"); tab = i18n ("VDR");
} }
KDE_NO_EXPORT TQFrame * KMPlayerVDRSource::prefPage (TQWidget * parent) { TDE_NO_EXPORT TQFrame * KMPlayerVDRSource::prefPage (TQWidget * parent) {
if (!m_configpage) if (!m_configpage)
m_configpage = new KMPlayerPrefSourcePageVDR (parent, m_player); m_configpage = new KMPlayerPrefSourcePageVDR (parent, m_player);
return m_configpage; return m_configpage;
} }
KDE_NO_EXPORT bool KMPlayerVDRSource::requestPlayURL (KMPlayer::NodePtr) { TDE_NO_EXPORT bool KMPlayerVDRSource::requestPlayURL (KMPlayer::NodePtr) {
return true; return true;
} }
KDE_NO_EXPORT void KMPlayerVDRSource::stateElementChanged (KMPlayer::Node *, KMPlayer::Node::State, KMPlayer::Node::State) { TDE_NO_EXPORT void KMPlayerVDRSource::stateElementChanged (KMPlayer::Node *, KMPlayer::Node::State, KMPlayer::Node::State) {
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -753,7 +753,7 @@ KDE_NO_CDTOR_EXPORT XVideo::XVideo (TQObject * parent, Settings * settings)
KDE_NO_CDTOR_EXPORT XVideo::~XVideo () {} KDE_NO_CDTOR_EXPORT XVideo::~XVideo () {}
KDE_NO_EXPORT bool XVideo::ready (KMPlayer::Viewer * v) { TDE_NO_EXPORT bool XVideo::ready (KMPlayer::Viewer * v) {
if (playing ()) { if (playing ()) {
return true; return true;
} }

58
src/kmplayerview.cpp
Unescape View File

@ -97,7 +97,7 @@ protected:
} // namespace } // namespace
KDE_NO_EXPORT void KMPlayerPictureWidget::mousePressEvent (TQMouseEvent *) { TDE_NO_EXPORT void KMPlayerPictureWidget::mousePressEvent (TQMouseEvent *) {
m_view->emitPictureClicked (); m_view->emitPictureClicked ();
} }
@ -109,7 +109,7 @@ KDE_NO_CDTOR_EXPORT TextEdit::TextEdit (TQWidget * parent, View * view) : TQText
setColor (TQColor (0xB2, 0xB2, 0xB2)); setColor (TQColor (0xB2, 0xB2, 0xB2));
} }
KDE_NO_EXPORT void TextEdit::contextMenuEvent (TQContextMenuEvent * e) { TDE_NO_EXPORT void TextEdit::contextMenuEvent (TQContextMenuEvent * e) {
m_view->controlPanel ()->popupMenu ()->exec (e->globalPos ()); m_view->controlPanel ()->popupMenu ()->exec (e->globalPos ());
} }
@ -120,7 +120,7 @@ KDE_NO_CDTOR_EXPORT InfoWindow::InfoWindow (TQWidget * parent, View * view) : TQ
setLinkUnderline (false); setLinkUnderline (false);
} }
KDE_NO_EXPORT void InfoWindow::contextMenuEvent (TQContextMenuEvent * e) { TDE_NO_EXPORT void InfoWindow::contextMenuEvent (TQContextMenuEvent * e) {
m_view->controlPanel ()->popupMenu ()->exec (e->globalPos ()); m_view->controlPanel ()->popupMenu ()->exec (e->globalPos ());
} }
@ -148,7 +148,7 @@ KDE_NO_CDTOR_EXPORT View::View (TQWidget *parent, const char *name)
m_edit_mode (false) m_edit_mode (false)
{} {}
KDE_NO_EXPORT void View::dropEvent (TQDropEvent * de) { TDE_NO_EXPORT void View::dropEvent (TQDropEvent * de) {
KURL::List sl; KURL::List sl;
if (KURLDrag::canDecode (de)) { if (KURLDrag::canDecode (de)) {
KURLDrag::decode (de, sl); KURLDrag::decode (de, sl);
@ -166,12 +166,12 @@ KDE_NO_EXPORT void View::dropEvent (TQDropEvent * de) {
} }
} }
KDE_NO_EXPORT void View::dragEnterEvent (TQDragEnterEvent* dee) { TDE_NO_EXPORT void View::dragEnterEvent (TQDragEnterEvent* dee) {
if (isDragValid (dee)) if (isDragValid (dee))
dee->accept (); dee->accept ();
} }
KDE_NO_EXPORT void View::init (TDEActionCollection * action_collection) { TDE_NO_EXPORT void View::init (TDEActionCollection * action_collection) {
setBackgroundMode(TQt::NoBackground); // prevents flashing setBackgroundMode(TQt::NoBackground); // prevents flashing
//m_dockarea->setEraseColor (TQColor (0, 0, 0)); //m_dockarea->setEraseColor (TQColor (0, 0, 0));
TQPalette pal (TQColor (64, 64,64), TQColor (32, 32, 32)); TQPalette pal (TQColor (64, 64,64), TQColor (32, 32, 32));
@ -232,7 +232,7 @@ KDE_NO_CDTOR_EXPORT View::~View () {
delete m_view_area; delete m_view_area;
} }
KDE_NO_EXPORT void View::setEraseColor (const TQColor & color) { TDE_NO_EXPORT void View::setEraseColor (const TQColor & color) {
KMediaPlayer::View::setEraseColor (color); KMediaPlayer::View::setEraseColor (color);
if (statusBar ()) { if (statusBar ()) {
statusBar ()->setEraseColor (color); statusBar ()->setEraseColor (color);
@ -342,7 +342,7 @@ bool View::setPicture (const TQString & path) {
return m_image; return m_image;
} }
KDE_NO_EXPORT void View::updateVolume () { TDE_NO_EXPORT void View::updateVolume () {
if (m_mixer_init && !m_volume_slider) if (m_mixer_init && !m_volume_slider)
return; return;
TQByteArray data, replydata; TQByteArray data, replydata;
@ -434,7 +434,7 @@ void View::setStatusBarMode (StatusBarMode m) {
m_view_area->resizeEvent (0L); m_view_area->resizeEvent (0L);
} }
KDE_NO_EXPORT void View::delayedShowButtons (bool show) { TDE_NO_EXPORT void View::delayedShowButtons (bool show) {
if ((show && m_control_panel->isVisible ()) || if ((show && m_control_panel->isVisible ()) ||
(!show && !m_control_panel->isVisible ())) { (!show && !m_control_panel->isVisible ())) {
if (controlbar_timer) { if (controlbar_timer) {
@ -452,7 +452,7 @@ KDE_NO_EXPORT void View::delayedShowButtons (bool show) {
} }
} }
KDE_NO_EXPORT void View::setVolume (int vol) { TDE_NO_EXPORT void View::setVolume (int vol) {
if (m_inVolumeUpdate) return; if (m_inVolumeUpdate) return;
TQByteArray data; TQByteArray data;
TQDataStream arg( data, IO_WriteOnly ); TQDataStream arg( data, IO_WriteOnly );
@ -461,7 +461,7 @@ KDE_NO_EXPORT void View::setVolume (int vol) {
kdWarning() << "Failed to update volume" << endl; kdWarning() << "Failed to update volume" << endl;
} }
KDE_NO_EXPORT void View::updateLayout () { TDE_NO_EXPORT void View::updateLayout () {
if (m_controlpanel_mode == CP_Only) if (m_controlpanel_mode == CP_Only)
m_control_panel->setMaximumSize (2500, height ()); m_control_panel->setMaximumSize (2500, height ());
m_view_area->resizeEvent (0L); m_view_area->resizeEvent (0L);
@ -475,7 +475,7 @@ void View::setKeepSizeRatio (bool b) {
} }
} }
KDE_NO_EXPORT void View::timerEvent (TQTimerEvent * e) { TDE_NO_EXPORT void View::timerEvent (TQTimerEvent * e) {
if (e->timerId () == controlbar_timer) { if (e->timerId () == controlbar_timer) {
controlbar_timer = 0; controlbar_timer = 0;
if (m_playing || if (m_playing ||
@ -541,7 +541,7 @@ void View::addText (const TQString & str, bool eol) {
printpainter.end (); printpainter.end ();
}*/ }*/
KDE_NO_EXPORT void View::videoStart () { TDE_NO_EXPORT void View::videoStart () {
if (m_dockarea->getMainDockWidget () != m_dock_video) { if (m_dockarea->getMainDockWidget () != m_dock_video) {
// restore from an info or playlist only setting // restore from an info or playlist only setting
KDockWidget * dw = m_dockarea->getMainDockWidget (); KDockWidget * dw = m_dockarea->getMainDockWidget ();
@ -557,7 +557,7 @@ KDE_NO_EXPORT void View::videoStart () {
} }
} }
KDE_NO_EXPORT void View::playingStart () { TDE_NO_EXPORT void View::playingStart () {
if (m_playing) return; //FIXME: make symetric with playingStop if (m_playing) return; //FIXME: make symetric with playingStop
if (m_widgetstack->visibleWidget () == m_widgettypes[WT_Picture]) if (m_widgetstack->visibleWidget () == m_widgettypes[WT_Picture])
m_widgetstack->raiseWidget (m_viewer); m_widgetstack->raiseWidget (m_viewer);
@ -566,7 +566,7 @@ KDE_NO_EXPORT void View::playingStart () {
setControlPanelMode (m_old_controlpanel_mode); setControlPanelMode (m_old_controlpanel_mode);
} }
KDE_NO_EXPORT void View::playingStop () { TDE_NO_EXPORT void View::playingStop () {
if (m_controlpanel_mode == CP_AutoHide && if (m_controlpanel_mode == CP_AutoHide &&
m_widgetstack->visibleWidget () != m_widgettypes[WT_Picture]) { m_widgetstack->visibleWidget () != m_widgettypes[WT_Picture]) {
m_control_panel->show (); m_control_panel->show ();
@ -581,11 +581,11 @@ KDE_NO_EXPORT void View::playingStop () {
m_view_area->resizeEvent (0L); m_view_area->resizeEvent (0L);
} }
KDE_NO_EXPORT void View::leaveEvent (TQEvent *) { TDE_NO_EXPORT void View::leaveEvent (TQEvent *) {
delayedShowButtons (false); delayedShowButtons (false);
} }
KDE_NO_EXPORT void View::reset () { TDE_NO_EXPORT void View::reset () {
if (m_revert_fullscreen && isFullScreen()) if (m_revert_fullscreen && isFullScreen())
m_control_panel->popupMenu ()->activateItemAt (m_control_panel->popupMenu ()->indexOf (ControlPanel::menu_fullscreen)); m_control_panel->popupMenu ()->activateItemAt (m_control_panel->popupMenu ()->indexOf (ControlPanel::menu_fullscreen));
//m_view_area->fullScreen (); //m_view_area->fullScreen ();
@ -612,7 +612,7 @@ void View::fullScreen () {
emit fullScreenChanged (); emit fullScreenChanged ();
} }
KDE_NO_EXPORT int View::statusBarHeight () const { TDE_NO_EXPORT int View::statusBarHeight () const {
if (statusBar()->isVisible () && !viewArea()->isFullScreen ()) { if (statusBar()->isVisible () && !viewArea()->isFullScreen ()) {
if (statusBarMode () == SB_Only) if (statusBarMode () == SB_Only)
return height (); return height ();
@ -690,7 +690,7 @@ KDE_NO_CDTOR_EXPORT Viewer::Viewer (TQWidget *parent, View * view)
KDE_NO_CDTOR_EXPORT Viewer::~Viewer () { KDE_NO_CDTOR_EXPORT Viewer::~Viewer () {
} }
KDE_NO_EXPORT void Viewer::changeProtocol (QXEmbed::Protocol p) { TDE_NO_EXPORT void Viewer::changeProtocol (QXEmbed::Protocol p) {
kdDebug () << "changeProtocol " << (int)protocol () << "->" << p << endl; kdDebug () << "changeProtocol " << (int)protocol () << "->" << p << endl;
if (!embeddedWinId () || p != protocol ()) { if (!embeddedWinId () || p != protocol ()) {
if (p == QXEmbed::XPLAIN) { if (p == QXEmbed::XPLAIN) {
@ -719,7 +719,7 @@ KDE_NO_EXPORT void Viewer::changeProtocol (QXEmbed::Protocol p) {
} }
} }
KDE_NO_EXPORT void Viewer::windowChanged (WId w) { TDE_NO_EXPORT void Viewer::windowChanged (WId w) {
kdDebug () << "windowChanged " << (int)w << endl; kdDebug () << "windowChanged " << (int)w << endl;
if (w /*&& m_plain_window*/) if (w /*&& m_plain_window*/)
XSelectInput (tqt_xdisplay (), w, XSelectInput (tqt_xdisplay (), w,
@ -732,7 +732,7 @@ KDE_NO_EXPORT void Viewer::windowChanged (WId w) {
PointerMotionMask); PointerMotionMask);
} }
KDE_NO_EXPORT void Viewer::mouseMoveEvent (TQMouseEvent * e) { TDE_NO_EXPORT void Viewer::mouseMoveEvent (TQMouseEvent * e) {
if (e->state () == TQt::NoButton) { if (e->state () == TQt::NoButton) {
int cp_height = m_view->controlPanel ()->maximumSize ().height (); int cp_height = m_view->controlPanel ()->maximumSize ().height ();
m_view->delayedShowButtons (e->y () > height () - cp_height); m_view->delayedShowButtons (e->y () > height () - cp_height);
@ -744,17 +744,17 @@ void Viewer::setAspect (float a) {
m_aspect = a; m_aspect = a;
} }
KDE_NO_EXPORT int Viewer::heightForWidth (int w) const { TDE_NO_EXPORT int Viewer::heightForWidth (int w) const {
if (m_aspect <= 0.01) if (m_aspect <= 0.01)
return 0; return 0;
return int (w/m_aspect); return int (w/m_aspect);
} }
KDE_NO_EXPORT void Viewer::dropEvent (TQDropEvent * de) { TDE_NO_EXPORT void Viewer::dropEvent (TQDropEvent * de) {
m_view->dropEvent (de); m_view->dropEvent (de);
} }
KDE_NO_EXPORT void Viewer::dragEnterEvent (TQDragEnterEvent* dee) { TDE_NO_EXPORT void Viewer::dragEnterEvent (TQDragEnterEvent* dee) {
m_view->dragEnterEvent (dee); m_view->dragEnterEvent (dee);
} }
/* /*
@ -775,7 +775,7 @@ void Viewer::sendKeyEvent (int key) {
} }
} }
KDE_NO_EXPORT void Viewer::sendConfigureEvent () { TDE_NO_EXPORT void Viewer::sendConfigureEvent () {
WId w = embeddedWinId (); WId w = embeddedWinId ();
if (w) { if (w) {
XConfigureEvent c = { XConfigureEvent c = {
@ -789,22 +789,22 @@ KDE_NO_EXPORT void Viewer::sendConfigureEvent () {
} }
} }
KDE_NO_EXPORT void Viewer::contextMenuEvent (TQContextMenuEvent * e) { TDE_NO_EXPORT void Viewer::contextMenuEvent (TQContextMenuEvent * e) {
m_view->controlPanel ()->popupMenu ()->exec (e->globalPos ()); m_view->controlPanel ()->popupMenu ()->exec (e->globalPos ());
} }
KDE_NO_EXPORT void Viewer::setBackgroundColor (const TQColor & c) { TDE_NO_EXPORT void Viewer::setBackgroundColor (const TQColor & c) {
if (m_bgcolor != c.rgb ()) { if (m_bgcolor != c.rgb ()) {
m_bgcolor = c.rgb (); m_bgcolor = c.rgb ();
setCurrentBackgroundColor (c); setCurrentBackgroundColor (c);
} }
} }
KDE_NO_EXPORT void Viewer::resetBackgroundColor () { TDE_NO_EXPORT void Viewer::resetBackgroundColor () {
setCurrentBackgroundColor (m_bgcolor); setCurrentBackgroundColor (m_bgcolor);
} }
KDE_NO_EXPORT void Viewer::setCurrentBackgroundColor (const TQColor & c) { TDE_NO_EXPORT void Viewer::setCurrentBackgroundColor (const TQColor & c) {
setPaletteBackgroundColor (c); setPaletteBackgroundColor (c);
WId w = embeddedWinId (); WId w = embeddedWinId ();
if (w) { if (w) {

38
src/kmplayerview.h
Unescape View File

@ -78,7 +78,7 @@ private:
class InfoWindow : public TQTextEdit { class InfoWindow : public TQTextEdit {
public: public:
InfoWindow (TQWidget * parent, View * view); InfoWindow (TQWidget * parent, View * view);
KDE_NO_EXPORT View * view () const { return m_view; } TDE_NO_EXPORT View * view () const { return m_view; }
protected: protected:
void contextMenuEvent (TQContextMenuEvent * e); void contextMenuEvent (TQContextMenuEvent * e);
private: private:
@ -111,28 +111,28 @@ public:
//void print(TQPrinter *pPrinter); //void print(TQPrinter *pPrinter);
TextEdit * console () const { return m_multiedit; } TextEdit * console () const { return m_multiedit; }
KDE_NO_EXPORT Viewer * viewer () const { return m_viewer; } TDE_NO_EXPORT Viewer * viewer () const { return m_viewer; }
KDE_NO_EXPORT ControlPanel * controlPanel () const {return m_control_panel;} TDE_NO_EXPORT ControlPanel * controlPanel () const {return m_control_panel;}
KDE_NO_EXPORT StatusBar * statusBar () const {return m_status_bar;} TDE_NO_EXPORT StatusBar * statusBar () const {return m_status_bar;}
KDE_NO_EXPORT PlayListView * playList () const { return m_playlist; } TDE_NO_EXPORT PlayListView * playList () const { return m_playlist; }
KDE_NO_EXPORT InfoWindow * infoPanel () const { return m_infopanel; } TDE_NO_EXPORT InfoWindow * infoPanel () const { return m_infopanel; }
KDE_NO_EXPORT TQWidgetStack * widgetStack () const { return m_widgetstack; } TDE_NO_EXPORT TQWidgetStack * widgetStack () const { return m_widgetstack; }
KDE_NO_EXPORT KDockArea * docArea () const { return m_dockarea; } TDE_NO_EXPORT KDockArea * docArea () const { return m_dockarea; }
KDE_NO_EXPORT ViewArea * viewArea () const { return m_view_area; } TDE_NO_EXPORT ViewArea * viewArea () const { return m_view_area; }
KDE_NO_EXPORT bool keepSizeRatio () const { return m_keepsizeratio; } TDE_NO_EXPORT bool keepSizeRatio () const { return m_keepsizeratio; }
void setKeepSizeRatio (bool b); void setKeepSizeRatio (bool b);
void showWidget (WidgetType w); void showWidget (WidgetType w);
void setControlPanelMode (ControlPanelMode m); void setControlPanelMode (ControlPanelMode m);
void setStatusBarMode (StatusBarMode m); void setStatusBarMode (StatusBarMode m);
void setEraseColor (const TQColor &); void setEraseColor (const TQColor &);
KDE_NO_EXPORT ControlPanelMode controlPanelMode () const { return m_controlpanel_mode; } TDE_NO_EXPORT ControlPanelMode controlPanelMode () const { return m_controlpanel_mode; }
KDE_NO_EXPORT StatusBarMode statusBarMode () const { return m_statusbar_mode; } TDE_NO_EXPORT StatusBarMode statusBarMode () const { return m_statusbar_mode; }
void delayedShowButtons (bool show); void delayedShowButtons (bool show);
bool isFullScreen () const; bool isFullScreen () const;
int statusBarHeight () const; int statusBarHeight () const;
KDE_NO_EXPORT bool editMode () const { return m_edit_mode; } TDE_NO_EXPORT bool editMode () const { return m_edit_mode; }
bool setPicture (const TQString & path); bool setPicture (const TQString & path);
KDE_NO_EXPORT TQPixmap * image () const { return m_image; } TDE_NO_EXPORT TQPixmap * image () const { return m_image; }
void setNoInfoMessages (bool b) { m_no_info = b; } void setNoInfoMessages (bool b) { m_no_info = b; }
void setViewOnly (); void setViewOnly ();
void setInfoPanelOnly (); void setInfoPanelOnly ();
@ -140,7 +140,7 @@ public:
void setEditMode (RootPlayListItem *, bool enable=true); void setEditMode (RootPlayListItem *, bool enable=true);
void dragEnterEvent (TQDragEnterEvent *); void dragEnterEvent (TQDragEnterEvent *);
void dropEvent (TQDropEvent *); void dropEvent (TQDropEvent *);
KDE_NO_EXPORT void emitPictureClicked () { emit pictureClicked (); } TDE_NO_EXPORT void emitPictureClicked () { emit pictureClicked (); }
/* raise video widget, might (auto) hides panel */ /* raise video widget, might (auto) hides panel */
void videoStart (); void videoStart ();
void playingStart (); void playingStart ();
@ -161,9 +161,9 @@ signals:
void fullScreenChanged (); void fullScreenChanged ();
void windowVideoConsoleToggled (int wt); void windowVideoConsoleToggled (int wt);
protected: protected:
void leaveEvent (TQEvent *) KDE_NO_EXPORT; void leaveEvent (TQEvent *) TDE_NO_EXPORT;
void timerEvent (TQTimerEvent *) KDE_NO_EXPORT; void timerEvent (TQTimerEvent *) TDE_NO_EXPORT;
bool x11Event (XEvent *) KDE_NO_EXPORT; bool x11Event (XEvent *) TDE_NO_EXPORT;
private: private:
// widget for player's output // widget for player's output
Viewer * m_viewer; Viewer * m_viewer;
@ -222,7 +222,7 @@ public:
void setBackgroundColor (const TQColor & c); void setBackgroundColor (const TQColor & c);
void resetBackgroundColor (); void resetBackgroundColor ();
void setCurrentBackgroundColor (const TQColor & c); void setCurrentBackgroundColor (const TQColor & c);
KDE_NO_EXPORT View * view () const { return m_view; } TDE_NO_EXPORT View * view () const { return m_view; }
void changeProtocol (QXEmbed::Protocol p); void changeProtocol (QXEmbed::Protocol p);
public slots: public slots:
void sendConfigureEvent (); void sendConfigureEvent ();

2
src/main.cpp
Unescape View File

@ -41,7 +41,7 @@ static TDECmdLineOptions options[] =
extern "C" { extern "C" {
KDE_EXPORT int kdemain (int argc, char *argv[]) TDE_EXPORT int kdemain (int argc, char *argv[])
{ {
setsid (); setsid ();

32
src/playlistview.cpp
Unescape View File

@ -48,7 +48,7 @@ using namespace KMPlayer;
namespace KMPlayer { namespace KMPlayer {
KDE_NO_EXPORT bool isDragValid (TQDropEvent * de) { TDE_NO_EXPORT bool isDragValid (TQDropEvent * de) {
if (KURLDrag::canDecode (de)) if (KURLDrag::canDecode (de))
return true; return true;
if (TQTextDrag::canDecode (de)) { if (TQTextDrag::canDecode (de)) {
@ -163,7 +163,7 @@ int PlayListView::addTree (NodePtr root, const TQString & source, const TQString
return last_id; return last_id;
} }
KDE_NO_EXPORT PlayListItem * PlayListView::populate TDE_NO_EXPORT PlayListItem * PlayListView::populate
(NodePtr e, NodePtr focus, RootPlayListItem *root, PlayListItem * pitem, PlayListItem ** curitem) { (NodePtr e, NodePtr focus, RootPlayListItem *root, PlayListItem * pitem, PlayListItem ** curitem) {
root->have_dark_nodes |= !e->expose (); root->have_dark_nodes |= !e->expose ();
if (pitem && !root->show_all_nodes && !e->expose ()) { if (pitem && !root->show_all_nodes && !e->expose ()) {
@ -280,7 +280,7 @@ void PlayListView::updateTree (int id, NodePtr root, NodePtr active,
TQTimer::singleShot (0, this, TQ_SLOT (updateTrees ())); TQTimer::singleShot (0, this, TQ_SLOT (updateTrees ()));
} }
KDE_NO_EXPORT void PlayListView::updateTrees () { TDE_NO_EXPORT void PlayListView::updateTrees () {
for (; tree_update; tree_update = tree_update->next) { for (; tree_update; tree_update = tree_update->next) {
updateTree (tree_update->root_item, tree_update->node, tree_update->select); updateTree (tree_update->root_item, tree_update->node, tree_update->select);
if (tree_update->open) // FIXME for non-root nodes lazy loading if (tree_update->open) // FIXME for non-root nodes lazy loading
@ -319,7 +319,7 @@ void PlayListView::selectItem (const TQString & txt) {
} }
} }
KDE_NO_EXPORT TQDragObject * PlayListView::dragObject () { TDE_NO_EXPORT TQDragObject * PlayListView::dragObject () {
PlayListItem * item = static_cast <PlayListItem *> (selectedItem ()); PlayListItem * item = static_cast <PlayListItem *> (selectedItem ());
if (item && item->node) { if (item && item->node) {
TQString txt = item->node->isPlayable () TQString txt = item->node->isPlayable ()
@ -335,12 +335,12 @@ KDE_NO_EXPORT TQDragObject * PlayListView::dragObject () {
return 0; return 0;
} }
KDE_NO_EXPORT void PlayListView::setFont (const TQFont & fnt) { TDE_NO_EXPORT void PlayListView::setFont (const TQFont & fnt) {
setTreeStepSize (TQFontMetrics (fnt).boundingRect ('m').width ()); setTreeStepSize (TQFontMetrics (fnt).boundingRect ('m').width ());
TDEListView::setFont (fnt); TDEListView::setFont (fnt);
} }
KDE_NO_EXPORT void PlayListView::contextMenuItem (TQListViewItem * vi, const TQPoint & p, int) { TDE_NO_EXPORT void PlayListView::contextMenuItem (TQListViewItem * vi, const TQPoint & p, int) {
if (vi) { if (vi) {
PlayListItem * item = static_cast <PlayListItem *> (vi); PlayListItem * item = static_cast <PlayListItem *> (vi);
if (item->node || item->m_attr) { if (item->node || item->m_attr) {
@ -430,7 +430,7 @@ void PlayListView::toggleShowAllNodes () {
} }
} }
KDE_NO_EXPORT void PlayListView::showAllNodes(RootPlayListItem *ri, bool show) { TDE_NO_EXPORT void PlayListView::showAllNodes(RootPlayListItem *ri, bool show) {
if (ri && ri->show_all_nodes != show) { if (ri && ri->show_all_nodes != show) {
PlayListItem * cur_item = currentPlayListItem (); PlayListItem * cur_item = currentPlayListItem ();
ri->show_all_nodes = show; ri->show_all_nodes = show;
@ -445,7 +445,7 @@ KDE_NO_EXPORT void PlayListView::showAllNodes(RootPlayListItem *ri, bool show) {
} }
} }
KDE_NO_EXPORT bool PlayListView::acceptDrag (TQDropEvent * de) const { TDE_NO_EXPORT bool PlayListView::acceptDrag (TQDropEvent * de) const {
TQListViewItem * item = itemAt (contentsToViewport (de->pos ())); TQListViewItem * item = itemAt (contentsToViewport (de->pos ()));
if (item && (de->source () == this || isDragValid (de))) { if (item && (de->source () == this || isDragValid (de))) {
RootPlayListItem * ritem = rootItem (item); RootPlayListItem * ritem = rootItem (item);
@ -454,7 +454,7 @@ KDE_NO_EXPORT bool PlayListView::acceptDrag (TQDropEvent * de) const {
return false; return false;
} }
KDE_NO_EXPORT void PlayListView::itemDropped (TQDropEvent * de, TQListViewItem *after) { TDE_NO_EXPORT void PlayListView::itemDropped (TQDropEvent * de, TQListViewItem *after) {
if (!after) { // could still be a descendent if (!after) { // could still be a descendent
after = itemAt (contentsToViewport (de->pos ())); after = itemAt (contentsToViewport (de->pos ()));
if (after) if (after)
@ -494,7 +494,7 @@ KDE_NO_EXPORT void PlayListView::itemDropped (TQDropEvent * de, TQListViewItem *
m_view->dropEvent (de); m_view->dropEvent (de);
} }
KDE_NO_EXPORT void PlayListView::itemIsRenamed (TQListViewItem * qitem) { TDE_NO_EXPORT void PlayListView::itemIsRenamed (TQListViewItem * qitem) {
PlayListItem * item = static_cast <PlayListItem *> (qitem); PlayListItem * item = static_cast <PlayListItem *> (qitem);
if (item->node) { if (item->node) {
RootPlayListItem * ri = rootItem (qitem); RootPlayListItem * ri = rootItem (qitem);
@ -520,12 +520,12 @@ KDE_NO_EXPORT void PlayListView::itemIsRenamed (TQListViewItem * qitem) {
} }
} }
KDE_NO_EXPORT void PlayListView::itemIsSelected (TQListViewItem * qitem) { TDE_NO_EXPORT void PlayListView::itemIsSelected (TQListViewItem * qitem) {
RootPlayListItem * ri = rootItem (qitem); RootPlayListItem * ri = rootItem (qitem);
setItemsRenameable (ri && (ri->flags & TreeEdit) && ri != qitem); setItemsRenameable (ri && (ri->flags & TreeEdit) && ri != qitem);
} }
KDE_NO_EXPORT void PlayListView::rename (TQListViewItem * qitem, int c) { TDE_NO_EXPORT void PlayListView::rename (TQListViewItem * qitem, int c) {
PlayListItem * item = static_cast <PlayListItem *> (qitem); PlayListItem * item = static_cast <PlayListItem *> (qitem);
if (rootItem (qitem)->show_all_nodes && item && item->m_attr) { if (rootItem (qitem)->show_all_nodes && item && item->m_attr) {
PlayListItem * pi = static_cast <PlayListItem *> (qitem->parent ()); PlayListItem * pi = static_cast <PlayListItem *> (qitem->parent ());
@ -541,7 +541,7 @@ KDE_NO_EXPORT void PlayListView::rename (TQListViewItem * qitem, int c) {
} }
} }
KDE_NO_EXPORT void PlayListView::editCurrent () { TDE_NO_EXPORT void PlayListView::editCurrent () {
TQListViewItem * qitem = selectedItem (); TQListViewItem * qitem = selectedItem ();
if (qitem) { if (qitem) {
RootPlayListItem * ri = rootItem (qitem); RootPlayListItem * ri = rootItem (qitem);
@ -550,7 +550,7 @@ KDE_NO_EXPORT void PlayListView::editCurrent () {
} }
} }
KDE_NO_EXPORT void PlayListView::slotFind () { TDE_NO_EXPORT void PlayListView::slotFind () {
m_current_find_elm = 0L; m_current_find_elm = 0L;
if (!m_find_dialog) { if (!m_find_dialog) {
m_find_dialog = new KFindDialog (false, this, "kde_kmplayer_find", KFindDialog::CaseSensitive); m_find_dialog = new KFindDialog (false, this, "kde_kmplayer_find", KFindDialog::CaseSensitive);
@ -578,7 +578,7 @@ static TQListViewItem * findNodeInTree (NodePtr n, TQListViewItem * item) {
} }
KDE_NO_EXPORT void PlayListView::slotFindOk () { TDE_NO_EXPORT void PlayListView::slotFindOk () {
if (!m_find_dialog) if (!m_find_dialog)
return; return;
m_find_dialog->hide (); m_find_dialog->hide ();
@ -610,7 +610,7 @@ KDE_NO_EXPORT void PlayListView::slotFindOk () {
/* A bit tricky, but between the find's PlayListItems might be gone, so /* A bit tricky, but between the find's PlayListItems might be gone, so
* try to match on the generated tree following the source's document tree * try to match on the generated tree following the source's document tree
*/ */
KDE_NO_EXPORT void PlayListView::slotFindNext () { TDE_NO_EXPORT void PlayListView::slotFindNext () {
if (!m_find_dialog) if (!m_find_dialog)
return; return;
TQString str = m_find_dialog->pattern(); TQString str = m_find_dialog->pattern();

6
src/playlistview.h
Unescape View File

@ -158,15 +158,15 @@ private:
bool m_ignore_expanded; bool m_ignore_expanded;
}; };
KDE_NO_EXPORT inline PlayListView * PlayListItem::playListView () const { TDE_NO_EXPORT inline PlayListView * PlayListItem::playListView () const {
return static_cast <PlayListView *> (listView ()); return static_cast <PlayListView *> (listView ());
} }
KDE_NO_EXPORT inline PlayListItem * PlayListView::currentPlayListItem () const { TDE_NO_EXPORT inline PlayListItem * PlayListView::currentPlayListItem () const {
return static_cast <PlayListItem *> (currentItem ()); return static_cast <PlayListItem *> (currentItem ());
} }
KDE_NO_EXPORT inline PlayListItem * PlayListView::selectedPlayListItem() const { TDE_NO_EXPORT inline PlayListItem * PlayListView::selectedPlayListItem() const {
return static_cast <PlayListItem *> (selectedItem ()); return static_cast <PlayListItem *> (selectedItem ());
} }

52
src/pref.cpp
Unescape View File

@ -135,7 +135,7 @@ KDE_NO_CDTOR_EXPORT Preferences::Preferences(PartBase * player, Settings * setti
connect (this, TQ_SIGNAL (defaultClicked ()), TQ_SLOT (confirmDefaults ())); connect (this, TQ_SIGNAL (defaultClicked ()), TQ_SLOT (confirmDefaults ()));
} }
KDE_NO_EXPORT void Preferences::setPage (const char * name) { TDE_NO_EXPORT void Preferences::setPage (const char * name) {
TQObject * o = child (name, "TQFrame"); TQObject * o = child (name, "TQFrame");
if (!o) return; if (!o) return;
TQFrame * page = static_cast <TQFrame *>(o); TQFrame * page = static_cast <TQFrame *>(o);
@ -150,7 +150,7 @@ KDE_NO_EXPORT void Preferences::setPage (const char * name) {
showPage (pageIndex (t->parentWidget ())); showPage (pageIndex (t->parentWidget ()));
} }
KDE_NO_EXPORT void Preferences::addPrefPage (PreferencesPage * page) { TDE_NO_EXPORT void Preferences::addPrefPage (PreferencesPage * page) {
TQString item, subitem, icon; TQString item, subitem, icon;
TQFrame * frame; TQFrame * frame;
TQTabWidget * tab; TQTabWidget * tab;
@ -171,7 +171,7 @@ KDE_NO_EXPORT void Preferences::addPrefPage (PreferencesPage * page) {
tab->insertTab (frame, subitem); tab->insertTab (frame, subitem);
} }
KDE_NO_EXPORT void Preferences::removePrefPage(PreferencesPage * page) { TDE_NO_EXPORT void Preferences::removePrefPage(PreferencesPage * page) {
TQString item, subitem, icon; TQString item, subitem, icon;
page->prefLocation (item, icon, subitem); page->prefLocation (item, icon, subitem);
if (item.isEmpty ()) if (item.isEmpty ())
@ -301,22 +301,22 @@ KDE_NO_CDTOR_EXPORT PrefGeneralPageLooks::PrefGeneralPageLooks (TQWidget *parent
layout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding)); layout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
} }
KDE_NO_EXPORT void PrefGeneralPageLooks::colorItemChanged (int c) { TDE_NO_EXPORT void PrefGeneralPageLooks::colorItemChanged (int c) {
if (c < int (ColorSetting::last_target)) if (c < int (ColorSetting::last_target))
colorbutton->setColor (colors[c].newcolor); colorbutton->setColor (colors[c].newcolor);
} }
KDE_NO_EXPORT void PrefGeneralPageLooks::colorCanged (const TQColor & c) { TDE_NO_EXPORT void PrefGeneralPageLooks::colorCanged (const TQColor & c) {
if (colorscombo->currentItem () < int (ColorSetting::last_target)) if (colorscombo->currentItem () < int (ColorSetting::last_target))
colors[colorscombo->currentItem ()].newcolor = c; colors[colorscombo->currentItem ()].newcolor = c;
} }
KDE_NO_EXPORT void PrefGeneralPageLooks::fontItemChanged (int f) { TDE_NO_EXPORT void PrefGeneralPageLooks::fontItemChanged (int f) {
if (f < int (FontSetting::last_target)) if (f < int (FontSetting::last_target))
fontbutton->setFont (fonts[f].newfont); fontbutton->setFont (fonts[f].newfont);
} }
KDE_NO_EXPORT void PrefGeneralPageLooks::fontClicked () { TDE_NO_EXPORT void PrefGeneralPageLooks::fontClicked () {
if (fontscombo->currentItem () < int (FontSetting::last_target)) { if (fontscombo->currentItem () < int (FontSetting::last_target)) {
TQFont myfont = fonts [fontscombo->currentItem ()].newfont; TQFont myfont = fonts [fontscombo->currentItem ()].newfont;
int res = TDEFontDialog::getFont (myfont, false, this); int res = TDEFontDialog::getFont (myfont, false, this);
@ -387,10 +387,10 @@ KDE_NO_CDTOR_EXPORT PrefSourcePageURL::PrefSourcePageURL (TQWidget *parent)
this, TQ_SLOT (slotTextChanged (const TQString &))); this, TQ_SLOT (slotTextChanged (const TQString &)));
} }
KDE_NO_EXPORT void PrefSourcePageURL::slotBrowse () { TDE_NO_EXPORT void PrefSourcePageURL::slotBrowse () {
} }
KDE_NO_EXPORT void PrefSourcePageURL::slotTextChanged (const TQString &) { TDE_NO_EXPORT void PrefSourcePageURL::slotTextChanged (const TQString &) {
changed = true; changed = true;
} }
@ -439,19 +439,19 @@ KDE_NO_CDTOR_EXPORT PrefRecordPage::PrefRecordPage (TQWidget *parent, PartBase *
connect (replay, TQ_SIGNAL (clicked (int)), this, TQ_SLOT (replayClicked (int))); connect (replay, TQ_SIGNAL (clicked (int)), this, TQ_SLOT (replayClicked (int)));
} }
KDE_NO_EXPORT void PrefRecordPage::recordingStarted () { TDE_NO_EXPORT void PrefRecordPage::recordingStarted () {
recordButton->setText (i18n ("Stop Recording")); recordButton->setText (i18n ("Stop Recording"));
url->setEnabled (false); url->setEnabled (false);
topLevelWidget ()->hide (); topLevelWidget ()->hide ();
} }
KDE_NO_EXPORT void PrefRecordPage::recordingFinished () { TDE_NO_EXPORT void PrefRecordPage::recordingFinished () {
recordButton->setText (i18n ("Start Recording")); recordButton->setText (i18n ("Start Recording"));
url->setEnabled (true); url->setEnabled (true);
TQTimer::singleShot (0, m_player, TQ_SLOT(recordingStopped())); // removed from PartBase::setSource because PartBase::recordingStopped calls openURL and that will call PartBase::setSource and TQt doesn't like disconnecting/connecting a signal that is current TQTimer::singleShot (0, m_player, TQ_SLOT(recordingStopped())); // removed from PartBase::setSource because PartBase::recordingStopped calls openURL and that will call PartBase::setSource and TQt doesn't like disconnecting/connecting a signal that is current
} }
KDE_NO_EXPORT void PrefRecordPage::sourceChanged (Source * olds, Source * nws) { TDE_NO_EXPORT void PrefRecordPage::sourceChanged (Source * olds, Source * nws) {
int id = 0; int id = 0;
int nr_recs = 0; int nr_recs = 0;
if (olds) { if (olds) {
@ -472,7 +472,7 @@ KDE_NO_EXPORT void PrefRecordPage::sourceChanged (Source * olds, Source * nws) {
recordButton->setEnabled (nr_recs > 0); recordButton->setEnabled (nr_recs > 0);
} }
KDE_NO_EXPORT void PrefRecordPage::recorderClicked (int id) { TDE_NO_EXPORT void PrefRecordPage::recorderClicked (int id) {
bool b = false; bool b = false;
TQButton *recBtn = recorder->find(id); TQButton *recBtn = recorder->find(id);
if (recBtn) if (recBtn)
@ -485,11 +485,11 @@ KDE_NO_EXPORT void PrefRecordPage::recorderClicked (int id) {
} }
KDE_NO_EXPORT void PrefRecordPage::replayClicked (int id) { TDE_NO_EXPORT void PrefRecordPage::replayClicked (int id) {
replaytime->setEnabled (id == Settings::ReplayAfter); replaytime->setEnabled (id == Settings::ReplayAfter);
} }
KDE_NO_EXPORT void PrefRecordPage::slotRecord () { TDE_NO_EXPORT void PrefRecordPage::slotRecord () {
connect (m_player->source (), TQ_SIGNAL (stopPlaying ()), connect (m_player->source (), TQ_SIGNAL (stopPlaying ()),
this, TQ_SLOT (playingStopped ())); this, TQ_SLOT (playingStopped ()));
if (m_player->process () && m_player->process ()->playing ()) if (m_player->process () && m_player->process ()->playing ())
@ -498,7 +498,7 @@ KDE_NO_EXPORT void PrefRecordPage::slotRecord () {
playingStopped (); playingStopped ();
} }
KDE_NO_EXPORT void PrefRecordPage::playingStopped () { TDE_NO_EXPORT void PrefRecordPage::playingStopped () {
disconnect (m_player->source (), TQ_SIGNAL (stopPlaying ()), disconnect (m_player->source (), TQ_SIGNAL (stopPlaying ()),
this, TQ_SLOT (playingStopped ())); this, TQ_SLOT (playingStopped ()));
if (!url->lineEdit()->text().isEmpty()) { if (!url->lineEdit()->text().isEmpty()) {
@ -524,7 +524,7 @@ KDE_NO_EXPORT void PrefRecordPage::playingStopped () {
KDE_NO_CDTOR_EXPORT RecorderPage::RecorderPage (TQWidget *parent, PartBase * player) KDE_NO_CDTOR_EXPORT RecorderPage::RecorderPage (TQWidget *parent, PartBase * player)
: TQFrame (parent), next (0L), m_player (player) {} : TQFrame (parent), next (0L), m_player (player) {}
KDE_NO_EXPORT void RecorderPage::record () { TDE_NO_EXPORT void RecorderPage::record () {
Process * proc = m_player->recorders () [recorderName ()]; Process * proc = m_player->recorders () [recorderName ()];
m_player->setRecorder (recorderName ()); m_player->setRecorder (recorderName ());
Recorder * rec = dynamic_cast <Recorder *> (proc); Recorder * rec = dynamic_cast <Recorder *> (proc);
@ -556,11 +556,11 @@ KDE_NO_CDTOR_EXPORT PrefMEncoderPage::PrefMEncoderPage (TQWidget *parent, PartBa
connect (format, TQ_SIGNAL (clicked (int)), this, TQ_SLOT (formatClicked (int))); connect (format, TQ_SIGNAL (clicked (int)), this, TQ_SLOT (formatClicked (int)));
} }
KDE_NO_EXPORT void PrefMEncoderPage::formatClicked (int id) { TDE_NO_EXPORT void PrefMEncoderPage::formatClicked (int id) {
arguments->setEnabled (!!id); arguments->setEnabled (!!id);
} }
KDE_NO_EXPORT void PrefMEncoderPage::record () { TDE_NO_EXPORT void PrefMEncoderPage::record () {
#if KDE_IS_VERSION(3,1,90) #if KDE_IS_VERSION(3,1,90)
m_player->settings ()->recordcopy = !format->selectedId (); m_player->settings ()->recordcopy = !format->selectedId ();
#else #else
@ -570,7 +570,7 @@ KDE_NO_EXPORT void PrefMEncoderPage::record () {
RecorderPage::record (); RecorderPage::record ();
} }
KDE_NO_EXPORT TQString PrefMEncoderPage::name () { TDE_NO_EXPORT TQString PrefMEncoderPage::name () {
return i18n ("&MEncoder"); return i18n ("&MEncoder");
} }
@ -578,7 +578,7 @@ KDE_NO_CDTOR_EXPORT PrefMPlayerDumpstreamPage::PrefMPlayerDumpstreamPage (TQWidg
hide(); hide();
} }
KDE_NO_EXPORT TQString PrefMPlayerDumpstreamPage::name () { TDE_NO_EXPORT TQString PrefMPlayerDumpstreamPage::name () {
return i18n ("MPlayer -&dumpstream"); return i18n ("MPlayer -&dumpstream");
} }
@ -593,12 +593,12 @@ KDE_NO_CDTOR_EXPORT PrefFFMpegPage::PrefFFMpegPage (TQWidget *parent, PartBase *
layout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding)); layout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
} }
KDE_NO_EXPORT void PrefFFMpegPage::record () { TDE_NO_EXPORT void PrefFFMpegPage::record () {
m_player->settings ()->ffmpegarguments = arguments->text (); m_player->settings ()->ffmpegarguments = arguments->text ();
RecorderPage::record (); RecorderPage::record ();
} }
KDE_NO_EXPORT TQString PrefFFMpegPage::name () { TDE_NO_EXPORT TQString PrefFFMpegPage::name () {
return i18n ("&FFMpeg"); return i18n ("&FFMpeg");
} }
@ -607,7 +607,7 @@ KDE_NO_CDTOR_EXPORT PrefXinePage::PrefXinePage (TQWidget *parent, PartBase * pla
hide(); hide();
} }
KDE_NO_EXPORT TQString PrefXinePage::name () { TDE_NO_EXPORT TQString PrefXinePage::name () {
return i18n ("&Xine"); return i18n ("&Xine");
} }
#endif #endif
@ -834,7 +834,7 @@ KDE_NO_CDTOR_EXPORT PrefOPPagePostProc::PrefOPPagePostProc(TQWidget *parent) : T
PostprocessingOptions->adjustSize(); PostprocessingOptions->adjustSize();
} }
KDE_NO_EXPORT void Preferences::confirmDefaults() { TDE_NO_EXPORT void Preferences::confirmDefaults() {
// TODO: Switch to KMessageBox // TODO: Switch to KMessageBox
switch( TQMessageBox::warning( this, i18n("Reset Settings?"), switch( TQMessageBox::warning( this, i18n("Reset Settings?"),
i18n("You are about to have all your settings overwritten with defaults.\nPlease confirm.\n"), i18n("You are about to have all your settings overwritten with defaults.\nPlease confirm.\n"),
@ -846,7 +846,7 @@ KDE_NO_EXPORT void Preferences::confirmDefaults() {
} }
KDE_NO_EXPORT void Preferences::setDefaults() { TDE_NO_EXPORT void Preferences::setDefaults() {
m_GeneralPageGeneral->keepSizeRatio->setChecked(true); m_GeneralPageGeneral->keepSizeRatio->setChecked(true);
m_GeneralPageGeneral->loop->setChecked(false); m_GeneralPageGeneral->loop->setChecked(false);
m_GeneralPageGeneral->seekTime->setValue(10); m_GeneralPageGeneral->seekTime->setValue(10);

6
src/triestring.cpp
Unescape View File

@ -20,7 +20,7 @@
#ifdef TEST_TRIE #ifdef TEST_TRIE
# define KMPLAYER_NO_EXPORT # define KMPLAYER_NO_EXPORT
# define KMPLAYER_EXPORT # define KMPLAYER_EXPORT
# define KDE_NO_EXPORT # define TDE_NO_EXPORT
# define KDE_NO_CDTOR_EXPORT # define KDE_NO_CDTOR_EXPORT
#else #else
# include <config.h> # include <config.h>
@ -79,12 +79,12 @@ KDE_NO_CDTOR_EXPORT TrieNode::~TrieNode () {
free (str); free (str);
} }
KDE_NO_EXPORT void TrieNode::unref () { TDE_NO_EXPORT void TrieNode::unref () {
if (--ref_count <= 0 && !first_child) if (--ref_count <= 0 && !first_child)
parent->removeChild (this); parent->removeChild (this);
} }
KDE_NO_EXPORT void TrieNode::removeChild (TrieNode * node) { TDE_NO_EXPORT void TrieNode::removeChild (TrieNode * node) {
if (node == first_child) { if (node == first_child) {
first_child = node->next_sibling; first_child = node->next_sibling;
} else { } else {

104
src/viewarea.cpp
Unescape View File

@ -173,7 +173,7 @@ SurfacePtr ViewSurface::createSurface (NodePtr owner, const SRect & rect) {
return surface; return surface;
} }
KDE_NO_EXPORT void ViewSurface::resize (const SRect &r) { TDE_NO_EXPORT void ViewSurface::resize (const SRect &r) {
bounds = r; bounds = r;
#ifdef HAVE_CAIRO #ifdef HAVE_CAIRO
if (surface) if (surface)
@ -185,7 +185,7 @@ KDE_NO_EXPORT void ViewSurface::resize (const SRect &r) {
rect = nrect;*/ rect = nrect;*/
} }
KDE_NO_EXPORT IRect ViewSurface::toScreen (Single x, Single y, Single w, Single h) { TDE_NO_EXPORT IRect ViewSurface::toScreen (Single x, Single y, Single w, Single h) {
Matrix matrix (0, 0, xscale, yscale); Matrix matrix (0, 0, xscale, yscale);
matrix.translate (bounds.x (), bounds.y ()); matrix.translate (bounds.x (), bounds.y ());
for (SurfacePtr s = parentNode(); s; s = s->parentNode()) { for (SurfacePtr s = parentNode(); s; s = s->parentNode()) {
@ -196,20 +196,20 @@ KDE_NO_EXPORT IRect ViewSurface::toScreen (Single x, Single y, Single w, Single
return IRect (x, y, w, h); return IRect (x, y, w, h);
} }
KDE_NO_EXPORT TDE_NO_EXPORT
void ViewSurface::repaint (const SRect &r) { void ViewSurface::repaint (const SRect &r) {
markDirty (); markDirty ();
view_widget->scheduleRepaint (toScreen (r.x (), r.y (), r.width (), r.height ())); view_widget->scheduleRepaint (toScreen (r.x (), r.y (), r.width (), r.height ()));
//kdDebug() << "Surface::repaint x:" << (int)x << " y:" << (int)y << " w:" << (int)w << " h:" << (int)h << endl; //kdDebug() << "Surface::repaint x:" << (int)x << " y:" << (int)y << " w:" << (int)w << " h:" << (int)h << endl;
} }
KDE_NO_EXPORT TDE_NO_EXPORT
void ViewSurface::repaint () { void ViewSurface::repaint () {
markDirty (); markDirty ();
view_widget->scheduleRepaint (toScreen (0, 0, bounds.width (), bounds.height ())); view_widget->scheduleRepaint (toScreen (0, 0, bounds.width (), bounds.height ()));
} }
KDE_NO_EXPORT void ViewSurface::video () { TDE_NO_EXPORT void ViewSurface::video () {
view_widget->setAudioVideoNode (node); view_widget->setAudioVideoNode (node);
kdDebug() << "Surface::video:" << background_color << " " << (background_color & 0xff000000) << endl; kdDebug() << "Surface::video:" << background_color << " " << (background_color & 0xff000000) << endl;
xscale = yscale = 1; // either scale width/heigt or use bounds xscale = yscale = 1; // either scale width/heigt or use bounds
@ -315,11 +315,11 @@ KDE_NO_CDTOR_EXPORT CairoPaintVisitor::~CairoPaintVisitor () {
cairo_destroy (cr); cairo_destroy (cr);
} }
KDE_NO_EXPORT void CairoPaintVisitor::visit (Node * n) { TDE_NO_EXPORT void CairoPaintVisitor::visit (Node * n) {
kdWarning() << "Paint called on " << n->nodeName() << endl; kdWarning() << "Paint called on " << n->nodeName() << endl;
} }
KDE_NO_EXPORT void CairoPaintVisitor::traverseRegion (SMIL::RegionBase * reg) { TDE_NO_EXPORT void CairoPaintVisitor::traverseRegion (SMIL::RegionBase * reg) {
// next visit listeners // next visit listeners
NodeRefListPtr nl = reg->listeners (mediatype_attached); NodeRefListPtr nl = reg->listeners (mediatype_attached);
if (nl) { if (nl) {
@ -346,7 +346,7 @@ KDE_NO_EXPORT void CairoPaintVisitor::traverseRegion (SMIL::RegionBase * reg) {
r->data->accept (this); r->data->accept (this);
} }
KDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::Layout * reg) { TDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::Layout * reg) {
//kdDebug() << "Visit " << reg->nodeName() << endl; //kdDebug() << "Visit " << reg->nodeName() << endl;
SMIL::RegionBase *rb = convertNode <SMIL::RegionBase> (reg->rootLayout); SMIL::RegionBase *rb = convertNode <SMIL::RegionBase> (reg->rootLayout);
if (reg->surface () && rb) { if (reg->surface () && rb) {
@ -382,7 +382,7 @@ KDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::Layout * reg) {
} }
} }
KDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::Region * reg) { TDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::Region * reg) {
Surface *s = reg->surface (); Surface *s = reg->surface ();
if (s) { if (s) {
SRect rect = s->bounds; SRect rect = s->bounds;
@ -441,7 +441,7 @@ KDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::Region * reg) {
cairo_set_source (cr, pat); \ cairo_set_source (cr, pat); \
} }
KDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::Transition *trans) { TDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::Transition *trans) {
float perc = trans->start_progress + (trans->end_progress - trans->start_progress)*cur_media->trans_step / cur_media->trans_steps; float perc = trans->start_progress + (trans->end_progress - trans->start_progress)*cur_media->trans_step / cur_media->trans_steps;
if (cur_media->trans_out_active) if (cur_media->trans_out_active)
perc = 1.0 - perc; perc = 1.0 - perc;
@ -588,7 +588,7 @@ KDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::Transition *trans) {
} }
} }
KDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::RefMediaType *ref) { TDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::RefMediaType *ref) {
Surface *s = ref->surface (); Surface *s = ref->surface ();
if (s) { if (s) {
if (ref->external_tree) if (ref->external_tree)
@ -598,7 +598,7 @@ KDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::RefMediaType *ref) {
} }
} }
KDE_NO_EXPORT void CairoPaintVisitor::paint (SMIL::MediaType *mt, Surface *s, TDE_NO_EXPORT void CairoPaintVisitor::paint (SMIL::MediaType *mt, Surface *s,
int x, int y, const IRect &rect) { int x, int y, const IRect &rect) {
cairo_save (cr); cairo_save (cr);
opacity = 1.0; opacity = 1.0;
@ -628,7 +628,7 @@ KDE_NO_EXPORT void CairoPaintVisitor::paint (SMIL::MediaType *mt, Surface *s,
cairo_restore (cr); cairo_restore (cr);
} }
KDE_NO_EXPORT TDE_NO_EXPORT
void CairoPaintVisitor::updateExternal (SMIL::MediaType *av, SurfacePtr s) { void CairoPaintVisitor::updateExternal (SMIL::MediaType *av, SurfacePtr s) {
SRect rect = s->bounds; SRect rect = s->bounds;
Single x = rect.x (); Single x = rect.x ();
@ -656,7 +656,7 @@ void CairoPaintVisitor::updateExternal (SMIL::MediaType *av, SurfacePtr s) {
paint (av, s.ptr (), x, y, clip_rect); paint (av, s.ptr (), x, y, clip_rect);
} }
KDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::AVMediaType *av) { TDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::AVMediaType *av) {
Surface *s = av->surface (); Surface *s = av->surface ();
if (s) { if (s) {
if (av->external_tree) if (av->external_tree)
@ -666,7 +666,7 @@ KDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::AVMediaType *av) {
} }
} }
KDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::ImageMediaType * img) { TDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::ImageMediaType * img) {
//kdDebug() << "Visit " << img->nodeName() << " " << img->src << endl; //kdDebug() << "Visit " << img->nodeName() << " " << img->src << endl;
Surface *s = img->surface (); Surface *s = img->surface ();
if (!s) if (!s)
@ -696,7 +696,7 @@ KDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::ImageMediaType * img) {
s->dirty = false; s->dirty = false;
} }
KDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::TextMediaType * txt) { TDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::TextMediaType * txt) {
TextRuntime * td = static_cast <TextRuntime *> (txt->runtime ()); TextRuntime * td = static_cast <TextRuntime *> (txt->runtime ());
Surface *s = txt->surface (); Surface *s = txt->surface ();
//kdDebug() << "Visit " << txt->nodeName() << " " << td->text << endl; //kdDebug() << "Visit " << txt->nodeName() << " " << td->text << endl;
@ -844,7 +844,7 @@ KDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::TextMediaType * txt) {
s->dirty = false; s->dirty = false;
} }
KDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::Brush * brush) { TDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::Brush * brush) {
//kdDebug() << "Visit " << brush->nodeName() << endl; //kdDebug() << "Visit " << brush->nodeName() << endl;
Surface *s = brush->surface (); Surface *s = brush->surface ();
if (s) { if (s) {
@ -876,7 +876,7 @@ KDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::Brush * brush) {
} }
} }
KDE_NO_EXPORT void CairoPaintVisitor::visit (RP::Imfl * imfl) { TDE_NO_EXPORT void CairoPaintVisitor::visit (RP::Imfl * imfl) {
if (imfl->surface ()) { if (imfl->surface ()) {
cairo_save (cr); cairo_save (cr);
Matrix m = matrix; Matrix m = matrix;
@ -926,7 +926,7 @@ KDE_NO_EXPORT void CairoPaintVisitor::visit (RP::Imfl * imfl) {
} }
} }
KDE_NO_EXPORT void CairoPaintVisitor::visit (RP::Fill * fi) { TDE_NO_EXPORT void CairoPaintVisitor::visit (RP::Fill * fi) {
//kdDebug() << "Visit " << fi->nodeName() << endl; //kdDebug() << "Visit " << fi->nodeName() << endl;
CAIRO_SET_SOURCE_RGB (cr, fi->color); CAIRO_SET_SOURCE_RGB (cr, fi->color);
if ((int)fi->w && (int)fi->h) { if ((int)fi->w && (int)fi->h) {
@ -935,7 +935,7 @@ KDE_NO_EXPORT void CairoPaintVisitor::visit (RP::Fill * fi) {
} }
} }
KDE_NO_EXPORT void CairoPaintVisitor::visit (RP::Fadein * fi) { TDE_NO_EXPORT void CairoPaintVisitor::visit (RP::Fadein * fi) {
//kdDebug() << "Visit " << fi->nodeName() << endl; //kdDebug() << "Visit " << fi->nodeName() << endl;
if (fi->target && fi->target->id == RP::id_node_image) { if (fi->target && fi->target->id == RP::id_node_image) {
RP::Image *img = convertNode <RP::Image> (fi->target); RP::Image *img = convertNode <RP::Image> (fi->target);
@ -971,7 +971,7 @@ KDE_NO_EXPORT void CairoPaintVisitor::visit (RP::Fadein * fi) {
} }
} }
KDE_NO_EXPORT void CairoPaintVisitor::visit (RP::Fadeout * fo) { TDE_NO_EXPORT void CairoPaintVisitor::visit (RP::Fadeout * fo) {
//kdDebug() << "Visit " << fo->nodeName() << endl; //kdDebug() << "Visit " << fo->nodeName() << endl;
if (fo->progress > 0) { if (fo->progress > 0) {
CAIRO_SET_SOURCE_RGB (cr, fo->to_color); CAIRO_SET_SOURCE_RGB (cr, fo->to_color);
@ -985,7 +985,7 @@ KDE_NO_EXPORT void CairoPaintVisitor::visit (RP::Fadeout * fo) {
} }
} }
KDE_NO_EXPORT void CairoPaintVisitor::visit (RP::Crossfade * cf) { TDE_NO_EXPORT void CairoPaintVisitor::visit (RP::Crossfade * cf) {
//kdDebug() << "Visit " << cf->nodeName() << endl; //kdDebug() << "Visit " << cf->nodeName() << endl;
if (cf->target && cf->target->id == RP::id_node_image) { if (cf->target && cf->target->id == RP::id_node_image) {
RP::Image *img = convertNode <RP::Image> (cf->target); RP::Image *img = convertNode <RP::Image> (cf->target);
@ -1021,7 +1021,7 @@ KDE_NO_EXPORT void CairoPaintVisitor::visit (RP::Crossfade * cf) {
} }
} }
KDE_NO_EXPORT void CairoPaintVisitor::visit (RP::Wipe * wipe) { TDE_NO_EXPORT void CairoPaintVisitor::visit (RP::Wipe * wipe) {
//kdDebug() << "Visit " << wipe->nodeName() << endl; //kdDebug() << "Visit " << wipe->nodeName() << endl;
if (wipe->target && wipe->target->id == RP::id_node_image) { if (wipe->target && wipe->target->id == RP::id_node_image) {
RP::Image *img = convertNode <RP::Image> (wipe->target); RP::Image *img = convertNode <RP::Image> (wipe->target);
@ -1077,7 +1077,7 @@ KDE_NO_EXPORT void CairoPaintVisitor::visit (RP::Wipe * wipe) {
} }
} }
KDE_NO_EXPORT void CairoPaintVisitor::visit (RP::ViewChange * vc) { TDE_NO_EXPORT void CairoPaintVisitor::visit (RP::ViewChange * vc) {
//kdDebug() << "Visit " << vc->nodeName() << endl; //kdDebug() << "Visit " << vc->nodeName() << endl;
if (vc->unfinished () || vc->progress < 100) { if (vc->unfinished () || vc->progress < 100) {
cairo_pattern_t * pat = cairo_pop_group (cr); // from imfl cairo_pattern_t * pat = cairo_pop_group (cr); // from imfl
@ -1139,11 +1139,11 @@ MouseVisitor::MouseVisitor (unsigned int evt, int a, int b)
: event (evt), x (a), y (b), handled (false), bubble_up (false) { : event (evt), x (a), y (b), handled (false), bubble_up (false) {
} }
KDE_NO_EXPORT void MouseVisitor::visit (Node * n) { TDE_NO_EXPORT void MouseVisitor::visit (Node * n) {
kdDebug () << "Mouse event ignored for " << n->nodeName () << endl; kdDebug () << "Mouse event ignored for " << n->nodeName () << endl;
} }
KDE_NO_EXPORT void MouseVisitor::visit (SMIL::Layout * layout) { TDE_NO_EXPORT void MouseVisitor::visit (SMIL::Layout * layout) {
if (layout->surface ()) { if (layout->surface ()) {
Matrix m = matrix; Matrix m = matrix;
SRect rect = layout->region_surface->bounds; SRect rect = layout->region_surface->bounds;
@ -1165,7 +1165,7 @@ KDE_NO_EXPORT void MouseVisitor::visit (SMIL::Layout * layout) {
} }
} }
KDE_NO_EXPORT void MouseVisitor::visit (SMIL::Region * region) { TDE_NO_EXPORT void MouseVisitor::visit (SMIL::Region * region) {
if (region->surface ()) { if (region->surface ()) {
SRect rect = region->region_surface->bounds; SRect rect = region->region_surface->bounds;
Single rx = rect.x(), ry = rect.y(), rw = rect.width(), rh = rect.height(); Single rx = rect.x(), ry = rect.y(), rw = rect.width(), rh = rect.height();
@ -1243,14 +1243,14 @@ static void followLink (SMIL::LinkingBase * link) {
} }
} }
KDE_NO_EXPORT void MouseVisitor::visit (SMIL::Anchor * anchor) { TDE_NO_EXPORT void MouseVisitor::visit (SMIL::Anchor * anchor) {
if (event == event_pointer_moved) if (event == event_pointer_moved)
cursor.setShape (TQt::PointingHandCursor); cursor.setShape (TQt::PointingHandCursor);
else if (event == event_pointer_clicked) else if (event == event_pointer_clicked)
followLink (anchor); followLink (anchor);
} }
KDE_NO_EXPORT void MouseVisitor::visit (SMIL::Area * area) { TDE_NO_EXPORT void MouseVisitor::visit (SMIL::Area * area) {
NodePtr n = area->parentNode (); NodePtr n = area->parentNode ();
if (n->id >= SMIL::id_node_first_mediatype && if (n->id >= SMIL::id_node_first_mediatype &&
n->id < SMIL::id_node_last_mediatype) { n->id < SMIL::id_node_last_mediatype) {
@ -1293,11 +1293,11 @@ KDE_NO_EXPORT void MouseVisitor::visit (SMIL::Area * area) {
} }
} }
KDE_NO_EXPORT void MouseVisitor::visit (SMIL::TimedMrl * timedmrl) { TDE_NO_EXPORT void MouseVisitor::visit (SMIL::TimedMrl * timedmrl) {
timedmrl->runtime ()->processEvent (event); timedmrl->runtime ()->processEvent (event);
} }
KDE_NO_EXPORT void MouseVisitor::visit (SMIL::MediaType * mediatype) { TDE_NO_EXPORT void MouseVisitor::visit (SMIL::MediaType * mediatype) {
if (mediatype->sensitivity == SMIL::MediaType::sens_transparent) { if (mediatype->sensitivity == SMIL::MediaType::sens_transparent) {
bubble_up = true; bubble_up = true;
return; return;
@ -1362,7 +1362,7 @@ KDE_NO_CDTOR_EXPORT ViewArea::ViewArea (TQWidget * parent, View * view)
KDE_NO_CDTOR_EXPORT ViewArea::~ViewArea () { KDE_NO_CDTOR_EXPORT ViewArea::~ViewArea () {
} }
KDE_NO_EXPORT void ViewArea::fullScreen () { TDE_NO_EXPORT void ViewArea::fullScreen () {
this->killTimers (); this->killTimers ();
m_mouse_invisible_timer = m_repaint_timer = 0; m_mouse_invisible_timer = m_repaint_timer = 0;
if (m_fullscreen) { if (m_fullscreen) {
@ -1428,11 +1428,11 @@ void ViewArea::minimalMode () {
m_topwindow_rect = topLevelWidget ()->geometry (); m_topwindow_rect = topLevelWidget ()->geometry ();
} }
KDE_NO_EXPORT void ViewArea::accelActivated () { TDE_NO_EXPORT void ViewArea::accelActivated () {
m_view->controlPanel()->popupMenu ()->activateItemAt (m_view->controlPanel()->popupMenu ()->indexOf (ControlPanel::menu_fullscreen)); m_view->controlPanel()->popupMenu ()->activateItemAt (m_view->controlPanel()->popupMenu ()->indexOf (ControlPanel::menu_fullscreen));
} }
KDE_NO_EXPORT void ViewArea::mousePressEvent (TQMouseEvent * e) { TDE_NO_EXPORT void ViewArea::mousePressEvent (TQMouseEvent * e) {
if (surface->node) { if (surface->node) {
MouseVisitor visitor (event_pointer_clicked, e->x(), e->y()); MouseVisitor visitor (event_pointer_clicked, e->x(), e->y());
surface->node->accept (&visitor); surface->node->accept (&visitor);
@ -1440,11 +1440,11 @@ KDE_NO_EXPORT void ViewArea::mousePressEvent (TQMouseEvent * e) {
e->accept (); e->accept ();
} }
KDE_NO_EXPORT void ViewArea::mouseDoubleClickEvent (TQMouseEvent *) { TDE_NO_EXPORT void ViewArea::mouseDoubleClickEvent (TQMouseEvent *) {
m_view->fullScreen (); // screensaver stuff m_view->fullScreen (); // screensaver stuff
} }
KDE_NO_EXPORT void ViewArea::mouseMoveEvent (TQMouseEvent * e) { TDE_NO_EXPORT void ViewArea::mouseMoveEvent (TQMouseEvent * e) {
if (e->state () == TQt::NoButton) { if (e->state () == TQt::NoButton) {
int vert_buttons_pos = height () - m_view->statusBarHeight (); int vert_buttons_pos = height () - m_view->statusBarHeight ();
int cp_height = m_view->controlPanel ()->maximumSize ().height (); int cp_height = m_view->controlPanel ()->maximumSize ().height ();
@ -1460,7 +1460,7 @@ KDE_NO_EXPORT void ViewArea::mouseMoveEvent (TQMouseEvent * e) {
mouseMoved (); // for m_mouse_invisible_timer mouseMoved (); // for m_mouse_invisible_timer
} }
KDE_NO_EXPORT void ViewArea::syncVisual (const IRect & rect) { TDE_NO_EXPORT void ViewArea::syncVisual (const IRect & rect) {
#ifdef HAVE_CAIRO #ifdef HAVE_CAIRO
int ex = rect.x; int ex = rect.x;
if (ex > 0) if (ex > 0)
@ -1490,7 +1490,7 @@ KDE_NO_EXPORT void ViewArea::syncVisual (const IRect & rect) {
//XFlush (tqt_xdisplay ()); //XFlush (tqt_xdisplay ());
} }
KDE_NO_EXPORT void ViewArea::paintEvent (TQPaintEvent * pe) { TDE_NO_EXPORT void ViewArea::paintEvent (TQPaintEvent * pe) {
#ifdef HAVE_CAIRO #ifdef HAVE_CAIRO
if (surface->node) if (surface->node)
scheduleRepaint (IRect (pe->rect ().x (), pe->rect ().y (), pe->rect ().width (), pe->rect ().height ())); scheduleRepaint (IRect (pe->rect ().x (), pe->rect ().y (), pe->rect ().width (), pe->rect ().height ()));
@ -1499,12 +1499,12 @@ KDE_NO_EXPORT void ViewArea::paintEvent (TQPaintEvent * pe) {
TQWidget::paintEvent (pe); TQWidget::paintEvent (pe);
} }
KDE_NO_EXPORT void ViewArea::scale (int val) { TDE_NO_EXPORT void ViewArea::scale (int val) {
m_fullscreen_scale = val; m_fullscreen_scale = val;
resizeEvent (0L); resizeEvent (0L);
} }
KDE_NO_EXPORT void ViewArea::updateSurfaceBounds () { TDE_NO_EXPORT void ViewArea::updateSurfaceBounds () {
Single x, y, w = width (), h = height (); Single x, y, w = width (), h = height ();
h -= m_view->statusBarHeight (); h -= m_view->statusBarHeight ();
h -= m_view->controlPanel ()->isVisible () h -= m_view->controlPanel ()->isVisible ()
@ -1538,7 +1538,7 @@ KDE_NO_EXPORT void ViewArea::updateSurfaceBounds () {
scheduleRepaint (IRect (0, 0, width (), height ())); scheduleRepaint (IRect (0, 0, width (), height ()));
} }
KDE_NO_EXPORT void ViewArea::resizeEvent (TQResizeEvent *) { TDE_NO_EXPORT void ViewArea::resizeEvent (TQResizeEvent *) {
if (!m_view->controlPanel ()) return; if (!m_view->controlPanel ()) return;
Single x, y, w = width (), h = height (); Single x, y, w = width (), h = height ();
Single hsb = m_view->statusBarHeight (); Single hsb = m_view->statusBarHeight ();
@ -1576,7 +1576,7 @@ KDE_NO_EXPORT void ViewArea::resizeEvent (TQResizeEvent *) {
setAudioVideoGeometry (IRect (x, y, wws, hws), 0L); setAudioVideoGeometry (IRect (x, y, wws, hws), 0L);
} }
KDE_NO_EXPORT TDE_NO_EXPORT
void ViewArea::setAudioVideoGeometry (const IRect &rect, unsigned int * bg_color) { void ViewArea::setAudioVideoGeometry (const IRect &rect, unsigned int * bg_color) {
int x = rect.x, y = rect.y, w = rect.w, h = rect.h; int x = rect.x, y = rect.y, w = rect.w, h = rect.h;
if (m_view->controlPanelMode() == View::CP_Only) { if (m_view->controlPanelMode() == View::CP_Only) {
@ -1609,11 +1609,11 @@ void ViewArea::setAudioVideoGeometry (const IRect &rect, unsigned int * bg_color
} }
} }
KDE_NO_EXPORT void ViewArea::setAudioVideoNode (NodePtr n) { TDE_NO_EXPORT void ViewArea::setAudioVideoNode (NodePtr n) {
video_node = n; video_node = n;
} }
KDE_NO_EXPORT SurfacePtr ViewArea::getSurface (NodePtr node) { TDE_NO_EXPORT SurfacePtr ViewArea::getSurface (NodePtr node) {
static_cast <ViewSurface *> (surface.ptr ())->clear (); static_cast <ViewSurface *> (surface.ptr ())->clear ();
surface->node = node; surface->node = node;
m_view->viewer()->resetBackgroundColor (); m_view->viewer()->resetBackgroundColor ();
@ -1625,23 +1625,23 @@ KDE_NO_EXPORT SurfacePtr ViewArea::getSurface (NodePtr node) {
return 0L; return 0L;
} }
KDE_NO_EXPORT void ViewArea::showEvent (TQShowEvent *) { TDE_NO_EXPORT void ViewArea::showEvent (TQShowEvent *) {
resizeEvent (0L); resizeEvent (0L);
} }
KDE_NO_EXPORT void ViewArea::dropEvent (TQDropEvent * de) { TDE_NO_EXPORT void ViewArea::dropEvent (TQDropEvent * de) {
m_view->dropEvent (de); m_view->dropEvent (de);
} }
KDE_NO_EXPORT void ViewArea::dragEnterEvent (TQDragEnterEvent* dee) { TDE_NO_EXPORT void ViewArea::dragEnterEvent (TQDragEnterEvent* dee) {
m_view->dragEnterEvent (dee); m_view->dragEnterEvent (dee);
} }
KDE_NO_EXPORT void ViewArea::contextMenuEvent (TQContextMenuEvent * e) { TDE_NO_EXPORT void ViewArea::contextMenuEvent (TQContextMenuEvent * e) {
m_view->controlPanel ()->popupMenu ()->exec (e->globalPos ()); m_view->controlPanel ()->popupMenu ()->exec (e->globalPos ());
} }
KDE_NO_EXPORT void ViewArea::mouseMoved () { TDE_NO_EXPORT void ViewArea::mouseMoved () {
if (m_fullscreen) { if (m_fullscreen) {
if (m_mouse_invisible_timer) if (m_mouse_invisible_timer)
killTimer (m_mouse_invisible_timer); killTimer (m_mouse_invisible_timer);
@ -1650,7 +1650,7 @@ KDE_NO_EXPORT void ViewArea::mouseMoved () {
} }
} }
KDE_NO_EXPORT void ViewArea::scheduleRepaint (const IRect &rect) { TDE_NO_EXPORT void ViewArea::scheduleRepaint (const IRect &rect) {
if (m_repaint_timer) { if (m_repaint_timer) {
m_repaint_rect = m_repaint_rect.unite (rect); m_repaint_rect = m_repaint_rect.unite (rect);
} else { } else {
@ -1659,7 +1659,7 @@ KDE_NO_EXPORT void ViewArea::scheduleRepaint (const IRect &rect) {
} }
} }
KDE_NO_EXPORT void ViewArea::timerEvent (TQTimerEvent * e) { TDE_NO_EXPORT void ViewArea::timerEvent (TQTimerEvent * e) {
if (e->timerId () == m_mouse_invisible_timer) { if (e->timerId () == m_mouse_invisible_timer) {
killTimer (m_mouse_invisible_timer); killTimer (m_mouse_invisible_timer);
m_mouse_invisible_timer = 0; m_mouse_invisible_timer = 0;
@ -1676,7 +1676,7 @@ KDE_NO_EXPORT void ViewArea::timerEvent (TQTimerEvent * e) {
} }
} }
KDE_NO_EXPORT void ViewArea::closeEvent (TQCloseEvent * e) { TDE_NO_EXPORT void ViewArea::closeEvent (TQCloseEvent * e) {
//kdDebug () << "closeEvent" << endl; //kdDebug () << "closeEvent" << endl;
if (m_fullscreen) { if (m_fullscreen) {
fullScreen (); fullScreen ();

8
src/viewarea.h
Unescape View File

@ -38,10 +38,10 @@ class KMPLAYER_EXPORT ViewArea : public TQWidget {
public: public:
ViewArea (TQWidget * parent, View * view); ViewArea (TQWidget * parent, View * view);
~ViewArea (); ~ViewArea ();
KDE_NO_EXPORT bool isFullScreen () const { return m_fullscreen; } TDE_NO_EXPORT bool isFullScreen () const { return m_fullscreen; }
KDE_NO_EXPORT bool isMinimalMode () const { return m_minimal; } TDE_NO_EXPORT bool isMinimalMode () const { return m_minimal; }
KDE_NO_EXPORT TDEActionCollection * actionCollection () const { return m_collection; } TDE_NO_EXPORT TDEActionCollection * actionCollection () const { return m_collection; }
KDE_NO_EXPORT TQRect topWindowRect () const { return m_topwindow_rect; } TDE_NO_EXPORT TQRect topWindowRect () const { return m_topwindow_rect; }
SurfacePtr getSurface (NodePtr node); SurfacePtr getSurface (NodePtr node);
void setAudioVideoGeometry (const IRect &rect, unsigned int * bg); void setAudioVideoGeometry (const IRect &rect, unsigned int * bg);
void setAudioVideoNode (NodePtr n); void setAudioVideoNode (NodePtr n);

Write Preview
Loading…
Cancel
Save