Skip to content

Fix clear waveform #1299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daschuer merged 2 commits into from
Jul 1, 2017
Merged

Fix clear waveform #1299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa118ff
Add missing initialization of AnalysisDao in TrackCollection
ninomp Jul 1, 2017
65ca69c
Disconnect waveformUpdated() signal from GLSLWaveformRendererSignal w…
ninomp Jul 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/library/trackcollection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ void TrackCollection::connectDatabase(QSqlDatabase database) {
m_playlistDao.initialize(database);
m_cueDao.initialize(database);
m_directoryDao.initialize(database);
m_analysisDao.initialize(database);
m_libraryHashDao.initialize(database);
m_crates.connectDatabase(database);
}
Expand Down
7 changes: 7 additions & 0 deletions src/waveform/renderers/glslwaveformrenderersignal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,11 @@ void GLSLWaveformRendererSignal::onSetup(const QDomNode& node) {
}

void GLSLWaveformRendererSignal::onSetTrack() {
if (m_loadedTrack) {
disconnect(m_loadedTrack.get(), SIGNAL(waveformUpdated()),
this, SLOT(slotWaveformUpdated()));
}

slotWaveformUpdated();

TrackPointer pTrack = m_waveformRenderer->getTrackInfo();
Expand All @@ -231,6 +236,8 @@ void GLSLWaveformRendererSignal::onSetTrack() {
// uploaded to GPU. Otherwise, previous waveform will be shown.
connect(pTrack.get(), SIGNAL(waveformUpdated()),
this, SLOT(slotWaveformUpdated()));

m_loadedTrack = pTrack;
}

void GLSLWaveformRendererSignal::onResize() {
Expand Down
2 changes: 2 additions & 0 deletions src/waveform/renderers/glslwaveformrenderersignal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include <QGLShaderProgram>
#include <QtOpenGL>

#include "track/track.h"
#include "waveformrenderersignalbase.h"

class GLSLWaveformRendererSignal : public QObject, public WaveformRendererSignalBase {
Expand Down Expand Up @@ -35,6 +36,7 @@ class GLSLWaveformRendererSignal : public QObject, public WaveformRendererSignal
GLint m_unitQuadListId;
GLuint m_textureId;

TrackPointer m_loadedTrack;
int m_loadedWaveform;

//Frame buffer for two pass rendering
Expand Down