← Back to branch summary

~keithsalisbury/mixxx/mixxx

« back to all changes in this revision

Viewing changes to mixxx/src/waveform/waveformfactory.cpp

  • Committer: Keith Salisbury
  • Date: 2012-05-06 13:44:20 UTC
  • mfrom: (2994.1.100 mixxx-trunk)
  • Revision ID: keithsalisbury@gmail.com-20120506134420-8k1dqq10aqmx0ecq
merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
mixxx/src/waveform/waveformfactory.cpp
 
1
#include <QtDebug>
 
2
 
1
3
#include "waveform/waveformfactory.h"
2
4
#include "waveform/waveform.h"
3
5
 
4
6
// static
5
7
Waveform* WaveformFactory::loadWaveformFromAnalysis(
6
8
    TrackPointer pTrack, const AnalysisDao::AnalysisInfo& analysis) {
7
 
    Waveform* pWaveform = new Waveform(analysis.data);
8
 
    pWaveform->setId(analysis.analysisId);
9
 
    pWaveform->setVersion(analysis.version);
10
 
    pWaveform->setDescription(analysis.description);
11
 
    return pWaveform;
 
9
    if (analysis.version == "Waveform-2.0" ||
 
10
        analysis.version == "WaveformSummary-2.0") {
 
11
        Waveform* pWaveform = new Waveform(analysis.data);
 
12
        pWaveform->setId(analysis.analysisId);
 
13
        pWaveform->setVersion(analysis.version);
 
14
        pWaveform->setDescription(analysis.description);
 
15
        return pWaveform;
 
16
    }
 
17
    qDebug() << "Skipping unsupported waveform version:" << analysis.version;
 
18
    return NULL;
12
19
}