13
0
Commit Graph

2242 Commits

Author SHA1 Message Date
d747d82f65 Sort various things to reduce merge hell. No functional changes.
git-svn-id: svn://localhost/ardour2/branches/3.0@2992 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-02 17:46:56 +00:00
80c3677c83 Merge with 2.0-ongoing R2988
git-svn-id: svn://localhost/ardour2/branches/3.0@2991 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-02 17:22:04 +00:00
9f63ab9931 Merge with trunk R2978.
git-svn-id: svn://localhost/ardour2/branches/3.0@2988 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-02 03:57:35 +00:00
Nick Mainsbridge
85ea9028b5 collapse filechooser widget initially in export dialog
git-svn-id: svn://localhost/ardour2/branches/3.0@2947 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-19 15:47:40 +00:00
a188851698 Fix audio region view height on track height adjustment.
git-svn-id: svn://localhost/ardour2/branches/3.0@2946 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-19 05:46:26 +00:00
3657677761 Comment out splash screen stuff for now (segfaults on every session load).
git-svn-id: svn://localhost/ardour2/branches/3.0@2945 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-19 05:38:54 +00:00
7295d8e9f6 Merge with 2.0-ongoing R2943.
git-svn-id: svn://localhost/ardour2/branches/3.0@2944 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-19 05:06:33 +00:00
4ca1fe7993 Merge with trunk R2935.
git-svn-id: svn://localhost/ardour2/branches/3.0@2943 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-19 03:49:52 +00:00
f80fad313a the rename of trunk, since what has been trunk isn't a trunk.
git-svn-id: svn://localhost/ardour2/branches/3.0@2930 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-17 16:21:21 +00:00
544140df8b Added missing files.
git-svn-id: svn://localhost/ardour2/trunk@2928 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-17 02:45:35 +00:00
48ed9dc2c4 MIDI region stretching.
git-svn-id: svn://localhost/ardour2/trunk@2927 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-17 00:37:46 +00:00
ac1a255706 Merge with trunk R2920.
git-svn-id: svn://localhost/ardour2/trunk@2921 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-15 17:23:57 +00:00
b2e3b18dab Fix problem with notes occasionally not showing up at all.
git-svn-id: svn://localhost/ardour2/trunk@2919 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-15 03:32:51 +00:00
c4cec60d8f Fix track controls gap when showing/hiding editor meters.
git-svn-id: svn://localhost/ardour2/trunk@2916 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-15 00:46:54 +00:00
23f25ad808 Fix track controls width.
git-svn-id: svn://localhost/ardour2/trunk@2915 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-15 00:35:55 +00:00
5a1d3e851d Partially fix MIDI region trim and extend.
git-svn-id: svn://localhost/ardour2/trunk@2911 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-14 01:30:38 +00:00
794917fca7 Install everything to *ardour3* instead of *ardour2*.
Fix initial display of keys and scroomer on new MIDI tracks.
Remove console barf.


git-svn-id: svn://localhost/ardour2/trunk@2909 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-13 21:34:04 +00:00
2db91c126e Apply MIDI keyboard and "scroomer" patch.
git-svn-id: svn://localhost/ardour2/trunk@2908 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-13 17:45:17 +00:00
f8e3d652e9 Reduce console noise.
git-svn-id: svn://localhost/ardour2/trunk@2906 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-13 00:39:58 +00:00
c78c44ccd7 Fix MIDI playback.
git-svn-id: svn://localhost/ardour2/trunk@2905 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-13 00:27:13 +00:00
e92c1669c1 Merge with 2.0-ongoing R2885.
Fix loading of 2.0 sessions.


git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 23:45:50 +00:00
bf256c1681 Fix LD_PRELOAD hackery for cairomm.
git-svn-id: svn://localhost/ardour2/trunk@2890 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-11 00:54:08 +00:00
2db574ba6b More build fixes.
git-svn-id: svn://localhost/ardour2/trunk@2889 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-11 00:39:37 +00:00
bde575a8e8 Actually fix compilation w/ SYSLIBS=0.
Set version number to 3.0 (was 2.1).


