summaryrefslogtreecommitdiffstats
path: root/noatun/library/engine.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
commit27edf28be2772229a7974a007313ea30d92c3ffd (patch)
tree14b9842bbd90c801d89ad5ddb38831fdf8aec1a4 /noatun/library/engine.cpp
parent7ef01c0f34d9c6732d258154bcd3ba5a88280db9 (diff)
downloadtdemultimedia-27edf28be2772229a7974a007313ea30d92c3ffd.tar.gz
tdemultimedia-27edf28be2772229a7974a007313ea30d92c3ffd.zip
rename the following methods:
tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'noatun/library/engine.cpp')
-rw-r--r--noatun/library/engine.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/noatun/library/engine.cpp b/noatun/library/engine.cpp
index 06693797..36863a0c 100644
--- a/noatun/library/engine.cpp
+++ b/noatun/library/engine.cpp
@@ -79,13 +79,13 @@ namespace VolumeControls
else
{
#define ERROR { fd=-1; return; }
- int devtqmask, rectqmask, i_recsrc, stereodevs;
+ int devmask, recmask, i_recsrc, stereodevs;
// Mixer is open. Now define properties
- if (ioctl(fd, SOUND_MIXER_READ_DEVMASK, &devtqmask) == -1) ERROR
- if (ioctl(fd, SOUND_MIXER_READ_RECMASK, &rectqmask) == -1) ERROR
+ if (ioctl(fd, SOUND_MIXER_READ_DEVMASK, &devmask) == -1) ERROR
+ if (ioctl(fd, SOUND_MIXER_READ_RECMASK, &recmask) == -1) ERROR
if (ioctl(fd, SOUND_MIXER_READ_RECSRC, &i_recsrc) == -1) ERROR
if (ioctl(fd, SOUND_MIXER_READ_STEREODEVS, &stereodevs) == -1) ERROR
- if (!devtqmask) ERROR
+ if (!devmask) ERROR
#undef ERROR
}
@@ -248,7 +248,7 @@ Noatun::StereoEffectStack *Engine::globalEffectStack() const { return &d->globa
Noatun::Equalizer *Engine::equalizer() const { return &d->equalizer; }
Noatun::Session *Engine::session() const { return &d->session; }
-Engine::Engine(TQObject *tqparent) : TQObject(tqparent, "Engine"), mPlay(false)
+Engine::Engine(TQObject *parent) : TQObject(parent, "Engine"), mPlay(false)
{
d=new EnginePrivate;
// Connect to aRts