diff options
| author | Gareth Stockwell <gareth.stockwell@sosco.com> | 2009-09-21 12:12:56 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-09-23 12:39:45 (GMT) |
| commit | d08436fbe0bd8da16aec2a0936c7d768e4045bfa (patch) | |
| tree | 4e010d0a98838867fa8e025c6c11b834441e4818 /src/3rdparty/phonon/mmf | |
| parent | f247454316e7226f79ae38237992c6470afe278a (diff) | |
| download | Qt-d08436fbe0bd8da16aec2a0936c7d768e4045bfa.zip Qt-d08436fbe0bd8da16aec2a0936c7d768e4045bfa.tar.gz Qt-d08436fbe0bd8da16aec2a0936c7d768e4045bfa.tar.bz2 | |
Removed hack in QSymbianControl for blitting a transparent bitmap in place of the backing store region
Diffstat (limited to 'src/3rdparty/phonon/mmf')
| -rw-r--r-- | src/3rdparty/phonon/mmf/videoplayer.cpp | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/src/3rdparty/phonon/mmf/videoplayer.cpp b/src/3rdparty/phonon/mmf/videoplayer.cpp index cc56671..7b4626c 100644 --- a/src/3rdparty/phonon/mmf/videoplayer.cpp +++ b/src/3rdparty/phonon/mmf/videoplayer.cpp @@ -30,8 +30,6 @@ along with this library. If not, see <http://www.gnu.org/licenses/>. #include "objectdump.h" #endif -#include <QtGui/private/qt_s60_p.h> // for QSymbianControl - QT_BEGIN_NAMESPACE using namespace Phonon; @@ -405,28 +403,12 @@ void MMF::VideoPlayer::getNativeWindowSystemHandles() VideoOutput& output = videoOutput(); CCoeControl* const control = output.winId(); - - // Inform control that it needs to brush rather than blit the backing store - QSymbianControl* const symbianControl = static_cast<QSymbianControl *>(control); - //symbianControl->setBlit(0xff00ff00); // opaque green - //symbianControl->setBlit(0x0000ff00); // transparent green - symbianControl->setBlit(0x00000000); // transparent black - + CCoeEnv* const coeEnv = control->ControlEnv(); m_wsSession = &(coeEnv->WsSession()); m_screenDevice = coeEnv->ScreenDevice(); m_window = control->DrawableWindow(); - -/* - // Set background window color - RWindow *const window = static_cast<RWindow *>(m_window); - const TDisplayMode displayMode = static_cast<TDisplayMode>(window->SetRequiredDisplayMode(EColor16MA)); - //const TInt err = window->SetTransparencyAlphaChannel(); - //if (err == KErrNone) - window->SetBackgroundColor(TRgb(255, 0, 255, 255)); - window->Invalidate(); // force a redraw -*/ - + #ifdef _DEBUG QScopedPointer<ObjectDump::QDumper> dumper(new ObjectDump::QDumper); dumper->setPrefix("Phonon::MMF"); // to aid searchability of logs |