diff options
| -rw-r--r-- | include/surfaceflinger/SurfaceComposerClient.h | 2 | ||||
| -rw-r--r-- | include/ui/FramebufferNativeWindow.h | 14 | ||||
| -rwxr-xr-x | services/surfaceflinger/DisplayHardware/DisplayHardware.cpp | 12 | ||||
| -rw-r--r-- | services/surfaceflinger/DisplayHardware/HWComposer.cpp | 4 | ||||
| -rw-r--r-- | services/surfaceflinger/DisplayHardware/HWComposer.h | 2 | ||||
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 12 | ||||
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.h | 2 | ||||
| -rw-r--r-- | services/surfaceflinger/SurfaceTextureLayer.cpp | 2 |
8 files changed, 9 insertions, 41 deletions
diff --git a/include/surfaceflinger/SurfaceComposerClient.h b/include/surfaceflinger/SurfaceComposerClient.h index 3c7a022..c853d6a 100644 --- a/include/surfaceflinger/SurfaceComposerClient.h +++ b/include/surfaceflinger/SurfaceComposerClient.h @@ -138,8 +138,6 @@ public: #ifdef QCOM_HDMI_OUT //HDMI SPecific functions static void enableExternalDisplay(int disp_type, int enable); - static void setActionSafeWidthRatio(float asWidthRatio); - static void setActionSafeHeightRatio(float asHeightRatio); #endif status_t hide(SurfaceID id); diff --git a/include/ui/FramebufferNativeWindow.h b/include/ui/FramebufferNativeWindow.h index c4a9eb3..c505616 100644 --- a/include/ui/FramebufferNativeWindow.h +++ b/include/ui/FramebufferNativeWindow.h @@ -59,17 +59,9 @@ public: framebuffer_device_t const * getDevice() const { return fbDev; } #ifdef QCOM_HDMI_OUT - void orientationChanged(int orientation) { - if (fbDev->orientationChanged) - fbDev->orientationChanged(fbDev, orientation); - } - void setActionSafeWidthRatio(float asWidthRatio) { - if (fbDev->setActionSafeWidthRatio) - fbDev->setActionSafeWidthRatio(fbDev, asWidthRatio); - } - void setActionSafeHeightRatio(float asHeightRatio) { - if (fbDev->setActionSafeHeightRatio) - fbDev->setActionSafeHeightRatio(fbDev, asHeightRatio); + void orientationChanged(int event, int orientation) { + if (fbDev->perform) + fbDev->perform(fbDev, event, orientation); } #endif diff --git a/services/surfaceflinger/DisplayHardware/DisplayHardware.cpp b/services/surfaceflinger/DisplayHardware/DisplayHardware.cpp index d2bf267..5b96587 100755 --- a/services/surfaceflinger/DisplayHardware/DisplayHardware.cpp +++ b/services/surfaceflinger/DisplayHardware/DisplayHardware.cpp @@ -421,16 +421,6 @@ void DisplayHardware::dump(String8& res) const #ifdef QCOM_HDMI_OUT void DisplayHardware::orientationChanged(int orientation) const { - mNativeWindow->orientationChanged(orientation); -} - -void DisplayHardware::setActionSafeWidthRatio(float asWidthRatio) const -{ - mNativeWindow->setActionSafeWidthRatio(asWidthRatio); -} - -void DisplayHardware::setActionSafeHeightRatio(float asHeightRatio) const -{ - mNativeWindow->setActionSafeHeightRatio(asHeightRatio); + mNativeWindow->orientationChanged(EVENT_ORIENTATION_CHANGE, orientation); } #endif diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp index f3c854e..34de259 100644 --- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp +++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp @@ -227,9 +227,9 @@ void HWComposer::dump(String8& result, char* buffer, size_t SIZE, } #ifdef QCOM_HDMI_OUT -void HWComposer::enableHDMIOutput(bool enable) { +void HWComposer::perform(int event, int value) { if (mHwc) { - mHwc->enableHDMIOutput(mHwc, enable); + mHwc->perform(mHwc, event, value); } } #endif diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.h b/services/surfaceflinger/DisplayHardware/HWComposer.h index b31dbbf..b155d42 100644 --- a/services/surfaceflinger/DisplayHardware/HWComposer.h +++ b/services/surfaceflinger/DisplayHardware/HWComposer.h @@ -72,7 +72,7 @@ public: uint32_t getFlags() const; #endif #ifdef QCOM_HDMI_OUT - void enableHDMIOutput(bool enable); + void perform(int event, int value); #endif // for debugging diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 83ffb4e..14e2fa0 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -1402,7 +1402,7 @@ void SurfaceFlinger::updateHwcExternalDisplay(int externaltype) const DisplayHardware& hw(graphicPlane(0).displayHardware()); mDirtyRegion.set(hw.bounds()); HWComposer& hwc(hw.getHwComposer()); - hwc.enableHDMIOutput(externaltype); + hwc.perform(EVENT_EXTERNAL_DISPLAY, externaltype); } /* @@ -1422,16 +1422,6 @@ void SurfaceFlinger::enableExternalDisplay(int disp_type, int value) signalEvent(); } } - -void SurfaceFlinger::setActionSafeWidthRatio(float asWidthRatio){ - const DisplayHardware& hw(graphicPlane(0).displayHardware()); - hw.setActionSafeWidthRatio(asWidthRatio); -} - -void SurfaceFlinger::setActionSafeHeightRatio(float asHeightRatio){ - const DisplayHardware& hw(graphicPlane(0).displayHardware()); - hw.setActionSafeHeightRatio(asHeightRatio); -} #endif sp<ISurface> SurfaceFlinger::createSurface( diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h index 3406bb3..b7a60f6 100644 --- a/services/surfaceflinger/SurfaceFlinger.h +++ b/services/surfaceflinger/SurfaceFlinger.h @@ -185,8 +185,6 @@ public: #ifdef QCOM_HDMI_OUT //HDMI Specific virtual void enableExternalDisplay(int disp_type, int externaltype); - virtual void setActionSafeWidthRatio(float asWidthRatio); - virtual void setActionSafeHeightRatio(float asHeightRatio); #endif virtual status_t captureScreen(DisplayID dpy, diff --git a/services/surfaceflinger/SurfaceTextureLayer.cpp b/services/surfaceflinger/SurfaceTextureLayer.cpp index bef8b79..7ee6f63 100644 --- a/services/surfaceflinger/SurfaceTextureLayer.cpp +++ b/services/surfaceflinger/SurfaceTextureLayer.cpp @@ -127,7 +127,7 @@ status_t SurfaceTextureLayer::connect(int api, #endif // fall through to set synchronous mode when not defaulting to // async mode. - deafult: + default: err = setSynchronousMode(true); break; } |