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
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
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
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
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
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
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
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
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
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
3a25065653
Remove an unnessesary use of goto in Session::import_audiofile
...
git-svn-id: svn://localhost/ardour2/trunk@2673 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-15 02:32:23 +00:00
03d3147d32
Check for cancel at the top of the main loop in Session::import_audiofile rather than using goto
...
git-svn-id: svn://localhost/ardour2/trunk@2672 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-15 02:32:20 +00:00
7bddf6208f
Use sys::basename instead of PBD::basename_nosuffix in Session::import_audiofile
...
git-svn-id: svn://localhost/ardour2/trunk@2671 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-15 02:32:15 +00:00
20d6a70b15
Simplify finalization code in Session::import_audiofile
...
git-svn-id: svn://localhost/ardour2/trunk@2670 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-15 02:32:11 +00:00
7976efd071
Use std::copy instead of for loop in Session::import_audiofile
...
git-svn-id: svn://localhost/ardour2/trunk@2669 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-15 02:32:07 +00:00
822d1a1b84
Use full name of file being imported in status message during import
...
git-svn-id: svn://localhost/ardour2/trunk@2668 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-15 02:32:01 +00:00
27b022bdeb
Pass a path argument to ImportableSource rather than SNDFILE handle so resource management is contained
...
git-svn-id: svn://localhost/ardour2/trunk@2667 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-15 02:31:58 +00:00
4076f7714a
Fix mixed usage of tabs and spaces for indentation in ardour/importable_source.h
...
git-svn-id: svn://localhost/ardour2/trunk@2666 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-15 02:31:54 +00:00
3bf4a04d94
Use std::auto_ptr instead of boost::scoped_ptr in Session::import_audiofile
...
git-svn-id: svn://localhost/ardour2/trunk@2665 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-15 02:31:46 +00:00
e34d3e3312
Move variable declaration closer to usage
...
git-svn-id: svn://localhost/ardour2/trunk@2664 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-15 02:31:43 +00:00
a45598ec2a
Use sys::remove instead of ::unlink in Session::import_audiofile for portability
...
git-svn-id: svn://localhost/ardour2/trunk@2663 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-15 02:31:39 +00:00
da48c50527
Remove unused variable in Session::import_audiofile
...
git-svn-id: svn://localhost/ardour2/trunk@2662 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-15 02:31:36 +00:00
e1fde117b4
Use scoped_ptr in Session::import_audiofile to manage ImportableSource
...
git-svn-id: svn://localhost/ardour2/trunk@2661 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-15 02:31:32 +00:00
9e8afdd306
Refactor part of Session::import_audiofile into write_audio_data_to_new_files utility function
...
git-svn-id: svn://localhost/ardour2/trunk@2660 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-15 02:31:28 +00:00
1bffd1c209
Use std::vector and boost::shared_array instead of raw arrays for channel data in Session::import_audiofile
...
git-svn-id: svn://localhost/ardour2/trunk@2659 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-15 02:31:23 +00:00
4f7e6c0714
Use boost::scoped_array to manage working buffer for RAII in Session::import_audiofile
...
git-svn-id: svn://localhost/ardour2/trunk@2658 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-15 02:31:19 +00:00
4e89709c2d
Move filename generation in Session::import_audiofile to utility function get_non_existent_filename
...
git-svn-id: svn://localhost/ardour2/trunk@2657 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-15 02:31:14 +00:00
1c70e4393e
Use boost::shared_ptr for RAII with a SNDFILE handle in Session::import_audiofile
...
A scoped_ptr would be more suitable and efficient but scoped_ptr doesn't support
a custom deleter function(sf_close in this case), there are ways around that
limitation but I don't think it is worth doing at this point as it requires more
code etc.
git-svn-id: svn://localhost/ardour2/trunk@2656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-15 02:31:09 +00:00
Carl Hetherington
49df5c24a9
More missing bits.
...
git-svn-id: svn://localhost/ardour2/trunk@2650 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-13 11:09:40 +00:00
Carl Hetherington
f44e2a5e69
Yet more missing things. I'm going slightly mad.
...
git-svn-id: svn://localhost/ardour2/trunk@2649 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-13 11:00:40 +00:00
Carl Hetherington
cec0caf4fc
Add some more bits.
...
git-svn-id: svn://localhost/ardour2/trunk@2648 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-13 10:55:13 +00:00
