From dd3e7d2cd0aa1fa20c43ab552df18b37f2df1c82 Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Thu, 2 Jul 2020 18:03:10 +0900 Subject: [PATCH] DSDisplay: create the DSDisplayDeviceOutputTDMImpl at DSDisplayDeviceTDMImpl constructor. Change-Id: Ic5a6cfa0787bff6f8ab0d9cbd4d901b88fad9279 --- src/DSDisplayDevice/DSDisplayDeviceTDMImpl.cpp | 29 +++++++++++--------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/src/DSDisplayDevice/DSDisplayDeviceTDMImpl.cpp b/src/DSDisplayDevice/DSDisplayDeviceTDMImpl.cpp index 66e35e5..2255542 100644 --- a/src/DSDisplayDevice/DSDisplayDeviceTDMImpl.cpp +++ b/src/DSDisplayDevice/DSDisplayDeviceTDMImpl.cpp @@ -9,43 +9,38 @@ DSDisplayDeviceTDMImpl::DSDisplayDeviceTDMImpl() : __numOutputs(0) { tdm_error terror; + tdm_output *toutput; + IDSDisplayDeviceOutput *deviceOutput; __tdisplay = tdm_display_init(&terror); if (terror != TDM_ERROR_NONE) { DSLOG_ERR("TDM DEVICE", "tdm_display_init fails.\n"); } -} - -DSDisplayDeviceTDMImpl::~DSDisplayDeviceTDMImpl() -{ - tdm_display_deinit(__tdisplay); -} - -std::list DSDisplayDeviceTDMImpl::getOutputList() -{ - tdm_error terror; - tdm_output *toutput; - IDSDisplayDeviceOutput *deviceOutput; terror = tdm_display_get_output_count(__tdisplay, &__numOutputs); if (__numOutputs <= 0) { DSLOG_ERR("TDM DEVICE", "tdm_display_get_output_count fails.\n"); - return __outputList; + return; } for (int i = 0; i < __numOutputs; ++i) { toutput = tdm_display_get_output(__tdisplay, i, &terror); if (terror != TDM_ERROR_NONE) { DSLOG_ERR("TDM DEVICE", "tdm_display_get_output fails.(output num: %d)\n", i); - return __outputList; + return; } deviceOutput = new DSDisplayDeviceOutputTDMImpl(toutput); __outputList.emplace_back(deviceOutput); - - // emit the output added signal - this->__outputAddedSignal.emit(deviceOutput); } +} +DSDisplayDeviceTDMImpl::~DSDisplayDeviceTDMImpl() +{ + tdm_display_deinit(__tdisplay); +} + +std::list DSDisplayDeviceTDMImpl::getOutputList() +{ return __outputList; } -- 2.7.4