ab2af5d185
Fix several crashes on MIDI recording.
...
Fix MIDI CC iterator infinite looping.
Only allocate Text widget for MIDI events if necessary.
git-svn-id: svn://localhost/ardour2/branches/3.0@3307 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-05-02 20:57:27 +00:00
Hans Baier
0e394fb66b
* removed old implementation for Program Changes from MidiModel
...
* Added Automation based implementation for Program Changes, Pitch Bender and Channel Aftertouch
git-svn-id: svn://localhost/ardour2/branches/3.0@3304 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-05-02 19:09:32 +00:00
da45f489dd
Fixes for GCC 4.3.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3303 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-05-02 18:35:05 +00:00
Hans Baier
38eb5f4539
* renamed canvas-midi-event.* into canvas-note-event.*
...
* make MidiModel keep track of its CanvasProgramChange instances
git-svn-id: svn://localhost/ardour2/branches/3.0@3297 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-29 21:58:05 +00:00
Hans Baier
d3cc2981b0
* added new defaults for program change ui gtk2_ardour/ardour3_ui_default.conf
...
* reverted involuntarily committed changes
git-svn-id: svn://localhost/ardour2/branches/3.0@3296 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-29 12:51:10 +00:00
Hans Baier
c0d467f461
* added defaults for program change ui gtk2_ardour/ardour3_ui_default.conf
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3295 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-29 12:38:46 +00:00
Hans Baier
58e569c9e1
* Renamed CanvasMidiEvent into CanvasNoteEvent
...
* changed MidiModel::write_to to include note off handling *and* time sorting
git-svn-id: svn://localhost/ardour2/branches/3.0@3294 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-29 08:37:53 +00:00
Hans Baier
6d319e2132
* first prototype of program changes UI show up correctly (see http://www.flickr.com/photos/24012642@N02/2451596190/ )
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3293 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-29 07:28:24 +00:00
Hans Baier
f41f334be6
* forgot to commit this last time
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3291 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-26 09:07:32 +00:00
Hans Baier
0fc3087d7d
* recording/playing/saving/loading program changes basically seems to work now
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3288 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-26 00:12:54 +00:00
Hans Baier
d9de6f2c4c
* preliminary impl for PGM Change support in MidiModel
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3283 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-24 15:04:56 +00:00
Hans Baier
f91006d8d2
* added methods for pich bender/pgm change/aftertouch to MidiEvent
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3282 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-23 02:27:27 +00:00
Hans Baier
53f3b407bb
* refactored MidiControlIterator to improve readability of code
...
* commented out crashing section (control iterator stuff in MidiModel::const_iterator::operator++)
* added midi_panic() on no_roll in midi tracks so that all notes stop when pressing stop
* mark midi model edited on all changes so that recorded tracks get saved
git-svn-id: svn://localhost/ardour2/branches/3.0@3281 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-23 02:15:57 +00:00
Hans Baier
b81fd9415e
* disabled some debugging output
...
* make record buttons appear in MIDI mixer strips
git-svn-id: svn://localhost/ardour2/branches/3.0@3280 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-22 22:39:45 +00:00
Hans Baier
c72bf18bf4
* persisting/restoring track channel settings works now
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3276 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-21 15:10:13 +00:00
Hans Baier
9c4cc26d77
*fixed bug: channel mask not set in MidiRingBuffer
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3274 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-21 10:21:10 +00:00
Hans Baier
f31abc5eaf
* UI fixes for track channel selection
...
* implemented 'forcing midi events into a single channel'
* see http://www.flickr.com/photos/24012642@N02/2430165889/
git-svn-id: svn://localhost/ardour2/branches/3.0@3273 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-21 09:39:05 +00:00
Hans Baier
85c223da0d
* first prototype for track based channel selection works
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3267 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-19 02:11:11 +00:00
Hans Baier
0c66131fea
* bugfix in midi editing: adding notes impossible after delete
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3255 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-16 02:30:37 +00:00
Hans Baier
c4bdcb82af
* fixed bug: crash because of invalidated iterator while removing midi notes from model
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3253 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-15 23:00:06 +00:00
2656e0a43b
(3.0) fix compile error related to Controllable/shared_ptr confusion post-merge
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3251 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-12 14:02:00 +00:00
Hans Baier
aae8262a36
* persistent undo for MIDI edits works now
...
* fixed bug: dragging of notes beyond left region bounds made it disappear (unsigned int wrap around)
git-svn-id: svn://localhost/ardour2/branches/3.0@3249 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-11 15:49:52 +00:00
cb41314642
merge 3.0 from 2.0-ongoing@3243
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3248 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-11 14:06:50 +00:00
Hans Baier
9aa8af5a28
* refactored (un)marshalling of DeltaCommand into cleaner code using sigc
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3245 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-10 07:30:10 +00:00
Hans Baier
1a0044b35d
* implemented persistent undo for MidiModel::DeltaCommand. Deserializing works, but weirdly has no effect when undo/redo is applied in the editor
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3240 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-09 15:33:01 +00:00
Hans Baier
f39606f985
* fixed bug: MIDI region did not sound if its position was less than its start offset
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3239 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-08 23:57:59 +00:00
Hans Baier
a606a83d2e
* bugfix from http://tracker.ardour.org/view.php?id=2155 thanks to kristian: fix glibmm include issues with newer glib
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3222 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-07 16:32:14 +00:00
Hans Baier
4ee42dc455
* Bugfix: resizing beginnings of MIDI regions did not work correctly (it shifted the region content right)
...
* Bugfix: resizing ends of MIDI tracks did not hide noted beyond region boundaries (in the moment only all notes with note_on >= region end are hidden, their note offs still may exceed region boundaries, but so much for now.....)
git-svn-id: svn://localhost/ardour2/branches/3.0@3219 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-05 09:47:07 +00:00
Hans Baier
c2b802c6e2
* bugfix: Connecting/disconnecting MIDI ports did not work: http://tracker.ardour.org/view.php?id=2141
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3216 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-04 16:36:30 +00:00
Hans Baier
fbfe9a7983
* implemented editing velocities ( http://tracker.ardour.org/view.php?id=2148 )
...
* added MIDI panic button (http://tracker.ardour.org/view.php?id=2118 )
* bugfix: moving notes above midi 127 or below 0 does not wrap around anymore
* bugfix: deadlock on editing notes after playback (http://tracker.ardour.org/view.php?id=2140 ) due to unbalanced lock acquire/release
* bugfix: First note off lost in playback (http://tracker.ardour.org/view.php?id=2132 )
* bugfix: Last note off lost in saving MIDI files (http://tracker.ardour.org/view.php?id=2132 )
* bandaid fix for http://tracker.ardour.org/view.php?id=1985 (Cannot reopen session because jack ports are not unregistered on session close)
* bandaid fix: replaced conf.CheckPKGExists ('\"slv2 >= 0.6.0\"') by conf.CheckPKGExists ('slv2') in SConstruct, because the former would fail,
even if SLV 0.6.0 was installed
* added/enabled debugging output for debugging MIDI model (might be removed later)
git-svn-id: svn://localhost/ardour2/branches/3.0@3211 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-03 21:47:47 +00:00
6554200e66
hans' patches for MIDI note resizing++
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3184 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-26 11:11:47 +00:00
022c45361e
fix up delivery of MTC & MMC; add zero=last_timestamp semantics to JACK midi port write call; setup parser execution for JACK MIDI ports
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3159 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-19 21:15:28 +00:00
4808f7fe8b
fix up and re-enable MTC transmission
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3158 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-19 18:10:51 +00:00
d9faaed2c1
reduce (from 5k to 512) the number of events that non-process() threads may write into a JACK_MidiPort per process cycle
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3157 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-19 17:30:42 +00:00
3a29796405
reinstate Ye Olde MIDI (input) thread; fix up a few startup warnings
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3156 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-19 17:25:37 +00:00
eb4a1fdbb8
refactor JACK MIDI port to allow writing from a non-process() thread, and move ARDOUR::MidiEvent into MIDI namespace along with midi_events.h header
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3155 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-18 03:42:32 +00:00
d69f4e9e3d
band-aid fix for wrong-thread-MIDI-writes
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3154 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-18 00:58:36 +00:00
4ca4a8e237
added back glibmm2/Makefile.am
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3153 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-17 20:54:43 +00:00
997e4b1f9c
merge with 2.0-ongoing @ rev 3147
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3152 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-17 20:54:03 +00:00
19a4b99032
cleanup to build glibmm the way we actually want
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3148 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-17 14:30:05 +00:00
884f08ef50
Remove SMF file name print for every opened source.
...
Fix crash on startup when installed (splash.png not found).
git-svn-id: svn://localhost/ardour2/branches/3.0@3108 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-22 04:13:44 +00:00
faf4e1d8e8
Clean up weird formatting from underlays patch.
...
Fix several memory (valgrind) errors in a vain attempt to fix crash on session close.
git-svn-id: svn://localhost/ardour2/branches/3.0@3105 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-22 01:45:29 +00:00
4d94305cc9
Fix install path problems (s/ardour2/ardour3).
...
Fix finding of keybindings file when running from source tree (via ardev/ardbg).
Fix clashing keybindings for zoom stuff.
Add note tool keybinding and menu entry.
git-svn-id: svn://localhost/ardour2/branches/3.0@3099 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-21 19:30:01 +00:00
0d0bd81a75
Fix timing on MIDI import.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3093 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-21 00:15:20 +00:00
68bfed0a46
Some work towards MIDI plugins (LV2 plugins with (MIDI supporting) event ports shown in plugin selector).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3092 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-20 23:24:51 +00:00
a2a6cc0404
Merge with 2.0-ongoing R3082.
...
Superficial generification of export stuff.
git-svn-id: svn://localhost/ardour2/branches/3.0@3088 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-19 22:10:27 +00:00
4cbd7f0eab
Added missing file.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3087 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-19 03:40:25 +00:00
012292b4bd
Less crash-happy MIDI reading on weird MIDI files.
...
Make "show existing automation" create/show automation tracks for all contained CC in MIDI tracks.
Fix staggered time when importing multi-track MIDI files.
git-svn-id: svn://localhost/ardour2/branches/3.0@3086 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-19 03:24:44 +00:00
b79d5bfad3
'Channel safe' MIDI:
...
Resolve note on/off pairs in MidiModel.
Add channel field to Parameter (for associating a channel with a CC list).
Add channel selector to 'add controller automation' dialog.
Write out note and CC MIDI events with proper channel.
git-svn-id: svn://localhost/ardour2/branches/3.0@3085 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-19 01:31:24 +00:00
466500fdaf
Channel-aware note recording in MidiModel (i.e. multi-channel note input doesn't cause stuck notes).
...
Fix MIDI regions randomly displaying 100% stuck notes (uninitialized MidiPlaylist::_note_mode).
git-svn-id: svn://localhost/ardour2/branches/3.0@3084 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-18 23:30:27 +00:00
fbfb26b45c
Preliminary (read: kludgey) MIDI import support.
...
Only really works when tracks contain only channel 1 data for now.
git-svn-id: svn://localhost/ardour2/branches/3.0@3083 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-18 19:45:52 +00:00
8fed7470f5
Merge with 2.0-ongoing R3077.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3078 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-17 17:49:38 +00:00
859e9106e7
Merge with 2.0-ongoing R3071.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3074 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-16 22:55:47 +00:00
1b65758557
Committed underlay support (from Audun).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3037 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-10 18:16:25 +00:00
e76b028ffd
Fix libsndfile warning (useless conditional).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3004 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-04 00:29:54 +00:00
22682d448a
Fix domain to match 2.0-ongoing style.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3003 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-04 00:21:46 +00:00
6252d74308
Added missing file.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3002 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-03 22:31:40 +00:00
b4b3278bd8
Update clearlooks to fancy new cairo version.
...
Twiddle colours and throw some gloss in there mostly just to show off.
git-svn-id: svn://localhost/ardour2/branches/3.0@3000 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-03 20:33:49 +00:00
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