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) |
32 QAbstractItemModel* aModel,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()); |
37 TRAPD(err,self->ConstructL(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() |
50 void GlxTvOutWrapperPrivate::ConstructL(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(); |
55 iHdmiController = CGlxHdmiController::NewL(aEfectsOn); |
56 iHdmiConnected = iConnectionObserver->IsHdmiConnected(); |
56 iHdmiConnected = iConnectionObserver->IsHdmiConnected(); |
57 } |
57 } |
58 } |
58 } |
59 |
59 |
60 // ----------------------------------------------------------------------------- |
60 // ----------------------------------------------------------------------------- |
179 // ----------------------------------------------------------------------------- |
179 // ----------------------------------------------------------------------------- |
180 void GlxTvOutWrapperPrivate::SetToNativeMode() |
180 void GlxTvOutWrapperPrivate::SetToNativeMode() |
181 { |
181 { |
182 TRACER("GlxTvOutWrapperPrivate::SetToNativeMode()"); |
182 TRACER("GlxTvOutWrapperPrivate::SetToNativeMode()"); |
183 iIsPhotosInForeground = true; |
183 iIsPhotosInForeground = true; |
184 if(iHdmiController && iHdmiConnected){ |
184 |
|
185 if(iHdmiController && iHdmiConnected) { |
|
186 if (!isImageSetToHdmi){ |
|
187 } |
|
188 SetNewImage(); // this case can occur when FS image is opened and set to background |
|
189 // HDMI cable connected and then FS is brought to foreground |
|
190 } |
|
191 else{ |
185 iHdmiController->ShiftToPostingMode(); |
192 iHdmiController->ShiftToPostingMode(); |
186 } |
193 } |
187 } |
194 } |
188 |
195 |
189 // ----------------------------------------------------------------------------- |
196 // ----------------------------------------------------------------------------- |
212 // ----------------------------------------------------------------------------- |
219 // ----------------------------------------------------------------------------- |
213 void GlxTvOutWrapperPrivate::DeactivateZoom() |
220 void GlxTvOutWrapperPrivate::DeactivateZoom() |
214 { |
221 { |
215 if(iHdmiController && iHdmiConnected){ |
222 if(iHdmiController && iHdmiConnected){ |
216 iHdmiController->DeactivateZoom(); |
223 iHdmiController->DeactivateZoom(); |
|
224 } |
|
225 } |
|
226 |
|
227 // ----------------------------------------------------------------------------- |
|
228 // FadeSurface |
|
229 // ----------------------------------------------------------------------------- |
|
230 void GlxTvOutWrapperPrivate::FadeSurface(bool aFadeInOut) |
|
231 { |
|
232 if(iHdmiController && iHdmiConnected){ |
|
233 iHdmiController->FadeSurface(aFadeInOut); |
217 } |
234 } |
218 } |
235 } |
219 |
236 |
220 // ----------------------------------------------------------------------------- |
237 // ----------------------------------------------------------------------------- |
221 // getSubState |
238 // getSubState |