diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-01 21:07:37 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-01 21:07:37 (GMT) |
| commit | 23eb677daea8e084fcaa1256f1a9433e324b1474 (patch) | |
| tree | a21225293db6881174814290ad7298120c4a078b /src/3rdparty/phonon | |
| parent | 1f327a1de8db245d0b28e7dfdc5bca1af0b56782 (diff) | |
| parent | 37e8fd4e09c1221efde3e67e6acd5cfbb35686fd (diff) | |
| download | Qt-23eb677daea8e084fcaa1256f1a9433e324b1474.zip Qt-23eb677daea8e084fcaa1256f1a9433e324b1474.tar.gz Qt-23eb677daea8e084fcaa1256f1a9433e324b1474.tar.bz2 | |
Merge remote branch 'origin/4.7' into HEAD
Conflicts:
examples/declarative/proxywidgets/proxywidgets.pro
examples/declarative/widgets/mywidgets.pro
examples/declarative/widgets/widgets.pro
Diffstat (limited to 'src/3rdparty/phonon')
| -rw-r--r-- | src/3rdparty/phonon/ds9/iodevicereader.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/3rdparty/phonon/ds9/iodevicereader.cpp b/src/3rdparty/phonon/ds9/iodevicereader.cpp index 2dff1fe..9152712 100644 --- a/src/3rdparty/phonon/ds9/iodevicereader.cpp +++ b/src/3rdparty/phonon/ds9/iodevicereader.cpp @@ -139,10 +139,6 @@ namespace Phonon { QMutexLocker locker(&m_mutexRead); - if (m_mediaGraph->isStopping()) { - return VFW_E_WRONG_STATE; - } - if(streamSize() != 1 && pos + length > streamSize()) { //it tries to read outside of the boundaries return E_FAIL; @@ -158,9 +154,6 @@ namespace Phonon int oldSize = currentBufferSize(); while (currentBufferSize() < int(length)) { needData(); - if (m_mediaGraph->isStopping()) { - return VFW_E_WRONG_STATE; - } if (oldSize == currentBufferSize()) { break; //we didn't get any data |