← Back to branch summary

~mixxxdevelopers/mixxx/trunk

~mixxxdevelopers/mixxx/trunk

Viewing all changes in revision 3167.

Committer: RJ Ryan
Date: 2012-05-19 00:27:41 UTC
mfrom: (2663.4.47 waveforme-2.0)
Revision ID: rryan@mit.edu-20120519002741-0wqclp11xot986a9

Merging from lp:~vrince/mixxx/waveform-2.0_pure-gl

files added:
mixxx/src/waveform/renderers/qtwaveformrendererfilteredsignal.cpp

mixxx/src/waveform/renderers/qtwaveformrendererfilteredsignal.h

mixxx/src/waveform/renderers/qtwaveformrenderersimplesignal.cpp

mixxx/src/waveform/renderers/qtwaveformrenderersimplesignal.h

mixxx/src/waveform/renderers/waveformrenderersignalbase.cpp

mixxx/src/waveform/renderers/waveformrenderersignalbase.h

mixxx/src/waveform/widgets/qtsimplewaveformwidget.cpp

mixxx/src/waveform/widgets/qtsimplewaveformwidget.h

mixxx/src/waveform/widgets/qtwaveformwidget.cpp

mixxx/src/waveform/widgets/qtwaveformwidget.h

files modified:
mixxx/build/depends.py

mixxx/src/engine/cuecontrol.cpp

mixxx/src/engine/cuecontrol.h

mixxx/src/skin/legacyskinparser.cpp

mixxx/src/waveform/renderers/glslwaveformrenderersignal.cpp

mixxx/src/waveform/renderers/glslwaveformrenderersignal.h

mixxx/src/waveform/renderers/glwaveformrendererfilteredsignal.cpp

mixxx/src/waveform/renderers/glwaveformrendererfilteredsignal.h

mixxx/src/waveform/renderers/glwaveformrenderersimplesignal.cpp

mixxx/src/waveform/renderers/glwaveformrenderersimplesignal.h

mixxx/src/waveform/renderers/waveformmark.cpp

mixxx/src/waveform/renderers/waveformrendererendoftrack.cpp

mixxx/src/waveform/renderers/waveformrendererfilteredsignal.cpp

mixxx/src/waveform/renderers/waveformrendererfilteredsignal.h

mixxx/src/waveform/renderers/waveformrendermark.cpp

mixxx/src/waveform/renderers/waveformrendermark.h

mixxx/src/waveform/renderers/waveformwidgetrenderer.cpp

mixxx/src/waveform/renderers/waveformwidgetrenderer.h

mixxx/src/waveform/waveformwidgetfactory.cpp

mixxx/src/waveform/widgets/glsimplewaveformwidget.cpp

mixxx/src/waveform/widgets/glsimplewaveformwidget.h

mixxx/src/waveform/widgets/glslwaveformwidget.cpp

mixxx/src/waveform/widgets/glslwaveformwidget.h

mixxx/src/waveform/widgets/glwaveformwidget.cpp

mixxx/src/waveform/widgets/softwarewaveformwidget.cpp

mixxx/src/waveform/widgets/softwarewaveformwidget.h

mixxx/src/waveform/widgets/waveformwidgettype.h

mixxx/src/widget/wwaveformviewer.cpp

Show diffs side-by-side

added added

removed removed

mixxx/build/depends.py

mixxx/src/engine/cuecontrol.cpp

mixxx/src/engine/cuecontrol.h

mixxx/src/skin/legacyskinparser.cpp

mixxx/src/waveform/renderers/glslwaveformrenderersignal.cpp

mixxx/src/waveform/renderers/glslwaveformrenderersignal.h

mixxx/src/waveform/renderers/glwaveformrendererfilteredsignal.cpp

mixxx/src/waveform/renderers/glwaveformrendererfilteredsignal.h

mixxx/src/waveform/renderers/glwaveformrenderersimplesignal.cpp

mixxx/src/waveform/renderers/glwaveformrenderersimplesignal.h

mixxx/src/waveform/renderers/qtwaveformrendererfilteredsignal.cpp

mixxx/src/waveform/renderers/qtwaveformrendererfilteredsignal.h

mixxx/src/waveform/renderers/qtwaveformrenderersimplesignal.cpp

mixxx/src/waveform/renderers/qtwaveformrenderersimplesignal.h

mixxx/src/waveform/renderers/waveformmark.cpp

mixxx/src/waveform/renderers/waveformrendererendoftrack.cpp

mixxx/src/waveform/renderers/waveformrendererfilteredsignal.cpp

mixxx/src/waveform/renderers/waveformrendererfilteredsignal.h

mixxx/src/waveform/renderers/waveformrenderersignalbase.cpp

mixxx/src/waveform/renderers/waveformrenderersignalbase.h

mixxx/src/waveform/renderers/waveformrendermark.cpp

mixxx/src/waveform/renderers/waveformrendermark.h

mixxx/src/waveform/renderers/waveformwidgetrenderer.cpp

mixxx/src/waveform/renderers/waveformwidgetrenderer.h

mixxx/src/waveform/waveformwidgetfactory.cpp

mixxx/src/waveform/widgets/glsimplewaveformwidget.cpp

mixxx/src/waveform/widgets/glsimplewaveformwidget.h

mixxx/src/waveform/widgets/glslwaveformwidget.cpp

mixxx/src/waveform/widgets/glslwaveformwidget.h

mixxx/src/waveform/widgets/glwaveformwidget.cpp

mixxx/src/waveform/widgets/qtsimplewaveformwidget.cpp

mixxx/src/waveform/widgets/qtsimplewaveformwidget.h

mixxx/src/waveform/widgets/qtwaveformwidget.cpp

mixxx/src/waveform/widgets/qtwaveformwidget.h

mixxx/src/waveform/widgets/softwarewaveformwidget.cpp

mixxx/src/waveform/widgets/softwarewaveformwidget.h

mixxx/src/waveform/widgets/waveformwidgettype.h

Older »