13
0
Commit Graph

2149 Commits

Author SHA1 Message Date
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
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
108e924ad5 Add cairomm to LD_LIBRARY_PATH
git-svn-id: svn://localhost/ardour2/trunk@2655 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-14 16:39:44 +00:00
76eb152745 Change the button order in the duplicate region dialog. Fixes bug 1877
git-svn-id: svn://localhost/ardour2/trunk@2651 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-13 13:21:11 +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
Carl Hetherington
9c98fdec1b Fix up permissions.
git-svn-id: svn://localhost/ardour2/trunk@2647 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-13 10:54:16 +00:00
Carl Hetherington
a1e55f9367 Fix up permissions.
git-svn-id: svn://localhost/ardour2/trunk@2646 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-13 10:53:56 +00:00
Carl Hetherington
aa6faa86b5 More missing stuff...
git-svn-id: svn://localhost/ardour2/trunk@2645 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-13 10:45:40 +00:00
Carl Hetherington
a313924b77 Re-add glibmm2 properly.
git-svn-id: svn://localhost/ardour2/trunk@2644 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-13 10:37:24 +00:00
Carl Hetherington
89f1f09c04 Add stuff missing from yesterday's library commit.
git-svn-id: svn://localhost/ardour2/trunk@2643 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-13 10:29:44 +00:00
c660fd3129 Fix three minor memory leaks in the Editor by using Gtk::manage
git-svn-id: svn://localhost/ardour2/trunk@2642 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-13 06:41:23 +00:00
f9bc731186 Add missing files from tarball scons target
git-svn-id: svn://localhost/ardour2/trunk@2641 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-13 06:41:16 +00:00
84e1a74e43 Don't log info message when creating session directories
git-svn-id: svn://localhost/ardour2/trunk@2640 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-13 06:41:12 +00:00
e1351fbe75 Don't log a warning when the system template directory does not exist.
git-svn-id: svn://localhost/ardour2/trunk@2639 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-13 06:41:02 +00:00
e75fe398ac Remove unused header include from ardour/ladspa_plugin.cc
git-svn-id: svn://localhost/ardour2/trunk@2638 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-13 06:40:56 +00:00
3b32566d30 Modify Session::path_from_region_name for portability
git-svn-id: svn://localhost/ardour2/trunk@2637 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-13 06:40:50 +00:00
6dc5e02575 Replace Glib::file_test with sys::exists in Session::path_from_region_name
git-svn-id: svn://localhost/ardour2/trunk@2636 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-13 06:40:45 +00:00
7b8bfddca6 fixed bad merge
git-svn-id: svn://localhost/ardour2/trunk@2632 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-13 01:55:56 +00:00
Carl Hetherington
d346adb1d9 Add missing cairomm lib from previous commit.
git-svn-id: svn://localhost/ardour2/trunk@2631 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-13 00:43:53 +00:00
Carl Hetherington
61c990dfba Upgrade gtkmm to 2.10.8, glibmm to 2.13.3 and add cairomm 1.2.4
git-svn-id: svn://localhost/ardour2/trunk@2630 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-12 23:44:49 +00:00
b01bdb7e70 merged with trunk revs 2605-2627
git-svn-id: svn://localhost/ardour2/trunk@2628 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-12 22:23:01 +00:00
Carl Hetherington
99d002dbdf Remove some debugging code which causes slow flashy screen updates.
git-svn-id: svn://localhost/ardour2/trunk@2616 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-10 12:23:19 +00:00
badc087263 merged with 2.0-ongoing changes 2582-2605 (not thoroughly tested but it compiles, start up, and creates a new session)
git-svn-id: svn://localhost/ardour2/trunk@2606 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-08 01:40:25 +00:00
df20e5935f stop auto-play from trying to play things that are not soundfiles
git-svn-id: svn://localhost/ardour2/trunk@2603 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-07 05:09:10 +00:00
8e73c9ee80 patch to prevent (mostly) CD marker being set for the start of the session
git-svn-id: svn://localhost/ardour2/trunk@2601 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-07 02:42:27 +00:00