← Back to branch summary

~daschuer/mixxx/features_setlog

~daschuer/mixxx/features_setlog

« back to all changes in this revision

Viewing changes to mixxx/src/engine/enginechannel.h

Committer: Bill Good
Date: 2011-07-19 18:13:34 UTC
mfrom: (2837.1.4 1.10)
Revision ID: bkgood@gmail.com-20110719181334-qfhonzqv50ino3iv

Merged from lp:mixxx/1.10

files added:
mixxx/src/library/basetrackcache.cpp

mixxx/src/library/basetrackcache.h

files modified:
mixxx/build/depends.py

mixxx/src/dlgprefsound.cpp

mixxx/src/dlgprepare.cpp

mixxx/src/engine/enginechannel.h

mixxx/src/library/cratefeature.cpp

mixxx/src/library/dao/cratedao.cpp

mixxx/src/library/dao/cratedao.h

mixxx/src/library/dao/playlistdao.cpp

mixxx/src/library/dao/playlistdao.h

mixxx/src/library/dao/trackdao.h

mixxx/src/library/traktor/traktorfeature.cpp

mixxx/src/library/traktor/traktorfeature.h

mixxx/src/sounddeviceportaudio.cpp

mixxx/src/soundmanager.cpp

mixxx/src/soundmanager.h

mixxx/src/soundmanagerconfig.cpp

mixxx/src/soundmanagerconfig.h

Show diffs side-by-side

added added

removed removed

mixxx/src/engine/enginechannel.h

31

31

class EngineVuMeter;

32

32

class EngineVinylSoundEmu;

33

33

class ControlPushButton;

34

class ControlObject;

34

35

35

36

class EngineChannel : public EngineObject {

36

37

Q_OBJECT

Older »