lp:~noskcaj/ubuntu/saucy/nootka/upstream-merge
Created by
Jackson Doak
and last modified
- Get this branch:
- bzr branch lp:~noskcaj/ubuntu/saucy/nootka/upstream-merge
Only
Jackson Doak
can upload to this branch. If you are
Jackson Doak
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Jonathan Riddell (community): Approve
- Logan Rosen (community): Needs Fixing
- Ubuntu branches: Pending requested
-
Diff: 42914 lines (+32837/-5730)139 files modified.hg/cache/branchheads (+2/-2)
CMakeLists.txt (+170/-96)
README (+20/-11)
TODO (+15/-14)
changes (+10/-0)
debian/changelog (+7/-0)
debian/control (+1/-1)
debian/patches/qmaxfix.patch (+5/-3)
lang/nootka_cs.ts (+193/-139)
lang/nootka_fr.ts (+221/-218)
lang/nootka_pl.ts (+193/-139)
lang/nootka_xx.ts (+229/-169)
packaging/.directory (+3/-0)
packaging/CMakeLists.txt (+14/-1)
packaging/mac/install.sh (+35/-5)
packaging/nsis/nootka-1250.nsi (+16/-8)
packaging/rpm/nootka.spec.in (+5/-4)
packaging/src/make-src.sh (+1/-1)
src/CMakeLists.txt (+107/-52)
src/exam/tcanvas.cpp (+33/-9)
src/exam/tcanvas.h (+4/-0)
src/exam/texamexecutor.cpp (+69/-29)
src/exam/texamexecutor.h (+1/-0)
src/exam/tfinishtip.cpp (+41/-0)
src/exam/tfinishtip.h (+43/-0)
src/info/taboutnootka.cpp (+12/-1)
src/info/tsupportnootka.cpp (+2/-0)
src/main.cpp (+3/-3)
src/mainwindow.cpp (+13/-3)
src/score/tnoteview.cpp (+14/-0)
src/score/tnoteview.h (+3/-1)
src/score/tscorewidget.cpp (+9/-0)
src/score/tscorewidget.h (+4/-0)
src/score/tscorewidgetsimple.cpp (+1/-0)
src/settings/settingsdialog.cpp (+72/-12)
src/settings/settingsdialog.h (+19/-11)
src/settings/tupdateprocess.cpp (+99/-0)
src/settings/tupdateprocess.h (+65/-0)
src/settings/tvolumeslider.cpp (+80/-0)
src/settings/tvolumeslider.h (+56/-0)
src/sound/RtError.h (+0/-60)
src/sound/RtMidi-license (+0/-10)
src/sound/RtMidi.cpp (+0/-2814)
src/sound/RtMidi.h (+0/-306)
src/sound/audioinsettings.cpp (+64/-72)
src/sound/audioinsettings.h (+10/-8)
src/sound/audiooutsettings.cpp (+35/-17)
src/sound/audiooutsettings.h (+7/-5)
src/sound/midi_instruments_list.txt (+0/-160)
src/sound/rt/CMakeLists.txt (+87/-0)
src/sound/rt/RtAudio.cpp (+8350/-0)
src/sound/rt/RtAudio.h (+1014/-0)
src/sound/rt/RtError.h (+60/-0)
src/sound/rt/RtMidi-license (+10/-0)
src/sound/rt/RtMidi.cpp (+3747/-0)
src/sound/rt/RtMidi.h (+675/-0)
src/sound/rt/asio.cpp (+257/-0)
src/sound/rt/asio.h (+1054/-0)
src/sound/rt/asiodrivers.cpp (+186/-0)
src/sound/rt/asiodrivers.h (+41/-0)
src/sound/rt/asiodrvr.h (+76/-0)
src/sound/rt/asiolist.cpp (+268/-0)
src/sound/rt/asiolist.h (+46/-0)
src/sound/rt/asiosys.h (+82/-0)
src/sound/rt/dsound.h (+2369/-0)
src/sound/rt/ginclude.h (+38/-0)
src/sound/rt/iasiodrv.h (+37/-0)
src/sound/rt/iasiothiscallresolver.cpp (+572/-0)
src/sound/rt/iasiothiscallresolver.h (+202/-0)
src/sound/rt/midi_instruments_list.txt (+160/-0)
src/sound/rt/readme (+61/-0)
src/sound/rt/soundcard.h (+1878/-0)
src/sound/stouch/AAFilter.cpp (+184/-0)
src/sound/stouch/AAFilter.h (+91/-0)
src/sound/stouch/BPMDetect.h (+164/-0)
src/sound/stouch/FIFOSampleBuffer.cpp (+274/-0)
src/sound/stouch/FIFOSampleBuffer.h (+178/-0)
src/sound/stouch/FIFOSamplePipe.h (+234/-0)
src/sound/stouch/FIRFilter.cpp (+259/-0)
src/sound/stouch/FIRFilter.h (+145/-0)
src/sound/stouch/README.html (+777/-1)
src/sound/stouch/RateTransposer.cpp (+626/-0)
src/sound/stouch/RateTransposer.h (+159/-0)
src/sound/stouch/STTypes.h (+190/-0)
src/sound/stouch/SoundTouch.cpp (+501/-0)
src/sound/stouch/SoundTouch.h (+277/-0)
src/sound/stouch/TDStretch.cpp (+808/-0)
src/sound/stouch/TDStretch.h (+268/-0)
src/sound/stouch/cpu_detect.h (+62/-0)
src/sound/stouch/cpu_detect_x86.cpp (+137/-0)
src/sound/stouch/mmx_optimized.cpp (+317/-0)
src/sound/stouch/soundtouch_config.h (+98/-0)
src/sound/stouch/sse_optimized.cpp (+361/-0)
src/sound/tabstractplayer.cpp (+41/-0)
src/sound/tabstractplayer.h (+69/-0)
src/sound/tabstractsoundview.cpp (+76/-0)
src/sound/tabstractsoundview.h (+47/-0)
src/sound/taudioin.cpp (+0/-339)
src/sound/taudioin.h (+0/-113)
src/sound/taudioout.cpp (+0/-452)
src/sound/taudioout.h (+0/-129)
src/sound/taudioparams.h (+2/-1)
src/sound/tintonationview.cpp (+131/-0)
src/sound/tintonationview.h (+62/-0)
src/sound/tmidiout.cpp (+273/-0)
src/sound/tmidiout.h (+79/-0)
src/sound/toggscale.cpp (+323/-0)
src/sound/toggscale.h (+118/-0)
src/sound/tpitchfinder.cpp (+109/-51)
src/sound/tpitchfinder.h (+37/-23)
src/sound/tpitchview.cpp (+38/-11)
src/sound/tpitchview.h (+13/-6)
src/sound/trtaudioabstract.cpp (+183/-0)
src/sound/trtaudioabstract.h (+75/-0)
src/sound/trtaudioin.cpp (+252/-0)
src/sound/trtaudioin.h (+112/-0)
src/sound/trtaudioout.cpp (+248/-0)
src/sound/trtaudioout.h (+74/-0)
src/sound/tsound.cpp (+109/-73)
src/sound/tsound.h (+10/-6)
src/sound/tvolumemeter.cpp (+0/-82)
src/sound/tvolumemeter.h (+0/-54)
src/sound/tvolumeview.cpp (+114/-0)
src/sound/tvolumeview.h (+56/-0)
src/tfingerboard.cpp (+35/-1)
src/tfingerboard.h (+5/-1)
src/tglobals.cpp (+7/-3)
src/tnotename.cpp (+6/-0)
src/tnotename.h (+2/-0)
src/updater/CMakeLists.txt (+99/-0)
src/updater/main.cpp (+62/-0)
src/updater/tupdatechecker.cpp (+106/-0)
src/updater/tupdatechecker.h (+61/-0)
src/updater/tupdateruleswdg.cpp (+95/-0)
src/updater/tupdateruleswdg.h (+49/-0)
src/updater/tupdatesummary.cpp (+71/-0)
src/updater/tupdatesummary.h (+53/-0)
src/updater/updatefunctions.cpp (+97/-0)
src/updater/updatefunctions.h (+52/-0)
Related bugs
Bug #1179207: Please update nootka to 0.8.77~beta | Wishlist | Fix Released |
Related blueprints
Branch information
- Owner:
- Jackson Doak
- Status:
- Development
Recent revisions
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/saucy/nootka