diff --git a/plugins/channelrx/demodatv/atvscreen.cpp b/plugins/channelrx/demodatv/atvscreen.cpp index 95bcc0029..bba4aaf3d 100644 --- a/plugins/channelrx/demodatv/atvscreen.cpp +++ b/plugins/channelrx/demodatv/atvscreen.cpp @@ -37,7 +37,6 @@ ATVScreen::ATVScreen(QWidget* parent) : m_chrLastData = NULL; m_blnConfigChanged = false; m_blnDataChanged = false; - //m_blnRenderImmediate = false; m_blnGLContextInitialized = false; //Par défaut @@ -172,14 +171,6 @@ void ATVScreen::tick() } } -void ATVScreen::connectTimer(const QTimer& objTimer) -{ - qDebug() << "ATVScreen::connectTimer"; - disconnect(&m_objTimer, SIGNAL(timeout()), this, SLOT(tick())); - connect(&objTimer, SIGNAL(timeout()), this, SLOT(tick())); - m_objTimer.stop(); -} - void ATVScreen::cleanup() { if (m_blnGLContextInitialized) diff --git a/plugins/channelrx/demodatv/atvscreen.h b/plugins/channelrx/demodatv/atvscreen.h index 71ff751b3..37068aaa0 100644 --- a/plugins/channelrx/demodatv/atvscreen.h +++ b/plugins/channelrx/demodatv/atvscreen.h @@ -50,18 +50,8 @@ public: virtual void resizeATVScreen(int intCols, int intRows); virtual void renderImage(unsigned char * objData); - QRgb* getRowBuffer(int intRow); - void resetImage(); - virtual bool selectRow(int intLine); virtual bool setDataColor(int intCol,int intRed, int intGreen, int intBlue); - //void setRenderImmediate(bool blnRenderImmediate) { m_blnRenderImmediate = blnRenderImmediate; } - - void connectTimer(const QTimer& timer); - - //Valeurs par défaut - static const int ATV_COLS=192; - static const int ATV_ROWS=625; signals: void traceSizeChanged(int); @@ -77,18 +67,24 @@ private: QTimer m_objTimer; QMutex m_objMutex; bool m_blnDataChanged; - //bool m_blnRenderImmediate; bool m_blnConfigChanged; GLShaderArray m_objGLShaderArray; + unsigned char *m_chrLastData; + + //Valeurs par défaut + static const int ATV_COLS=192; + static const int ATV_ROWS=625; + void initializeGL(); void resizeGL(int width, int height); void paintGL(); void mousePressEvent(QMouseEvent*); - unsigned char *m_chrLastData; + QRgb* getRowBuffer(int intRow); + void resetImage(); protected slots: void cleanup();