diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-01-17 19:27:51 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-30 14:32:10 +0100 |
commit | 5980bc41cf55073e63236467466a59577d406937 (patch) | |
tree | 9be7ed8c7adc8ec4fbe8b860feebd7961ac453d0 /src/plugins/directshow | |
parent | b690a4d90282d2cae5d7a10739d726594d036dde (diff) |
whitespace fixes
remove trailing spaces & expand tabs.
Change-Id: I05ef110abed90f13b47752760ffb4567a11a6a5e
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
Diffstat (limited to 'src/plugins/directshow')
12 files changed, 34 insertions, 34 deletions
diff --git a/src/plugins/directshow/camera/dscamerasession.cpp b/src/plugins/directshow/camera/dscamerasession.cpp index cc1594feb..6b474e898 100644 --- a/src/plugins/directshow/camera/dscamerasession.cpp +++ b/src/plugins/directshow/camera/dscamerasession.cpp @@ -81,7 +81,7 @@ public: STDMETHODIMP QueryInterface(REFIID riid, void **ppvObject) { - if (NULL == ppvObject) + if (NULL == ppvObject) return E_POINTER; if (riid == IID_IUnknown /*__uuidof(IUnknown) */ ) { *ppvObject = static_cast<IUnknown*>(this); @@ -380,9 +380,9 @@ QSize DSCameraSession::frameSize() const void DSCameraSession::setFrameSize(const QSize& s) { - if (supportedResolutions(pixelF).contains(s)) + if (supportedResolutions(pixelF).contains(s)) m_windowSize = s; - else + else qWarning() << "frame size if not supported for current pixel format, no change"; } @@ -465,8 +465,8 @@ void DSCameraSession::setPixelFormat(QVideoFrame::PixelFormat fmt) QList<QSize> DSCameraSession::supportedResolutions(QVideoFrame::PixelFormat format) { - if (!resolutions.contains(format)) - return QList<QSize>(); + if (!resolutions.contains(format)) + return QList<QSize>(); return resolutions.value(format); } diff --git a/src/plugins/directshow/camera/dsvideowidgetcontrol.cpp b/src/plugins/directshow/camera/dsvideowidgetcontrol.cpp index fde9f554e..35b795546 100644 --- a/src/plugins/directshow/camera/dsvideowidgetcontrol.cpp +++ b/src/plugins/directshow/camera/dsvideowidgetcontrol.cpp @@ -120,7 +120,7 @@ DSVideoWidgetControl::DSVideoWidgetControl(DSCameraSession* session, QObject *pa m_widget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); m_widget->setAlignment(Qt::AlignCenter); m_widget->setAttribute(Qt::WA_NoSystemBackground, true); - + surface = new DSVideoWidgetSurface(m_widget); QPalette palette; @@ -157,7 +157,7 @@ bool DSVideoWidgetControl::eventFilter(QObject *object, QEvent *e) case QEvent::PolishRequest: m_widget->ensurePolished(); break; - + default: // Do nothing break; diff --git a/src/plugins/directshow/camera/dsvideowidgetcontrol.h b/src/plugins/directshow/camera/dsvideowidgetcontrol.h index ac40fbd7c..2a8775aee 100644 --- a/src/plugins/directshow/camera/dsvideowidgetcontrol.h +++ b/src/plugins/directshow/camera/dsvideowidgetcontrol.h @@ -82,15 +82,15 @@ class DSVideoWidgetSurface : public QAbstractVideoSurface class DSVideoWidgetControl : public QVideoWidgetControl { Q_OBJECT - + DSVideoWidgetSurface* surface; public: // Constructor & Destructor - + DSVideoWidgetControl(DSCameraSession* session, QObject *parent = 0); virtual ~DSVideoWidgetControl(); public: // QVideoWidgetControl - + QWidget *videoWidget(); // Aspect Ratio @@ -118,10 +118,10 @@ public: // QVideoWidgetControl void setSaturation(int saturation); public: // Internal - + bool eventFilter(QObject *object, QEvent *event); - -/* + +/* Q_SIGNALS: // QVideoWidgetControl void fullScreenChanged(bool fullScreen); diff --git a/src/plugins/directshow/player/directshoweventloop.cpp b/src/plugins/directshow/player/directshoweventloop.cpp index 74f210b9a..a8726eddd 100644 --- a/src/plugins/directshow/player/directshoweventloop.cpp +++ b/src/plugins/directshow/player/directshoweventloop.cpp @@ -94,7 +94,7 @@ void DirectShowEventLoop::wait(QMutex *mutex) HANDLE handles[] = { m_eventHandle, m_waitHandle }; while (::WaitForMultipleObjects(2, handles, false, INFINITE) == WAIT_OBJECT_0) processEvents(); - + mutex->lock(); } diff --git a/src/plugins/directshow/player/directshowglobal.h b/src/plugins/directshow/player/directshowglobal.h index b604a8d0e..f2a7fef03 100644 --- a/src/plugins/directshow/player/directshowglobal.h +++ b/src/plugins/directshow/player/directshowglobal.h @@ -76,7 +76,7 @@ DECLARE_INTERFACE_(IFilterGraph2 ,IGraphBuilder) STDMETHOD(ReconnectEx)(THIS_ IPin *, const AM_MEDIA_TYPE *) PURE; STDMETHOD(RenderEx)(IPin *, DWORD, DWORD *) PURE; }; -#undef INTERFACE +#undef INTERFACE #endif #ifndef __IAMFilterMiscFlags_INTERFACE_DEFINED__ @@ -89,7 +89,7 @@ DECLARE_INTERFACE_(IAMFilterMiscFlags ,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD_(ULONG,GetMiscFlags)(THIS) PURE; }; -#undef INTERFACE +#undef INTERFACE #endif #ifndef __IFileSourceFilter_INTERFACE_DEFINED__ @@ -103,7 +103,7 @@ DECLARE_INTERFACE_(IFileSourceFilter ,IUnknown) STDMETHOD(Load)(THIS_ LPCOLESTR, const AM_MEDIA_TYPE *) PURE; STDMETHOD(GetCurFile)(THIS_ LPOLESTR *ppszFileName, AM_MEDIA_TYPE *) PURE; }; -#undef INTERFACE +#undef INTERFACE #endif #ifndef __IAMOpenProgress_INTERFACE_DEFINED__ @@ -117,7 +117,7 @@ DECLARE_INTERFACE_(IAMOpenProgress ,IUnknown) STDMETHOD(QueryProgress)(THIS_ LONGLONG *, LONGLONG *) PURE; STDMETHOD(AbortOperation)(THIS) PURE; }; -#undef INTERFACE +#undef INTERFACE #endif #ifndef __IFilterChain_INTERFACE_DEFINED__ @@ -133,7 +133,7 @@ DECLARE_INTERFACE_(IFilterChain ,IUnknown) STDMETHOD(StopChain)(IBaseFilter *, IBaseFilter *) PURE; STDMETHOD(RemoveChain)(IBaseFilter *, IBaseFilter *) PURE; }; -#undef INTERFACE +#undef INTERFACE #endif #endif diff --git a/src/plugins/directshow/player/directshowioreader.cpp b/src/plugins/directshow/player/directshowioreader.cpp index c0ea4ebbd..38928f1ae 100644 --- a/src/plugins/directshow/player/directshowioreader.cpp +++ b/src/plugins/directshow/player/directshowioreader.cpp @@ -259,7 +259,7 @@ HRESULT DirectShowIOReader::SyncReadAligned(IMediaSample *pSample) if (SUCCEEDED(hr)) pSample->SetActualDataLength(bytesRead); - + return hr; } else { m_synchronousPosition = position; diff --git a/src/plugins/directshow/player/directshowiosource.cpp b/src/plugins/directshow/player/directshowiosource.cpp index f382b3b9c..acce1de28 100644 --- a/src/plugins/directshow/player/directshowiosource.cpp +++ b/src/plugins/directshow/player/directshowiosource.cpp @@ -336,7 +336,7 @@ HRESULT DirectShowIOSource::Connect(IPin *pReceivePin, const AM_MEDIA_TYPE *pmt) return VFW_E_NOT_STOPPED; } else if (m_peerPin) { return VFW_E_ALREADY_CONNECTED; - } else { + } else { HRESULT hr = VFW_E_TYPE_NOT_ACCEPTED; m_peerPin = pReceivePin; @@ -424,7 +424,7 @@ HRESULT DirectShowIOSource::tryConnect(IPin *pin, const AM_MEDIA_TYPE *type) || m_allocator->GetProperties(&properties) == S_OK) { if (properties.cbAlign == 0) properties.cbAlign = 1; - + ALLOCATOR_PROPERTIES actualProperties; if (SUCCEEDED(hr = m_allocator->SetProperties(&properties, &actualProperties))) hr = memPin->NotifyAllocator(m_allocator, TRUE); @@ -435,7 +435,7 @@ HRESULT DirectShowIOSource::tryConnect(IPin *pin, const AM_MEDIA_TYPE *type) } } memPin->Release(); - } + } if (!SUCCEEDED(hr)) pin->Disconnect(); } diff --git a/src/plugins/directshow/player/directshowmetadatacontrol.cpp b/src/plugins/directshow/player/directshowmetadatacontrol.cpp index d60bce31a..51d9574ba 100644 --- a/src/plugins/directshow/player/directshowmetadatacontrol.cpp +++ b/src/plugins/directshow/player/directshowmetadatacontrol.cpp @@ -255,7 +255,7 @@ static QVariant getValue(IWMHeaderInfo *header, const wchar_t *key) WORD word; if (header->GetAttributeByName( &streamNumber, - key, + key, &type, reinterpret_cast<BYTE *>(&word), &size) == S_OK) { diff --git a/src/plugins/directshow/player/directshowplayercontrol.h b/src/plugins/directshow/player/directshowplayercontrol.h index 175937169..478389de6 100644 --- a/src/plugins/directshow/player/directshowplayercontrol.h +++ b/src/plugins/directshow/player/directshowplayercontrol.h @@ -79,7 +79,7 @@ public: bool isVideoAvailable() const; bool isSeekable() const; - + QMediaTimeRange availablePlaybackRanges() const; qreal playbackRate() const; @@ -140,7 +140,7 @@ private: bool m_seekable; QMediaContent m_media; QString m_errorString; - + }; #endif diff --git a/src/plugins/directshow/player/directshowplayerservice.cpp b/src/plugins/directshow/player/directshowplayerservice.cpp index 9d74be592..0afeacb85 100644 --- a/src/plugins/directshow/player/directshowplayerservice.cpp +++ b/src/plugins/directshow/player/directshowplayerservice.cpp @@ -563,7 +563,7 @@ void DirectShowPlayerService::releaseGraph() } m_graph->Abort(); } - + m_pendingTasks = ReleaseGraph; ::SetEvent(m_taskHandle); @@ -803,7 +803,7 @@ void DirectShowPlayerService::doStop(QMutexLocker *locker) m_pendingTasks |= Seek; m_executedTasks &= ~(Play | Pause); - + QCoreApplication::postEvent(this, new QEvent(QEvent::Type(StatusChange))); } @@ -852,7 +852,7 @@ void DirectShowPlayerService::doSetRate(QMutexLocker *locker) seeking->Release(); } else if (m_rate != 1.0) { - m_rate = 1.0; + m_rate = 1.0; } QCoreApplication::postEvent(this, new QEvent(QEvent::Type(RateChange))); } @@ -980,7 +980,7 @@ void DirectShowPlayerService::setAudioOutput(IBaseFilter *filter) m_loop->wait(&m_mutex); } m_audioOutput->Release(); - } + } m_audioOutput = filter; diff --git a/src/plugins/directshow/player/directshowsamplescheduler.cpp b/src/plugins/directshow/player/directshowsamplescheduler.cpp index 36aefa049..2f61784a7 100644 --- a/src/plugins/directshow/player/directshowsamplescheduler.cpp +++ b/src/plugins/directshow/player/directshowsamplescheduler.cpp @@ -308,10 +308,10 @@ void DirectShowSampleScheduler::run(REFERENCE_TIME startTime) for (DirectShowTimedSample *sample = m_head; sample; sample = sample->nextSample()) { sample->schedule(m_clock, m_startTime, m_timeoutEvent); } - + if (!(m_state & Flushing)) ::ResetEvent(m_flushEvent); - + if (!m_head) ::SetEvent(m_timeoutEvent); @@ -338,7 +338,7 @@ void DirectShowSampleScheduler::stop() for (DirectShowTimedSample *sample = m_head; sample; sample = sample->remove()) { sample->unschedule(m_clock); - + m_semaphore.release(1); } diff --git a/src/plugins/directshow/player/videosurfacefilter.cpp b/src/plugins/directshow/player/videosurfacefilter.cpp index b8a775bb7..b6cc232ab 100644 --- a/src/plugins/directshow/player/videosurfacefilter.cpp +++ b/src/plugins/directshow/player/videosurfacefilter.cpp @@ -81,7 +81,7 @@ VideoSurfaceFilter::~VideoSurfaceFilter() } HRESULT VideoSurfaceFilter::QueryInterface(REFIID riid, void **ppvObject) -{ +{ // 2dd74950-a890-11d1-abe8-00a0c905f375 static const GUID iid_IAmFilterMiscFlags = { 0x2dd74950, 0xa890, 0x11d1, {0xab, 0xe8, 0x00, 0xa0, 0xc9, 0x05, 0xf3, 0x75} }; |