Commit 11e5be5e authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Fix unconfigured consumer causing various crashes.

CCBUG: 409667
parent e0cd0a02
Pipeline #55989 passed with stage
in 10 minutes and 51 seconds
...@@ -216,6 +216,7 @@ void GLWidget::initializeGL() ...@@ -216,6 +216,7 @@ void GLWidget::initializeGL()
connect(m_frameRenderer, &FrameRenderer::frameDisplayed, this, &GLWidget::frameDisplayed, Qt::QueuedConnection); connect(m_frameRenderer, &FrameRenderer::frameDisplayed, this, &GLWidget::frameDisplayed, Qt::QueuedConnection);
m_initSem.release(); m_initSem.release();
m_isInitialized = true; m_isInitialized = true;
QMetaObject::invokeMethod(this, "reconfigure", Qt::QueuedConnection);
} }
void GLWidget::resizeGL(int width, int height) void GLWidget::resizeGL(int width, int height)
......
...@@ -86,7 +86,6 @@ public: ...@@ -86,7 +86,6 @@ public:
// TODO: currently unused // TODO: currently unused
int reconfigureMulti(const QString &params, const QString &path, Mlt::Profile *profile); int reconfigureMulti(const QString &params, const QString &path, Mlt::Profile *profile);
void stopCapture(); void stopCapture();
int reconfigure();
/** @brief Get the current MLT producer playlist. /** @brief Get the current MLT producer playlist.
* @return A string describing the playlist */ * @return A string describing the playlist */
const QString sceneList(const QString &root, const QString &fullPath = QString(), QString filterData = QString()); const QString sceneList(const QString &root, const QString &fullPath = QString(), QString filterData = QString());
...@@ -253,6 +252,7 @@ private slots: ...@@ -253,6 +252,7 @@ private slots:
void updateTexture(GLuint yName, GLuint uName, GLuint vName); void updateTexture(GLuint yName, GLuint uName, GLuint vName);
void paintGL(); void paintGL();
void onFrameDisplayed(const SharedFrame &frame); void onFrameDisplayed(const SharedFrame &frame);
int reconfigure();
void refresh(); void refresh();
protected: protected:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment