← Back to branch summary

~mixxxdevelopers/mixxx/features_waveform

~mixxxdevelopers/mixxx/features_waveform

Viewing all changes in revision 2365.

Committer: RJ Ryan
Date: 2010-06-01 07:28:49 UTC
mfrom: (2361.1.54 mixxx-trunk)
Revision ID: rryan@mit.edu-20100601072849-scdwndybrr4q5g5x

Merging from trunk.

files added:
mixxx/plugins

mixxx/plugins/SConscript

mixxx/plugins/build

mixxx/plugins/build/debian

mixxx/plugins/build/debian.sh

mixxx/plugins/build/debian/DEBIAN

mixxx/plugins/build/debian/DEBIAN/control

mixxx/plugins/build/debian/usr

mixxx/plugins/build/debian/usr/lib

mixxx/plugins/build/m4a_windows.iss

mixxx/plugins/build/osx_m4a_installer.pmdoc

mixxx/plugins/build/osx_m4a_installer.pmdoc/01mixxx-contents.xml

mixxx/plugins/build/osx_m4a_installer.pmdoc/01mixxx.xml

mixxx/plugins/build/osx_m4a_installer.pmdoc/index.xml

mixxx/plugins/soundsourcem4a

mixxx/plugins/soundsourcem4a/LICENSE

mixxx/plugins/soundsourcem4a/SConscript

mixxx/res/midi/Mixman DM2 (Linux).js

mixxx/res/midi/Mixman DM2 (Linux).midi.xml

mixxx/res/midi/Reloop Digital Jockey 2 Controller Edition.midi.xml

mixxx/res/midi/Reloop-Digital-Jockey2-Controller-scripts.js

mixxx/src/dlgplugindownloader.ui

mixxx/src/errordialoghandler.cpp

mixxx/src/errordialoghandler.h

mixxx/src/midi/pitchfilter.h

mixxx/src/unused/plugindownloader.cpp

mixxx/src/unused/plugindownloader.h

files removed:
mixxx/src/defs_audiofiles.h

mixxx/src/errordialog.cpp

mixxx/src/errordialog.h

files renamed:
mixxx/src/m4a/ => mixxx/plugins/soundsourcem4a/m4a/

mixxx/src/soundsourcem4a.cpp => mixxx/plugins/soundsourcem4a/soundsourcem4a.cpp

mixxx/src/soundsourcem4a.h => mixxx/plugins/soundsourcem4a/soundsourcem4a.h

mixxx/res/midi/Mixman DM2 (Linux, OS X).js => mixxx/res/midi/Mixman DM2 (OS X).js

mixxx/res/midi/Mixman DM2 (Linux, OS X).midi.xml => mixxx/res/midi/Mixman DM2 (OS X).midi.xml

files modified:
mixxx/SConstruct

mixxx/res/midi/Stanton-SCS3d-scripts.js

mixxx/res/midi/midi-mappings-scripts.js

mixxx/res/schema.xml

mixxx/src/SConscript

mixxx/src/analyserqueue.cpp

mixxx/src/cachingreader.cpp

mixxx/src/configobject.cpp

mixxx/src/controlvaluedelegate.cpp

mixxx/src/dlgprefcontrols.cpp

mixxx/src/dlgprefcontrols.h

mixxx/src/dlgprefcontrolsdlg.ui

mixxx/src/dlgpreferences.cpp

mixxx/src/dlgprefplaylist.cpp

mixxx/src/dlgprefplaylist.h

mixxx/src/dlgprefplaylistdlg.ui

mixxx/src/dlgprepare.cpp

mixxx/src/encodermp3.cpp

mixxx/src/encodervorbis.cpp

mixxx/src/engine/enginebuffer.cpp

mixxx/src/engine/enginebufferscalelinear.cpp

mixxx/src/engine/enginebufferscalelinear.h

mixxx/src/engine/engineshoutcast.cpp

mixxx/src/engine/engineshoutcast.h

mixxx/src/engine/enginesidechain.cpp

mixxx/src/engine/ratecontrol.cpp

mixxx/src/engine/ratecontrol.h

mixxx/src/library/abstractxmltrackmodel.cpp

mixxx/src/library/abstractxmltrackmodel.h

mixxx/src/library/basesqltablemodel.cpp

mixxx/src/library/basesqltablemodel.h

mixxx/src/library/browsefeature.cpp

mixxx/src/library/browsefeature.h

mixxx/src/library/browsefilter.cpp

mixxx/src/library/browsetablemodel.cpp

mixxx/src/library/browsetablemodel.h

mixxx/src/library/cratefeature.cpp

mixxx/src/library/cratetablemodel.cpp

mixxx/src/library/cratetablemodel.h

mixxx/src/library/dao/cuedao.cpp

mixxx/src/library/dao/trackdao.cpp

mixxx/src/library/dao/trackdao.h

mixxx/src/library/itunesplaylistmodel.cpp

mixxx/src/library/itunesplaylistmodel.h

mixxx/src/library/itunestrackmodel.cpp

mixxx/src/library/legacylibraryimporter.cpp

mixxx/src/library/library.cpp

mixxx/src/library/librarymidicontrol.cpp

mixxx/src/library/libraryscanner.cpp

mixxx/src/library/librarytablemodel.cpp

mixxx/src/library/librarytablemodel.h

mixxx/src/library/missingtablemodel.cpp

mixxx/src/library/missingtablemodel.h

mixxx/src/library/playlistfeature.cpp

mixxx/src/library/playlisttablemodel.cpp

mixxx/src/library/playlisttablemodel.h

mixxx/src/library/preparelibrarytablemodel.cpp

mixxx/src/library/proxytrackmodel.cpp

mixxx/src/library/proxytrackmodel.h

mixxx/src/library/rhythmboxplaylistmodel.cpp

mixxx/src/library/rhythmboxplaylistmodel.h

mixxx/src/library/rhythmboxtrackmodel.cpp

mixxx/src/library/sidebarmodel.cpp

mixxx/src/library/trackcollection.cpp

mixxx/src/library/trackmodel.h

mixxx/src/main.cpp

mixxx/src/midi/mididevice.cpp

mixxx/src/midi/mididevice.h

mixxx/src/midi/mididevicemanager.cpp

mixxx/src/midi/midideviceportmidi.cpp

mixxx/src/midi/midimapping.cpp

mixxx/src/midi/midimapping.h

mixxx/src/midi/midimessage.cpp

mixxx/src/midi/midiscriptengine.cpp

mixxx/src/midi/midiscriptengine.h

mixxx/src/mixxx.cpp

mixxx/src/mixxxcontrol.cpp

mixxx/src/recording/writeaudiofile.cpp

mixxx/src/sounddeviceportaudio.cpp

mixxx/src/soundsource.cpp

mixxx/src/soundsource.h

mixxx/src/soundsourcemp3.cpp

mixxx/src/soundsourcemp3.h

mixxx/src/soundsourceoggvorbis.cpp

mixxx/src/soundsourceoggvorbis.h

mixxx/src/soundsourceproxy.cpp

mixxx/src/soundsourceproxy.h

mixxx/src/soundsourcesndfile.cpp

mixxx/src/soundsourcesndfile.h

mixxx/src/trackinfoobject.cpp

mixxx/src/trackinfoobject.h

mixxx/src/upgrade.cpp

mixxx/src/widget/wlibrarysidebar.cpp

mixxx/src/widget/wpushbutton.cpp

mixxx/src/wtracktableview.cpp

Show diffs side-by-side

added added

removed removed

mixxx/SConstruct

mixxx/plugins/SConscript

mixxx/plugins/build/

mixxx/plugins/build/debian.sh

mixxx/plugins/build/debian/

mixxx/plugins/build/debian/DEBIAN/

mixxx/plugins/build/debian/DEBIAN/control

mixxx/plugins/build/debian/usr/

mixxx/plugins/build/debian/usr/lib/

mixxx/plugins/build/m4a_windows.iss

mixxx/plugins/build/osx_m4a_installer.pmdoc/

mixxx/plugins/build/osx_m4a_installer.pmdoc/01mixxx-contents.xml

mixxx/plugins/build/osx_m4a_installer.pmdoc/01mixxx.xml

mixxx/plugins/build/osx_m4a_installer.pmdoc/index.xml

mixxx/plugins/soundsourcem4a/

mixxx/plugins/soundsourcem4a/LICENSE

mixxx/plugins/soundsourcem4a/SConscript

mixxx/plugins/soundsourcem4a/soundsourcem4a.cpp

mixxx/plugins/soundsourcem4a/soundsourcem4a.h

mixxx/res/midi/Mixman DM2 (Linux).js

mixxx/res/midi/Mixman DM2 (Linux).midi.xml

mixxx/res/midi/Mixman DM2 (OS X).midi.xml

mixxx/res/midi/Reloop Digital Jockey 2 Controller Edition.midi.xml

mixxx/res/midi/Reloop-Digital-Jockey2-Controller-scripts.js

mixxx/res/midi/Stanton-SCS3d-scripts.js

mixxx/res/midi/midi-mappings-scripts.js

mixxx/res/schema.xml

mixxx/src/SConscript

mixxx/src/analyserqueue.cpp

mixxx/src/cachingreader.cpp

mixxx/src/configobject.cpp

mixxx/src/controlvaluedelegate.cpp

mixxx/src/defs_audiofiles.h

mixxx/src/dlgplugindownloader.ui

mixxx/src/dlgprefcontrols.cpp

mixxx/src/dlgprefcontrols.h

mixxx/src/dlgprefcontrolsdlg.ui

mixxx/src/dlgpreferences.cpp

mixxx/src/dlgprefplaylist.cpp

mixxx/src/dlgprefplaylist.h

mixxx/src/dlgprefplaylistdlg.ui

mixxx/src/dlgprepare.cpp

mixxx/src/encodermp3.cpp

mixxx/src/encodervorbis.cpp

mixxx/src/engine/enginebuffer.cpp

mixxx/src/engine/enginebufferscalelinear.cpp

mixxx/src/engine/enginebufferscalelinear.h

mixxx/src/engine/engineshoutcast.cpp

mixxx/src/engine/engineshoutcast.h

mixxx/src/engine/enginesidechain.cpp

mixxx/src/engine/ratecontrol.cpp

mixxx/src/engine/ratecontrol.h

mixxx/src/errordialog.cpp

mixxx/src/errordialog.h

mixxx/src/errordialoghandler.cpp

mixxx/src/errordialoghandler.h

mixxx/src/library/abstractxmltrackmodel.cpp

mixxx/src/library/abstractxmltrackmodel.h

mixxx/src/library/basesqltablemodel.cpp

mixxx/src/library/basesqltablemodel.h

mixxx/src/library/browsefeature.cpp

mixxx/src/library/browsefeature.h

mixxx/src/library/browsefilter.cpp

mixxx/src/library/browsetablemodel.cpp

mixxx/src/library/browsetablemodel.h

mixxx/src/library/cratefeature.cpp

mixxx/src/library/cratetablemodel.cpp

mixxx/src/library/cratetablemodel.h

mixxx/src/library/dao/cuedao.cpp

mixxx/src/library/dao/trackdao.cpp

mixxx/src/library/dao/trackdao.h

mixxx/src/library/itunesplaylistmodel.cpp

mixxx/src/library/itunesplaylistmodel.h

mixxx/src/library/itunestrackmodel.cpp

mixxx/src/library/legacylibraryimporter.cpp

mixxx/src/library/library.cpp

mixxx/src/library/librarymidicontrol.cpp

mixxx/src/library/libraryscanner.cpp

mixxx/src/library/librarytablemodel.cpp

mixxx/src/library/librarytablemodel.h

mixxx/src/library/missingtablemodel.cpp

mixxx/src/library/missingtablemodel.h

mixxx/src/library/playlistfeature.cpp

mixxx/src/library/playlisttablemodel.cpp

mixxx/src/library/playlisttablemodel.h

mixxx/src/library/preparelibrarytablemodel.cpp

mixxx/src/library/proxytrackmodel.cpp

mixxx/src/library/proxytrackmodel.h

mixxx/src/library/rhythmboxplaylistmodel.cpp

mixxx/src/library/rhythmboxplaylistmodel.h

mixxx/src/library/rhythmboxtrackmodel.cpp

mixxx/src/library/sidebarmodel.cpp

mixxx/src/library/trackcollection.cpp

mixxx/src/library/trackmodel.h

mixxx/src/main.cpp

mixxx/src/midi/mididevice.cpp

mixxx/src/midi/mididevice.h

mixxx/src/midi/mididevicemanager.cpp

mixxx/src/midi/midideviceportmidi.cpp

mixxx/src/midi/midimapping.cpp

mixxx/src/midi/midimapping.h

mixxx/src/midi/midimessage.cpp

mixxx/src/midi/midiscriptengine.cpp

mixxx/src/midi/midiscriptengine.h

mixxx/src/midi/pitchfilter.h

mixxx/src/mixxx.cpp

mixxx/src/mixxxcontrol.cpp

mixxx/src/recording/writeaudiofile.cpp

mixxx/src/sounddeviceportaudio.cpp

mixxx/src/soundsource.cpp

mixxx/src/soundsource.h

mixxx/src/soundsourcemp3.cpp

mixxx/src/soundsourcemp3.h

mixxx/src/soundsourceoggvorbis.cpp

mixxx/src/soundsourceoggvorbis.h

mixxx/src/soundsourceproxy.cpp

mixxx/src/soundsourceproxy.h

mixxx/src/soundsourcesndfile.cpp

mixxx/src/soundsourcesndfile.h

mixxx/src/trackinfoobject.cpp

mixxx/src/trackinfoobject.h

mixxx/src/unused/plugindownloader.cpp

mixxx/src/unused/plugindownloader.h

mixxx/src/upgrade.cpp

mixxx/src/wtracktableview.cpp

Older »