equal
deleted
inserted
replaced
27 |
27 |
28 // ----------------------------------------------------------------------------- |
28 // ----------------------------------------------------------------------------- |
29 // Static method to create the private wrapper instance |
29 // Static method to create the private wrapper instance |
30 // ----------------------------------------------------------------------------- |
30 // ----------------------------------------------------------------------------- |
31 GlxTvOutWrapperPrivate* GlxTvOutWrapperPrivate::Instance(GlxTvOutWrapper* aTvOutWrapper, |
31 GlxTvOutWrapperPrivate* GlxTvOutWrapperPrivate::Instance(GlxTvOutWrapper* aTvOutWrapper, |
32 QAbstractItemModel* aModel,bool aEfectsOn) |
32 QAbstractItemModel* aModel,QSize aScreenSize,bool aEfectsOn) |
33 { |
33 { |
34 TRACER("GlxTvOutWrapperPrivate::Instance()"); |
34 TRACER("GlxTvOutWrapperPrivate::Instance()"); |
35 GlxTvOutWrapperPrivate* self = new GlxTvOutWrapperPrivate(aTvOutWrapper,aModel); |
35 GlxTvOutWrapperPrivate* self = new GlxTvOutWrapperPrivate(aTvOutWrapper,aModel); |
36 if (self){ |
36 if (self){ |
37 TRAPD(err,self->ConstructL(aEfectsOn)); |
37 TRAPD(err,self->ConstructL(aScreenSize,aEfectsOn)); |
38 if(err != KErrNone){ |
38 if(err != KErrNone){ |
39 delete self; |
39 delete self; |
40 self = NULL; |
40 self = NULL; |
41 } |
41 } |
42 } |
42 } |
45 |
45 |
46 // ----------------------------------------------------------------------------- |
46 // ----------------------------------------------------------------------------- |
47 // ConstructL |
47 // ConstructL |
48 // This creates the Connection observer and the Hdmi Controller |
48 // This creates the Connection observer and the Hdmi Controller |
49 // ----------------------------------------------------------------------------- |
49 // ----------------------------------------------------------------------------- |
50 void GlxTvOutWrapperPrivate::ConstructL(bool aEfectsOn) |
50 void GlxTvOutWrapperPrivate::ConstructL(QSize aScreenSize,bool aEfectsOn) |
51 { |
51 { |
52 TRACER("GlxTvOutWrapperPrivate::ConstructL()"); |
52 TRACER("GlxTvOutWrapperPrivate::ConstructL()"); |
53 iConnectionObserver = CGlxConnectionObserver::NewL(this); |
53 iConnectionObserver = CGlxConnectionObserver::NewL(this); |
54 if (!iHdmiController) { |
54 if (!iHdmiController) { |
55 iHdmiController = CGlxHdmiController::NewL(aEfectsOn); |
55 TRect rect(0,0,aScreenSize.width(),aScreenSize.height()); |
|
56 iHdmiController = CGlxHdmiController::NewL(rect, |
|
57 aEfectsOn); |
56 iHdmiConnected = iConnectionObserver->IsHdmiConnected(); |
58 iHdmiConnected = iConnectionObserver->IsHdmiConnected(); |
57 } |
59 } |
58 } |
60 } |
59 |
61 |
60 // ----------------------------------------------------------------------------- |
62 // ----------------------------------------------------------------------------- |