← Back to branch summary

~ubuntu-branches/ubuntu/natty/mixxx/natty

~ubuntu-branches/ubuntu/natty/mixxx/natty

Viewing all changes in revision 13.

Committer: Bazaar Package Importer
Author(s): Nathan Handler
Date: 2008-11-15 14:13:30 UTC
mfrom: (1.2.7 upstream) (1.1.4 sid)
Revision ID: james.westby@ubuntu.com-20081115141330-dcl3he7flt3y1rij

Tags: 1.6.1-1ubuntu1

https://launchpad.net/bugs/298514

* Merge from debian unstable, remaining changes (LP: #298514):
- Update desktop file.

files added:
src/old/player.cpp

src/old/player.h

src/old/playeralsa.cpp

src/old/playeralsa.h

src/old/playerasio.cpp

src/old/playerasio.h

src/old/playerjack.cpp

src/old/playerjack.h

src/old/playerportaudio.cpp

src/old/playerportaudio.h

src/old/playerproxy.cpp

src/old/playerproxy.h

src/old/playerrtaudio.cpp

src/old/playerrtaudio.h

src/osx/VolumeIcon.icns

src/soundsourcem4a.cpp

src/soundsourcem4a.h

files removed:
.mixxx_flags.svn

.mixxx_version.svn

.sconsign.tmp

src/player.cpp

src/player.h

src/playeralsa.cpp

src/playeralsa.h

src/playerasio.cpp

src/playerasio.h

src/playerjack.cpp

src/playerjack.h

src/playerportaudio.cpp

src/playerportaudio.h

src/playerproxy.cpp

src/playerproxy.h

src/playerrtaudio.cpp

src/playerrtaudio.h

src/skins/Natt

src/skins/Natt/back-off-Ch1.png

src/skins/Natt/back-off-Ch2.png

src/skins/Natt/back-on-Ch1.png

src/skins/Natt/back-on-Ch2.png

src/skins/Natt/crosshandle-on-.png

src/skins/Natt/crossslider-off-.png

src/skins/Natt/cue-off-Ch1.png

src/skins/Natt/cue-off-Ch2.png

src/skins/Natt/cue-on-Ch1.png

src/skins/Natt/cue-on-Ch2.png

src/skins/Natt/endoftrack-loop-ch1.png

src/skins/Natt/endoftrack-loop-ch2.png

src/skins/Natt/endoftrack-next-ch1.png

src/skins/Natt/endoftrack-next-ch2.png

src/skins/Natt/endoftrack-stop-ch1.png

src/skins/Natt/endoftrack-stop-ch2.png

src/skins/Natt/flanger-off-Ch1.png

src/skins/Natt/flanger-off-Ch2.png

src/skins/Natt/flanger-on-Ch1.png

src/skins/Natt/flanger-on-Ch2.png

src/skins/Natt/fwd-off-Ch1.png

src/skins/Natt/fwd-off-Ch2.png

src/skins/Natt/fwd-on-Ch1.png

src/skins/Natt/fwd-on-Ch2.png

src/skins/Natt/head-off-Ch1.png

src/skins/Natt/head-off-Ch2.png

src/skins/Natt/head-on-Ch1.png

src/skins/Natt/head-on-Ch2.png

src/skins/Natt/knobg0.png

src/skins/Natt/knobg1.png

src/skins/Natt/knobg10.png

src/skins/Natt/knobg11.png

src/skins/Natt/knobg12.png

src/skins/Natt/knobg13.png

src/skins/Natt/knobg14.png

src/skins/Natt/knobg15.png

src/skins/Natt/knobg16.png

src/skins/Natt/knobg17.png

src/skins/Natt/knobg18.png

src/skins/Natt/knobg19.png

src/skins/Natt/knobg2.png

src/skins/Natt/knobg20.png

src/skins/Natt/knobg21.png

src/skins/Natt/knobg22.png

src/skins/Natt/knobg23.png

src/skins/Natt/knobg24.png

src/skins/Natt/knobg25.png

src/skins/Natt/knobg26.png

src/skins/Natt/knobg27.png

src/skins/Natt/knobg28.png

src/skins/Natt/knobg29.png

src/skins/Natt/knobg3.png

src/skins/Natt/knobg30.png

src/skins/Natt/knobg31.png

src/skins/Natt/knobg32.png

src/skins/Natt/knobg33.png

src/skins/Natt/knobg34.png

src/skins/Natt/knobg35.png

src/skins/Natt/knobg36.png

src/skins/Natt/knobg37.png

src/skins/Natt/knobg38.png

src/skins/Natt/knobg39.png

src/skins/Natt/knobg4.png

src/skins/Natt/knobg40.png

src/skins/Natt/knobg41.png

src/skins/Natt/knobg42.png

src/skins/Natt/knobg43.png

src/skins/Natt/knobg44.png

src/skins/Natt/knobg5.png

src/skins/Natt/knobg6.png

src/skins/Natt/knobg7.png

src/skins/Natt/knobg8.png

src/skins/Natt/knobg9.png

src/skins/Natt/knobm0.png

src/skins/Natt/knobm1.png

src/skins/Natt/knobm10.png

src/skins/Natt/knobm11.png

src/skins/Natt/knobm12.png

src/skins/Natt/knobm13.png

src/skins/Natt/knobm14.png

src/skins/Natt/knobm15.png

src/skins/Natt/knobm16.png

src/skins/Natt/knobm17.png

src/skins/Natt/knobm18.png

src/skins/Natt/knobm19.png

src/skins/Natt/knobm2.png

src/skins/Natt/knobm20.png

src/skins/Natt/knobm21.png

src/skins/Natt/knobm22.png

src/skins/Natt/knobm23.png

src/skins/Natt/knobm24.png

src/skins/Natt/knobm25.png

src/skins/Natt/knobm26.png

src/skins/Natt/knobm27.png

src/skins/Natt/knobm28.png

src/skins/Natt/knobm29.png

src/skins/Natt/knobm3.png

src/skins/Natt/knobm30.png

src/skins/Natt/knobm31.png

src/skins/Natt/knobm32.png

src/skins/Natt/knobm33.png

src/skins/Natt/knobm34.png

src/skins/Natt/knobm35.png

src/skins/Natt/knobm36.png

src/skins/Natt/knobm37.png

src/skins/Natt/knobm38.png

src/skins/Natt/knobm39.png

src/skins/Natt/knobm4.png

src/skins/Natt/knobm40.png

src/skins/Natt/knobm41.png

src/skins/Natt/knobm42.png

src/skins/Natt/knobm43.png

src/skins/Natt/knobm44.png

src/skins/Natt/knobm5.png

src/skins/Natt/knobm6.png

src/skins/Natt/knobm7.png

src/skins/Natt/knobm8.png

src/skins/Natt/knobm9.png

src/skins/Natt/master_vol_meter_off.png

src/skins/Natt/master_vol_meter_on.png

src/skins/Natt/play-off-Ch1.png

src/skins/Natt/play-off-Ch2.png

src/skins/Natt/play-on-Ch1.png

src/skins/Natt/play-on-Ch2.png

src/skins/Natt/playpos-marker1.png

src/skins/Natt/playpos-marker2.png

src/skins/Natt/playpos-slider.png

src/skins/Natt/ratedown-off-Ch1.png

src/skins/Natt/ratedown-off-Ch2.png

src/skins/Natt/ratedown-on-Ch1.png

src/skins/Natt/ratedown-on-Ch2.png

src/skins/Natt/ratehandle-on-Ch1.png

src/skins/Natt/ratehandle-on-Ch2.png

src/skins/Natt/rateslider-off-Ch1.png

src/skins/Natt/rateslider-off-Ch2.png

src/skins/Natt/rateup-off-Ch1.png

src/skins/Natt/rateup-off-Ch2.png

src/skins/Natt/rateup-on-Ch1.png

src/skins/Natt/rateup-on-Ch2.png

src/skins/Natt/rev-off-Ch1.png

src/skins/Natt/rev-off-Ch2.png

src/skins/Natt/rev-on-Ch1.png

src/skins/Natt/rev-on-Ch2.png

src/skins/Natt/scene.png

src/skins/Natt/skin.xml

src/skins/Natt/sync-off-Ch1.png

src/skins/Natt/sync-off-Ch2.png

src/skins/Natt/sync-on-Ch1.png

src/skins/Natt/sync-on-Ch2.png

src/skins/Natt/volhandle-on-Ch1.png

src/skins/Natt/volhandle-on-Ch2.png

src/skins/Natt/volslider-off-Ch1.png

src/skins/Natt/volslider-off-Ch2.png

src/skins/Natt/vumeter-off-Ch1.png

src/skins/Natt/vumeter-off-Ch2.png

src/skins/Natt/vumeter-on-Ch1.png

src/skins/Natt/vumeter-on-Ch2.png

files modified:
COPYING

LICENSE

Mixxx.nsi

README

debian/changelog

lib/soundtouch/3dnow_win.cpp

lib/soundtouch/AAFilter.cpp

lib/soundtouch/AAFilter.h

lib/soundtouch/FIFOSampleBuffer.cpp

lib/soundtouch/FIFOSampleBuffer.h

lib/soundtouch/FIFOSamplePipe.h

lib/soundtouch/FIRFilter.cpp

lib/soundtouch/FIRFilter.h

lib/soundtouch/RateTransposer.cpp

lib/soundtouch/RateTransposer.h

lib/soundtouch/STTypes.h

lib/soundtouch/SoundTouch.cpp

lib/soundtouch/SoundTouch.h

lib/soundtouch/TDStretch.cpp

lib/soundtouch/TDStretch.h

lib/soundtouch/cpu_detect.h

lib/soundtouch/cpu_detect_x86_gcc.cpp

lib/soundtouch/cpu_detect_x86_win.cpp

lib/soundtouch/mmx_gcc.cpp

lib/soundtouch/mmx_win.cpp

lib/soundtouch/sse_win.cpp

src/SConscript

src/bpmdetect.cpp

src/bpmdetector.cpp

src/bpmdetector.h

src/defs.h

src/defs_audiofiles.h

src/dlgpreferences.h

src/dlgprefsound.cpp

src/dlgprefsound.h

src/dlgprefvinyl.cpp

src/enginebuffer.cpp

src/enginebuffercue.cpp

src/libraryscanner.cpp

src/main.cpp

src/midi/Hercules DJ Console Rmx.midi.xml

src/midiledhandler.cpp

src/midiobjectwin.cpp

src/mixxx.cpp

src/mixxx.h

src/mixxx.vcproj

src/mixxxview.cpp

src/mixxxview.h

src/soundsourcemp3.cpp

src/soundsourceproxy.cpp

src/soundsourcesndfile.cpp

src/track.cpp

src/track.h

src/trackinfoobject.cpp

src/trackinfoobject.h

src/waveform/waveformrenderbeat.cpp

src/waveform/waveformrenderbeat.h

src/waveform/waveformrenderer.cpp

src/waveform/waveformrenderer.h

src/waveform/waveformrendermark.cpp

src/waveform/waveformrendermark.h

src/wavesummary.cpp

src/wavesummary.h

src/wvisualsimple.cpp

src/wvisualsimple.h

Show diffs side-by-side

added added

removed removed

.mixxx_flags.svn

.mixxx_version.svn

debian/changelog

lib/soundtouch/3dnow_win.cpp

lib/soundtouch/AAFilter.cpp

lib/soundtouch/AAFilter.h

lib/soundtouch/FIFOSampleBuffer.cpp

lib/soundtouch/FIFOSampleBuffer.h

lib/soundtouch/FIFOSamplePipe.h

lib/soundtouch/FIRFilter.cpp

lib/soundtouch/FIRFilter.h

lib/soundtouch/RateTransposer.cpp

lib/soundtouch/RateTransposer.h

lib/soundtouch/STTypes.h

lib/soundtouch/SoundTouch.cpp

lib/soundtouch/SoundTouch.h

lib/soundtouch/TDStretch.cpp

lib/soundtouch/TDStretch.h

lib/soundtouch/cpu_detect.h

lib/soundtouch/cpu_detect_x86_gcc.cpp

lib/soundtouch/cpu_detect_x86_win.cpp

lib/soundtouch/mmx_gcc.cpp

lib/soundtouch/mmx_win.cpp

lib/soundtouch/sse_win.cpp

src/bpmdetect.cpp

src/bpmdetector.cpp

src/bpmdetector.h

src/defs_audiofiles.h

src/dlgpreferences.h

src/dlgprefsound.cpp

src/dlgprefsound.h

src/dlgprefvinyl.cpp

src/enginebuffer.cpp

src/enginebuffercue.cpp

src/libraryscanner.cpp

src/midi/Hercules DJ Console Rmx.midi.xml

src/midiledhandler.cpp

src/midiobjectwin.cpp

src/mixxx.vcproj

src/mixxxview.cpp

src/mixxxview.h

src/old/player.cpp

src/old/player.h

src/old/playeralsa.cpp

src/old/playeralsa.h

src/old/playerasio.cpp

src/old/playerasio.h

src/old/playerjack.cpp

src/old/playerjack.h

src/old/playerportaudio.cpp

src/old/playerportaudio.h

src/old/playerproxy.cpp

src/old/playerproxy.h

src/old/playerrtaudio.cpp

src/old/playerrtaudio.h

src/osx/VolumeIcon.icns

src/playeralsa.cpp

src/playeralsa.h

src/playerasio.cpp

src/playerasio.h

src/playerjack.cpp

src/playerjack.h

src/playerportaudio.cpp

src/playerportaudio.h

src/playerproxy.cpp

src/playerproxy.h

src/playerrtaudio.cpp

src/playerrtaudio.h

src/skins/Natt/

src/skins/Natt/back-off-Ch1.png

src/skins/Natt/back-off-Ch2.png

src/skins/Natt/back-on-Ch1.png

src/skins/Natt/back-on-Ch2.png

src/skins/Natt/crosshandle-on-.png

src/skins/Natt/crossslider-off-.png

src/skins/Natt/cue-off-Ch1.png

src/skins/Natt/cue-off-Ch2.png

src/skins/Natt/cue-on-Ch1.png

src/skins/Natt/cue-on-Ch2.png

src/skins/Natt/endoftrack-loop-ch1.png

src/skins/Natt/endoftrack-loop-ch2.png

src/skins/Natt/endoftrack-next-ch1.png

src/skins/Natt/endoftrack-next-ch2.png

src/skins/Natt/endoftrack-stop-ch1.png

src/skins/Natt/endoftrack-stop-ch2.png

src/skins/Natt/flanger-off-Ch1.png

src/skins/Natt/flanger-off-Ch2.png

src/skins/Natt/flanger-on-Ch1.png

src/skins/Natt/flanger-on-Ch2.png

src/skins/Natt/fwd-off-Ch1.png

src/skins/Natt/fwd-off-Ch2.png

src/skins/Natt/fwd-on-Ch1.png

src/skins/Natt/fwd-on-Ch2.png

src/skins/Natt/head-off-Ch1.png

src/skins/Natt/head-off-Ch2.png

src/skins/Natt/head-on-Ch1.png

src/skins/Natt/head-on-Ch2.png

src/skins/Natt/knobg0.png

src/skins/Natt/knobg1.png

src/skins/Natt/knobg10.png

src/skins/Natt/knobg11.png

src/skins/Natt/knobg12.png

src/skins/Natt/knobg13.png

src/skins/Natt/knobg14.png

src/skins/Natt/knobg15.png

src/skins/Natt/knobg16.png

src/skins/Natt/knobg17.png

src/skins/Natt/knobg18.png

src/skins/Natt/knobg19.png

src/skins/Natt/knobg2.png

src/skins/Natt/knobg20.png

src/skins/Natt/knobg21.png

src/skins/Natt/knobg22.png

src/skins/Natt/knobg23.png

src/skins/Natt/knobg24.png

src/skins/Natt/knobg25.png

src/skins/Natt/knobg26.png

src/skins/Natt/knobg27.png

src/skins/Natt/knobg28.png

src/skins/Natt/knobg29.png

src/skins/Natt/knobg3.png

src/skins/Natt/knobg30.png

src/skins/Natt/knobg31.png

src/skins/Natt/knobg32.png

src/skins/Natt/knobg33.png

src/skins/Natt/knobg34.png

src/skins/Natt/knobg35.png

src/skins/Natt/knobg36.png

src/skins/Natt/knobg37.png

src/skins/Natt/knobg38.png

src/skins/Natt/knobg39.png

src/skins/Natt/knobg4.png

src/skins/Natt/knobg40.png

src/skins/Natt/knobg41.png

src/skins/Natt/knobg42.png

src/skins/Natt/knobg43.png

src/skins/Natt/knobg44.png

src/skins/Natt/knobg5.png

src/skins/Natt/knobg6.png

src/skins/Natt/knobg7.png

src/skins/Natt/knobg8.png

src/skins/Natt/knobg9.png

src/skins/Natt/knobm0.png

src/skins/Natt/knobm1.png

src/skins/Natt/knobm10.png

src/skins/Natt/knobm11.png

src/skins/Natt/knobm12.png

src/skins/Natt/knobm13.png

src/skins/Natt/knobm14.png

src/skins/Natt/knobm15.png

src/skins/Natt/knobm16.png

src/skins/Natt/knobm17.png

src/skins/Natt/knobm18.png

src/skins/Natt/knobm19.png

src/skins/Natt/knobm2.png

src/skins/Natt/knobm20.png

src/skins/Natt/knobm21.png

src/skins/Natt/knobm22.png

src/skins/Natt/knobm23.png

src/skins/Natt/knobm24.png

src/skins/Natt/knobm25.png

src/skins/Natt/knobm26.png

src/skins/Natt/knobm27.png

src/skins/Natt/knobm28.png

src/skins/Natt/knobm29.png

src/skins/Natt/knobm3.png

src/skins/Natt/knobm30.png

src/skins/Natt/knobm31.png

src/skins/Natt/knobm32.png

src/skins/Natt/knobm33.png

src/skins/Natt/knobm34.png

src/skins/Natt/knobm35.png

src/skins/Natt/knobm36.png

src/skins/Natt/knobm37.png

src/skins/Natt/knobm38.png

src/skins/Natt/knobm39.png

src/skins/Natt/knobm4.png

src/skins/Natt/knobm40.png

src/skins/Natt/knobm41.png

src/skins/Natt/knobm42.png

src/skins/Natt/knobm43.png

src/skins/Natt/knobm44.png

src/skins/Natt/knobm5.png

src/skins/Natt/knobm6.png

src/skins/Natt/knobm7.png

src/skins/Natt/knobm8.png

src/skins/Natt/knobm9.png

src/skins/Natt/master_vol_meter_off.png

src/skins/Natt/master_vol_meter_on.png

src/skins/Natt/play-off-Ch1.png

src/skins/Natt/play-off-Ch2.png

src/skins/Natt/play-on-Ch1.png

src/skins/Natt/play-on-Ch2.png

src/skins/Natt/playpos-marker1.png

src/skins/Natt/playpos-marker2.png

src/skins/Natt/playpos-slider.png

src/skins/Natt/ratedown-off-Ch1.png

src/skins/Natt/ratedown-off-Ch2.png

src/skins/Natt/ratedown-on-Ch1.png

src/skins/Natt/ratedown-on-Ch2.png

src/skins/Natt/ratehandle-on-Ch1.png

src/skins/Natt/ratehandle-on-Ch2.png

src/skins/Natt/rateslider-off-Ch1.png

src/skins/Natt/rateslider-off-Ch2.png

src/skins/Natt/rateup-off-Ch1.png

src/skins/Natt/rateup-off-Ch2.png

src/skins/Natt/rateup-on-Ch1.png

src/skins/Natt/rateup-on-Ch2.png

src/skins/Natt/rev-off-Ch1.png

src/skins/Natt/rev-off-Ch2.png

src/skins/Natt/rev-on-Ch1.png

src/skins/Natt/rev-on-Ch2.png

src/skins/Natt/scene.png

src/skins/Natt/skin.xml

src/skins/Natt/sync-off-Ch1.png

src/skins/Natt/sync-off-Ch2.png

src/skins/Natt/sync-on-Ch1.png

src/skins/Natt/sync-on-Ch2.png

src/skins/Natt/volhandle-on-Ch1.png

src/skins/Natt/volhandle-on-Ch2.png

src/skins/Natt/volslider-off-Ch1.png

src/skins/Natt/volslider-off-Ch2.png

src/skins/Natt/vumeter-off-Ch1.png

src/skins/Natt/vumeter-off-Ch2.png

src/skins/Natt/vumeter-on-Ch1.png

src/skins/Natt/vumeter-on-Ch2.png

src/soundsourcem4a.cpp

src/soundsourcem4a.h

src/soundsourcemp3.cpp

src/soundsourceproxy.cpp

src/soundsourcesndfile.cpp

src/trackinfoobject.cpp

src/trackinfoobject.h

src/waveform/waveformrenderbeat.cpp

src/waveform/waveformrenderbeat.h

src/waveform/waveformrenderer.cpp

src/waveform/waveformrenderer.h

src/waveform/waveformrendermark.cpp

src/waveform/waveformrendermark.h

src/wavesummary.cpp

src/wavesummary.h

src/wvisualsimple.cpp

src/wvisualsimple.h

Older »