← Back to branch summary

~mixxxdevelopers/mixxx/engine-control-refactor

« back to all changes in this revision

Viewing changes to mixxx/src/waveform/renderers/glwaveformrenderersimplesignal.cpp

  • Committer: RJ Ryan
  • Date: 2013-06-04 00:41:29 UTC
  • mfrom: (2890.22.101 mixxx)
  • Revision ID: rryan@mixxx.org-20130604004129-8jjxkicsb3givu4a
Merging from lp:mixxx.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mixxx/src/waveform/renderers/glwaveformrenderersimplesignal.cpp
62
62
    glEnable(GL_BLEND);
63
63
    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
64
64
 
65
 
    const QColor& color = m_colors.getSignalColor();
 
65
    const QColor& color = m_pColors->getSignalColor();
66
66
 
67
67
    WaveformWidgetFactory* factory = WaveformWidgetFactory::instance();
68
68
    const double visualGain = factory->getVisualGain(::WaveformWidgetFactory::All);