git-svn-id: svn://localhost/ardour2/trunk@2888 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-11 00:07:40 +00:00
ed312acded (Possible) compile w/o SYSLIBS fix.
git-svn-id: svn://localhost/ardour2/trunk@2887 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 23:11:05 +00:00
821e4763fd Merge with 2.0-ongoing R2885.
git-svn-id: svn://localhost/ardour2/trunk@2886 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 22:29:26 +00:00
8a2e30816e Merge with 2.0-ongoing R2883.
git-svn-id: svn://localhost/ardour2/trunk@2885 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 22:22:29 +00:00
bb457bb960 Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837.
git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 21:20:59 +00:00
73dd9d37e7 Merge with 2.0-ongoing R2653.
git-svn-id: svn://localhost/ardour2/trunk@2837 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-07 21:12:29 +00:00
c4110b37f0 Fix meter colour names for consistency.
git-svn-id: svn://localhost/ardour2/trunk@2805 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-12-21 00:26:06 +00:00
cbb935c8d5 Fix crash when displaying LADSPA plugin UI.
git-svn-id: svn://localhost/ardour2/trunk@2804 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-12-21 00:08:02 +00:00
Doug McLain
b42213bb04 Port level meters to trunk
git-svn-id: svn://localhost/ardour2/trunk@2802 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-12-20 23:25:19 +00:00
8c2715ce2c Lower soundtouch version dependency to 1.2.1 w/ SYSLIBS=1. Compiles here...
git-svn-id: svn://localhost/ardour2/trunk@2798 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-12-19 05:05:52 +00:00
c430323217 Added missing file.
git-svn-id: svn://localhost/ardour2/trunk@2794 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-12-18 22:46:49 +00:00
bbda535cf3 Make configure script executable.
git-svn-id: svn://localhost/ardour2/trunk@2793 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-12-18 22:31:38 +00:00
47a41c0d4d Fix building.
git-svn-id: svn://localhost/ardour2/trunk@2791 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-12-18 07:20:02 +00:00
35fc31a1de Remove ancient/unused flowcanvas and libglademm from repository.
Update libraries to latest stable released version (except gnomecanvasmm, which is strangely packaged...).
Fixes building (at least here).


git-svn-id: svn://localhost/ardour2/trunk@2790 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-12-18 06:05:55 +00:00
0e31c56591 Check for soundtouch library when using SYSLIBS
git-svn-id: svn://localhost/ardour2/trunk@2787 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-12-15 23:29:38 +00:00
6cb5ad00f1 Fix compile for when LIBLO=0
git-svn-id: svn://localhost/ardour2/trunk@2786 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-12-15 23:29:30 +00:00
f6d4ed862f Remove two unused files in gtk2_ardour
git-svn-id: svn://localhost/ardour2/trunk@2785 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-12-15 23:29:21 +00:00
375e555c89 Remove unused file gtk2_ardour/gtkscrolledwindow.c
git-svn-id: svn://localhost/ardour2/trunk@2784 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-12-15 23:29:02 +00:00
64a882d96b Fix include statements so they match all other files in gtk2_ardour
git-svn-id: svn://localhost/ardour2/trunk@2783 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-12-15 23:28:47 +00:00
f2aa623858 Use normal Processor run_in_place interface on Meter.
git-svn-id: svn://localhost/ardour2/trunk@2714 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-26 01:29:11 +00:00
2a391a677d Fix unused variable warning.
Consistently name canvas colours (was very messy and user exposed).


git-svn-id: svn://localhost/ardour2/trunk@2713 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-25 01:05:48 +00:00
118816dfe3 Fix crash on MIDI region split.
git-svn-id: svn://localhost/ardour2/trunk@2712 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-25 00:28:35 +00:00
Carl Hetherington
fde04925f1 Apply colinf's fix for bug #1913
git-svn-id: svn://localhost/ardour2/trunk@2689 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-17 21:02:05 +00:00
db718a7f17 Change return type of Session::import_audiofiles to void as the int return value was not used
git-svn-id: svn://localhost/ardour2/trunk@2677 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-15 02:32:40 +00:00
a39a9ea2d4 Rename Session::import_audiofile to Session::import_audiofiles now that it imports more than a single file
git-svn-id: svn://localhost/ardour2/trunk@2676 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-15 02:32:35 +00:00
b5e959cc4c Improve the readability of Session::import_audiofile
git-svn-id: svn://localhost/ardour2/trunk@2675 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-15 02:32:30 +00:00
c6062e8828 Refactor Session::import_audiofile to reduce complexity and remove use of goto
git-svn-id: svn://localhost/ardour2/trunk@2674 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-15 02:32:27 +00:00