diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
commit | 27edf28be2772229a7974a007313ea30d92c3ffd (patch) | |
tree | 14b9842bbd90c801d89ad5ddb38831fdf8aec1a4 /mpeglib/lib/output/outputStream.cpp | |
parent | 7ef01c0f34d9c6732d258154bcd3ba5a88280db9 (diff) | |
download | tdemultimedia-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 'mpeglib/lib/output/outputStream.cpp')
-rw-r--r-- | mpeglib/lib/output/outputStream.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mpeglib/lib/output/outputStream.cpp b/mpeglib/lib/output/outputStream.cpp index 560ab75f..ef209cbc 100644 --- a/mpeglib/lib/output/outputStream.cpp +++ b/mpeglib/lib/output/outputStream.cpp @@ -198,7 +198,7 @@ int OutputStream::getFrameusec() { -int OutputStream::waitStreamState(int method,int tqmask,int streamType) { +int OutputStream::waitStreamState(int method,int mask,int streamType) { int* waitState=NULL; switch(streamType) { @@ -216,9 +216,9 @@ int OutputStream::waitStreamState(int method,int tqmask,int streamType) { if (method == _OUTPUT_WAIT_METHOD_BLOCK) { abs_thread_mutex_lock(&stateChangeMut); - while ((*waitState &= tqmask)==0) { + while ((*waitState &= mask)==0) { cout << "waitStreamState:"<<waitState<<endl; - cout << "tqmask:"<<tqmask<<endl; + cout << "mask:"<<mask<<endl; abs_thread_cond_wait(&stateChangeCond,&stateChangeMut); } abs_thread_mutex_unlock(&stateChangeMut); |