Skip to content

Commit

Permalink
Remove unnecessary signal and queue.
Browse files Browse the repository at this point in the history
  • Loading branch information
ddennedy committed Feb 13, 2016
1 parent 7d2f965 commit 4b976f2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
7 changes: 3 additions & 4 deletions src/glwidget.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011-2015 Meltytech, LLC
* Copyright (c) 2011-2016 Meltytech, LLC
* Author: Dan Dennedy <dan@dennedy.org>
*
* GL shader based on BSD licensed code from Peter Bengtsson:
Expand Down Expand Up @@ -169,7 +169,6 @@ void GLWidget::initializeGL()
connect(m_frameRenderer, SIGNAL(textureReady(GLuint,GLuint,GLuint)), SLOT(updateTexture(GLuint,GLuint,GLuint)), Qt::DirectConnection);
else
connect(m_frameRenderer, SIGNAL(frameDisplayed(const SharedFrame&)), SLOT(onFrameDisplayed(const SharedFrame&)), Qt::QueuedConnection);
connect(this, SIGNAL(textureUpdated()), quickWindow(), SLOT(update()), Qt::QueuedConnection);

m_initSem.release();
m_isInitialized = true;
Expand Down Expand Up @@ -677,7 +676,7 @@ void GLWidget::onFrameDisplayed(const SharedFrame &frame)
m_mutex.lock();
m_sharedFrame = frame;
m_mutex.unlock();
emit textureUpdated();
quickWindow()->update();
}

void GLWidget::setZoom(float zoom)
Expand Down Expand Up @@ -716,7 +715,7 @@ void GLWidget::updateTexture(GLuint yName, GLuint uName, GLuint vName)
m_texture[0] = yName;
m_texture[1] = uName;
m_texture[2] = vName;
emit textureUpdated();
quickWindow()->update();
}

// MLT consumer-frame-show event handler
Expand Down
1 change: 0 additions & 1 deletion src/glwidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ public slots:

signals:
void frameDisplayed(const SharedFrame& frame);
void textureUpdated();
void dragStarted();
void seekTo(int x);
void gpuNotSupported();
Expand Down

0 comments on commit 4b976f2

Please sign in to comment.