diff options
Diffstat (limited to 'noatun/library/engine.cpp')
| -rw-r--r-- | noatun/library/engine.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/noatun/library/engine.cpp b/noatun/library/engine.cpp index dbb4d978..fcf5d160 100644 --- a/noatun/library/engine.cpp +++ b/noatun/library/engine.cpp @@ -11,7 +11,7 @@ #include <tdemessagebox.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <kdebug.h> #include <tqfile.h> @@ -39,9 +39,7 @@ static Arts::PlayObject nullPO() { return Arts::PlayObject::null(); } #define HARDWARE_VOLUME -#if defined(__osf__) -#undef HARDWARE_VOLUME -#elif defined(__linux__) +#if defined(__linux__) #include <sys/soundcard.h> #elif defined(__FreeBSD__) #include <sys/soundcard.h> @@ -293,19 +291,19 @@ bool Engine::open(const PlaylistItem &file) d->pProxy = new TitleProxy::Proxy(KURL(file.property("stream_"))); d->playobj = factory.createPlayObject(d->pProxy->proxyUrl(), false); - connect(d->playobj, TQT_SIGNAL(destroyed()), this, TQT_SLOT(deleteProxy())); + connect(d->playobj, TQ_SIGNAL(destroyed()), this, TQ_SLOT(deleteProxy())); connect( - d->pProxy, TQT_SIGNAL( + d->pProxy, TQ_SIGNAL( metaData( const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &)), - this, TQT_SIGNAL( + this, TQ_SIGNAL( receivedStreamMeta(const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &)) ); - connect(d->pProxy, TQT_SIGNAL(proxyError()), this, TQT_SLOT(slotProxyError())); + connect(d->pProxy, TQ_SIGNAL(proxyError()), this, TQ_SLOT(slotProxyError())); } else { @@ -328,7 +326,7 @@ bool Engine::open(const PlaylistItem &file) } else { - connect( d->playobj, TQT_SIGNAL( playObjectCreated() ), this, TQT_SLOT( connectPlayObject() ) ); + connect( d->playobj, TQ_SIGNAL( playObjectCreated() ), this, TQ_SLOT( connectPlayObject() ) ); } if (mPlay) |