Viewing all changes in revision 2990.
- Committer: RJ Ryan
- Date: 2012-01-19 01:53:37 UTC
- mfrom: (2663.1.41 waveforme-2.0)
- Revision ID: rryan@mit.edu-20120119015337-04j1dwath9itpl3j
Merge waveforme-2.0 into vci demo branch.
- files added:
- mixxx/src/singleton.h
- mixxx/src/waveform/renderers
- mixxx/src/waveform/shaders
- mixxx/src/waveform/widgets
- files removed:
- mixxx/src/waveform/glwaveformrenderer.cpp
- files renamed:
- mixxx/src/waveform/waveformrenderbackground.cpp => mixxx/src/waveform/renderers/waveformrenderbackground.cpp
- mixxx/src/waveform/waveformrenderbackground.h => mixxx/src/waveform/renderers/waveformrenderbackground.h
- mixxx/src/waveform/waveformrenderbeat.cpp => mixxx/src/waveform/renderers/waveformrenderbeat.cpp
- mixxx/src/waveform/waveformrenderbeat.h => mixxx/src/waveform/renderers/waveformrenderbeat.h
- mixxx/src/waveform/waveformrendermark.cpp => mixxx/src/waveform/renderers/waveformrendermark.cpp
- mixxx/src/waveform/waveformrendermark.h => mixxx/src/waveform/renderers/waveformrendermark.h
- mixxx/src/waveform/waveformrendermarkrange.cpp => mixxx/src/waveform/renderers/waveformrendermarkrange.cpp
- mixxx/src/waveform/waveformrendermarkrange.h => mixxx/src/waveform/renderers/waveformrendermarkrange.h
- mixxx/src/waveform/renderobject.cpp => mixxx/src/waveform/renderobject_old.cpp
- mixxx/src/waveform/renderobject.h => mixxx/src/waveform/renderobject_old.h
- mixxx/src/waveform/waveformrenderer.cpp => mixxx/src/waveform/waveformrenderer_old.cpp
- mixxx/src/waveform/waveformrenderer.h => mixxx/src/waveform/waveformrenderer_old.h
- mixxx/src/waveform/waveformrendersignal.cpp => mixxx/src/waveform/waveformrendersignal_old.cpp
- mixxx/src/waveform/waveformrendersignal.h => mixxx/src/waveform/waveformrendersignal_old.h
- files modified:
- mixxx/build/depends.py
expand all
collapse all
added
removed
