lp://staging/~zequence/ubuntu/trusty/ardour3/fix-for-1450992
Created by
Kaj Ailomaa
and last modified
- Get this branch:
- bzr branch lp://staging/~zequence/ubuntu/trusty/ardour3/fix-for-1450992
Only
Kaj Ailomaa
can upload to this branch. If you are
Kaj Ailomaa
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
Ready for review
for merging
into
lp://staging/ubuntu/trusty/ardour3
- Micah Gersten: Disapprove
-
Diff: 7848 lines (+3913/-931) (has conflicts)125 files modified.pc/applied-patches (+2/-0)
.pc/log-stdout.patch/wscript (+822/-0)
.pc/midi-data-loss.patch/libs/ardour/smf_source.cc (+764/-0)
.pc/wscript.patch/wscript (+4/-4)
debian/changelog (+75/-12)
debian/control (+6/-0)
debian/control.in (+1/-1)
debian/patches/log-stdout.patch (+25/-0)
debian/patches/midi-data-loss.patch (+62/-0)
debian/patches/series (+2/-0)
debian/rules (+2/-1)
gtk2_ardour/add_video_dialog.cc (+4/-1)
gtk2_ardour/ardev_common.sh.in (+1/-0)
gtk2_ardour/ardour.menus.in (+1/-0)
gtk2_ardour/ardour_ui.cc (+6/-3)
gtk2_ardour/ardour_ui.h (+1/-0)
gtk2_ardour/ardour_ui_dialogs.cc (+15/-0)
gtk2_ardour/ardour_ui_ed.cc (+1/-0)
gtk2_ardour/audio_region_view.cc (+2/-2)
gtk2_ardour/audio_region_view.h (+1/-1)
gtk2_ardour/automation_region_view.cc (+9/-3)
gtk2_ardour/automation_region_view.h (+1/-1)
gtk2_ardour/automation_time_axis.cc (+2/-2)
gtk2_ardour/automation_time_axis.h (+1/-1)
gtk2_ardour/editor.bindings (+1/-0)
gtk2_ardour/editor.h (+1/-1)
gtk2_ardour/editor_actions.cc (+30/-30)
gtk2_ardour/editor_audio_import.cc (+30/-18)
gtk2_ardour/editor_drag.cc (+17/-3)
gtk2_ardour/editor_mouse.cc (+8/-4)
gtk2_ardour/editor_ops.cc (+11/-6)
gtk2_ardour/editor_regions.cc (+1/-1)
gtk2_ardour/editor_rulers.cc (+15/-15)
gtk2_ardour/ergonomic-us.bindings.in (+1/-0)
gtk2_ardour/gain_meter.cc (+8/-2)
gtk2_ardour/level_meter.cc (+1/-0)
gtk2_ardour/midi_time_axis.cc (+42/-3)
gtk2_ardour/mixer_strip.cc (+60/-28)
gtk2_ardour/mixer_ui.cc (+39/-0)
gtk2_ardour/mixer_ui.h (+6/-0)
gtk2_ardour/mnemonic-us.bindings.in (+2/-1)
gtk2_ardour/opts.cc (+1/-1)
gtk2_ardour/panner_ui.cc (+81/-1)
gtk2_ardour/panner_ui.h (+1/-0)
gtk2_ardour/plugin_ui.cc (+2/-0)
gtk2_ardour/processor_box.cc (+70/-0)
gtk2_ardour/route_ui.cc (+2/-2)
gtk2_ardour/sfdb_ui.cc (+94/-3)
gtk2_ardour/stereo_panner.cc (+36/-16)
gtk2_ardour/transcode_ffmpeg.cc (+34/-15)
gtk2_ardour/transcode_ffmpeg.h (+1/-0)
gtk2_ardour/transcode_video_dialog.cc (+22/-10)
gtk2_ardour/transcode_video_dialog.h (+3/-3)
gtk2_ardour/video_server_dialog.cc (+7/-2)
gtk2_ardour/video_timeline.cc (+36/-5)
libs/ardour/amp.cc (+4/-19)
libs/ardour/ardour/audio_buffer.h (+5/-4)
libs/ardour/ardour/audio_diskstream.h (+0/-1)
libs/ardour/ardour/audiofilesource.h (+6/-4)
libs/ardour/ardour/buffer.h (+2/-10)
libs/ardour/ardour/diskstream.h (+2/-0)
libs/ardour/ardour/file_source.h (+9/-2)
libs/ardour/ardour/midi_buffer.h (+3/-0)
libs/ardour/ardour/midi_diskstream.h (+1/-1)
libs/ardour/ardour/midi_region.h (+1/-0)
libs/ardour/ardour/midi_source.h (+15/-3)
libs/ardour/ardour/public_diskstream.h (+1/-1)
libs/ardour/ardour/session.h (+8/-11)
libs/ardour/ardour/smf_source.h (+7/-4)
libs/ardour/ardour/sndfilesource.h (+10/-1)
libs/ardour/ardour/source.h (+2/-1)
libs/ardour/ardour/source_factory.h (+3/-0)
libs/ardour/ardour/track.h (+1/-1)
libs/ardour/ardour/vestige/aeffectx.h (+21/-0)
libs/ardour/audio_buffer.cc (+4/-7)
libs/ardour/audio_diskstream.cc (+26/-20)
libs/ardour/audiofilesource.cc (+17/-0)
libs/ardour/automation_control.cc (+14/-6)
libs/ardour/automation_watch.cc (+1/-1)
libs/ardour/coreaudiosource.cc (+14/-1)
libs/ardour/delivery.cc (+4/-0)
libs/ardour/diskstream.cc (+0/-1)
libs/ardour/enums.cc (+1/-0)
libs/ardour/export_channel.cc (+1/-1)
libs/ardour/file_source.cc (+71/-55)
libs/ardour/filter.cc (+2/-3)
libs/ardour/import.cc (+26/-76)
libs/ardour/internal_send.cc (+1/-1)
libs/ardour/lv2_evbuf.c (+1/-1)
libs/ardour/lv2_plugin.cc (+2/-22)
libs/ardour/midi_diskstream.cc (+30/-19)
libs/ardour/midi_region.cc (+21/-3)
libs/ardour/midi_source.cc (+10/-27)
libs/ardour/plugin_insert.cc (+21/-5)
libs/ardour/plugin_manager.cc (+3/-1)
libs/ardour/route.cc (+46/-2)
libs/ardour/session.cc (+199/-245)
libs/ardour/session_state.cc (+80/-60)
libs/ardour/smf_source.cc (+154/-16)
libs/ardour/sndfilesource.cc (+67/-12)
libs/ardour/source_factory.cc (+37/-0)
libs/ardour/tempo.cc (+10/-5)
libs/ardour/track.cc (+3/-3)
libs/evoral/evoral/ControlList.hpp (+1/-1)
libs/evoral/evoral/SMF.hpp (+1/-0)
libs/evoral/src/Control.cpp (+9/-2)
libs/evoral/src/ControlList.cpp (+20/-14)
libs/evoral/src/SMF.cpp (+22/-0)
libs/evoral/test/SequenceTest.cpp (+1/-1)
libs/midi++2/midnam_patch.cc (+3/-4)
libs/panners/vbap/vbap.cc (+1/-1)
libs/panners/vbap/vbap_speakers.cc (+81/-20)
libs/pbd/clear_dir.cc (+37/-0)
libs/pbd/file_utils.cc (+67/-18)
libs/pbd/pbd/clear_dir.h (+1/-0)
libs/surfaces/generic_midi/midicontrollable.cc (+19/-2)
libs/surfaces/mackie/mackie_control_protocol.cc (+16/-2)
libs/surfaces/mackie/mackie_control_protocol.h (+2/-0)
libs/surfaces/mackie/strip.cc (+10/-1)
libs/surfaces/mackie/strip.h (+1/-0)
libs/surfaces/mackie/surface.cc (+32/-3)
patchfiles/Korg_Volca_Bass.midnam (+37/-0)
patchfiles/Korg_Volca_Beats.midnam (+58/-0)
patchfiles/Korg_Volca_Keys.midnam (+41/-0)
wscript (+13/-4)
Branch information
- Owner:
- Kaj Ailomaa
- Status:
- Development
Recent revisions
- 13. By Felipe Sateler
-
Prevent build failures in slower architectures by
forcing waf logging to stdout instead of stderr. - 10. By Adrian Knoth
-
* Imported Upstream version 3.5.357~dfsg
* Critical bugfix release. All users are recommended to upgrade.
* Details: https://community. ardour. org/node/ 8015 - 9. By Adrian Knoth
-
[ Jaromír Mikeš ]
* Use higher resolution picture for desktop icon (Closes: #729890).[ Adrian Knoth ]
* Change Name entry in desktop file (Closes: #729890)
* Remove python runtime dependencies
* Imported Upstream version 3.5.308~dfsg (Closes: #734079 #733969) - 8. By Bhavani Shankar
-
* Merge from Debian unstable. Remaining changes:
- Update ardour3.xpm, ardour3.desktop (Closes Debian bug: 729890) - 6. By Adrian Knoth
-
* Imported Upstream version 3.5.74~dfsg
* Refresh waf.patch
* Add wscript.patch to match upstream's new version schema
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/ubuntu/vivid/ardour3