diff options
| author | Gareth Stockwell <gareth.stockwell@sosco.com> | 2009-08-26 12:01:15 (GMT) |
|---|---|---|
| committer | Gareth Stockwell <gareth.stockwell@sosco.com> | 2009-08-26 12:01:15 (GMT) |
| commit | 13d35977cb4fa6a94b5cc8b3ebd230c7ef41acc9 (patch) | |
| tree | 18e8ddb83926a2af8a26e8976bf5b3f057220e5a /src | |
| parent | 7104201d87b965a01c2983cd44ef2e0f465030bf (diff) | |
| download | Qt-13d35977cb4fa6a94b5cc8b3ebd230c7ef41acc9.zip Qt-13d35977cb4fa6a94b5cc8b3ebd230c7ef41acc9.tar.gz Qt-13d35977cb4fa6a94b5cc8b3ebd230c7ef41acc9.tar.bz2 | |
Wrapped VideoOuput::dump() in a macro for easier removal later on
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/phonon/mmf/defs.h | 2 | ||||
| -rw-r--r-- | src/3rdparty/phonon/mmf/videooutput.cpp | 5 | ||||
| -rw-r--r-- | src/3rdparty/phonon/mmf/videooutput.h | 3 | ||||
| -rw-r--r-- | src/3rdparty/phonon/mmf/videoplayer.cpp | 2 |
4 files changed, 10 insertions, 2 deletions
diff --git a/src/3rdparty/phonon/mmf/defs.h b/src/3rdparty/phonon/mmf/defs.h index 90c647f..12b8785 100644 --- a/src/3rdparty/phonon/mmf/defs.h +++ b/src/3rdparty/phonon/mmf/defs.h @@ -34,6 +34,8 @@ along with this library. If not, see <http://www.gnu.org/licenses/>. // rect, i.e. QWidget::winId()->Rect() //#define PHONON_MMF_HARD_CODE_VIDEO_RECT +#define PHONON_MMF_DEBUG_VIDEO_OUTPUT + namespace Phonon { namespace MMF diff --git a/src/3rdparty/phonon/mmf/videooutput.cpp b/src/3rdparty/phonon/mmf/videooutput.cpp index fd8a80b..171565b 100644 --- a/src/3rdparty/phonon/mmf/videooutput.cpp +++ b/src/3rdparty/phonon/mmf/videooutput.cpp @@ -45,12 +45,14 @@ MMF::VideoOutput::VideoOutput(QWidget* parent) setAutoFillBackground(false); #endif // PHONON_MMF_VIDEOOUTPUT_IS_QWIDGET +#ifdef PHONON_MMF_DEBUG_VIDEO_OUTPUT dump(); +#endif TRACE_EXIT_0(); } -// Debugging video visibility +#ifdef PHONON_MMF_DEBUG_VIDEO_OUTPUT void VideoOutput::dump() { TRACE_CONTEXT(VideoOutput::dump, EVideoInternal); @@ -94,6 +96,7 @@ void VideoOutput::dump() TRACE_EXIT_0(); } +#endif // PHONON_MMF_DEBUG_VIDEO_OUTPUT MMF::VideoOutput::~VideoOutput() { diff --git a/src/3rdparty/phonon/mmf/videooutput.h b/src/3rdparty/phonon/mmf/videooutput.h index 90709aa..6d1e4a0 100644 --- a/src/3rdparty/phonon/mmf/videooutput.h +++ b/src/3rdparty/phonon/mmf/videooutput.h @@ -50,9 +50,10 @@ namespace Phonon QPaintEngine* paintEngine() const; #endif // PHONON_MMF_VIDEOOUTPUT_IS_QWIDGET - // Debugging video visibility +#ifdef PHONON_MMF_DEBUG_VIDEO_OUTPUT public: void dump(); +#endif private: QSize m_frameSize; diff --git a/src/3rdparty/phonon/mmf/videoplayer.cpp b/src/3rdparty/phonon/mmf/videoplayer.cpp index fd8425d..df922ec 100644 --- a/src/3rdparty/phonon/mmf/videoplayer.cpp +++ b/src/3rdparty/phonon/mmf/videoplayer.cpp @@ -301,7 +301,9 @@ void MMF::VideoPlayer::videoOutputRegionChanged() TRACE_CONTEXT(VideoPlayer::videoOutputRegionChanged, EVideoInternal); TRACE_ENTRY_0(); +#ifdef PHONON_MMF_DEBUG_VIDEO_OUTPUT videoOutput().dump(); +#endif getNativeWindowSystemHandles(); |