merge with master, with minor conflict fixes
[ardour.git] / gtk2_ardour / editor_audio_import.cc
2014-01-23 Paul Davisfix merge conflict with master
2014-01-19 Robin Gareusremove cruft
2013-09-14 Paul Davisfix merge conflicts with master
2013-09-03 Paul DavisMerge branch 'master' into audioengine
2013-08-24 Paul Davisfix merge conflicts from master
2013-08-15 Paul Davisfix newly-appearing crash-at-close caused by muddled...
2013-08-08 Paul Davisfix #5609 (import with 1 track per channel mis-associat...
2013-08-01 Paul Davisfix merge conflict from master
2013-07-23 Paul Davisfix #5609 (import with 1 track per channel mis-associat...
2013-04-05 Paul DavisMerge branch 'patches' of https://github.com/jdekozak...
2013-03-30 Paul DavisMerge branch 'master' of git.ardour.org:ardour/ardour
2013-03-30 Paul Davisfix up some confusion with filesources' _origin and...
2012-12-23 Paul Davisremove stay-on-top behavior from import dialog, and...
2012-12-23 Paul Davismake import dialog non-modal
2012-12-23 Robin Gareusfix duplicate import of previously selected files when...
2012-06-22 Paul Davisprovide an easier way to add mixed (audio+MIDI) tracks...
2012-06-09 Carl HetheringtonCommit one reversible command for the whole of an impor...
2012-06-09 Carl HetheringtonFix up hack to cope with zero-length imported MIDI...
2012-06-09 Carl HetheringtonRename import_audiofiles -> import_files.
2012-06-09 Carl HetheringtonMake sure that regions created during AsTrack and AsTap...
2012-05-24 David RobillardRemove over 500 unnecessary includes (including 54...
2012-02-02 Paul Davisadd a way to create a new MIDI track with an instrument...
2011-07-26 Paul Davisallow import to selected MIDI tracks (note that this...
2011-06-16 Todd NaugleFixed bug where embedded sources did not correctly...
2011-06-01 David RobillardDelete trailing whitespace
2011-05-17 Carl HetheringtonRe-fix problems when zero-length MIDI regions are creat...
2011-05-13 Paul Davisinitial volley of work for AudioPlaylistSource, the...
2011-04-21 Carl HetheringtonStop MIDI import generating zero-length regions. May...
2011-04-05 Paul Davisremove unused arguments to keep gcc quiet
2011-01-21 Carl HetheringtonMake all types of import at least partially undo-able...
2011-01-19 Carl HetheringtonFix session range location by hooking into the undo...
2010-12-07 Paul Davisfix crash when importing MIDI with "at timestamp" chosen
2010-11-25 David RobillardFix some messed up code (spacey tabs).
2010-11-16 Carl HetheringtonMove mouse cursor stuff out of Editor into its own...
2010-11-09 Paul Davishandle multiple imports of the same file better (via...
2010-11-09 Paul Davisalways store source names as relative paths; always...
2010-11-05 Paul Davistry to sensibly handle repeated imports of the same...
2010-09-29 Carl HetheringtonSave state a little less often during multi-file imports.
2010-09-29 Carl HetheringtonFix confusion about the 'done' variable in InterThreadI...
2010-09-22 Paul Davismuch craziness with canvas cursors; fix 0 beat cursor...
2010-09-17 Paul Davismegaopus patch #2 for today: remove nframes64_t and...
2010-09-16 Paul Davismake resampled sources (during import) report their...
2010-09-14 Paul Davisremove Glib::ustring from gtk2_ardour
2010-09-14 Paul Davisremove Glib::ustring from libardour; allow any characte...
2010-08-25 Carl Hetheringtonclear_history -> clear_changes and some comments.
2010-08-12 Paul Davisforward port commit 7608 for a3
2010-05-19 Carl HetheringtonUse SMFSource static method to look for MIDI file exten...
2010-04-21 Carl HetheringtonMove Diskstream ownership to Track, so that Session...
2010-04-14 Carl HetheringtonSeparate interthread progress window out into its own...
2010-04-12 Paul Davisuse session start rather than edit position for import...
2010-04-10 Carl HetheringtonFix import dialogue to correctly report (x of N) with...
2010-03-04 Paul Davisget "sequence files" import working, and fix quite...
2010-03-02 Paul Davis(1) remove most uses of MementoCommand for Playlist...
2010-03-02 Paul Davisthe mega-properties/SequenceProperty patch. split is...
2010-02-18 Paul Davisthe Properties & 64bit region commit
2009-12-23 Carl HetheringtonGive titles to Gtkmm2ext::Choice prompts, and do some...
2009-12-17 Paul Davisswitch to using boost::signals2 instead of sigc++,...
2009-12-12 Paul Davisremove using namespace sigc everywhere to ensure clarit...
2009-12-11 Paul Davismake all use of bind/mem_fun be explicitly sigc::
2009-12-09 Paul Davismajor design changes: use glib event loop for MIDI...
2009-12-04 Paul Daviscross-thread handling of SessionEvent allocation/deallo...
2009-11-30 Paul Davisnew rc config param, try-link-for-embed, controls wheth...
2009-10-19 Carl HetheringtonTidy up window titles, according to GNOME HIG and as...
2009-10-14 David RobillardStrip trailing whitespace and fix other whitespace...
2009-10-01 Paul Davisi/o button naming patch and imported file BWF timecode...
2009-08-02 Carl HetheringtonTweak prompt wording.
2009-08-02 Carl HetheringtonFix import dialog so that file number progress gets...
2009-07-21 Carl HetheringtonFix some unused parameter warnings.
2009-07-09 Carl HetheringtonBack out big shared_ptr change. Moving to a branch...
2009-07-09 Carl HetheringtonUse shared_ptr for the TimeAxisView hierarchy.
2009-06-25 Paul Davisstartup assistant patch from tinman; cleanup fix backpo...
2009-06-20 Carl HetheringtonAllow edit group creation from the route UI's menu...
2009-02-25 David Robillard*** NEW CODING POLICY ***
2009-02-20 David RobillardMake source length a dynamic thing.
2009-02-17 David RobillardFix the horrible mess that was anything related to...
2009-02-16 David RobillardMove duplicated AudioFileSource::Flags and SMFSource...
2008-12-12 Paul Davismost of the 2.X->3.0 commit (up to rev 4299) except...
2008-09-26 Sakari BergenAdd Import from session -functionality
2008-09-17 David RobillardFix sndfile pkg-config name and SYSLIBS.
2008-09-10 Paul Davismerge from 2.0-ongoing @ 3581
2008-05-16 David RobillardDon't create tracks for empty MIDI channels on import...
2008-05-16 David RobillardFix region/track naming on MIDI import (remove ugly...
2008-04-11 Paul Davismerge 3.0 from 2.0-ongoing@3243
2008-03-17 Paul Davismerge with 2.0-ongoing @ rev 3147
2008-02-19 David RobillardLess crash-happy MIDI reading on weird MIDI files.
2008-02-18 David RobillardChannel-aware note recording in MidiModel (i.e. multi...
2008-02-18 David RobillardPreliminary (read: kludgey) MIDI import support.
2008-02-16 David RobillardMerge with 2.0-ongoing R3071.
2007-11-15 Tim MayberryRename Session::import_audiofile to Session::import_aud...
2007-11-12 Paul Davismerged with trunk revs 2605-2627
2007-11-08 Paul Davismerged with 2.0-ongoing changes 2582-2605 (not thorough...
2007-10-11 Paul Davismerge from 2.0-ongoing by hand, minus key binding editor
2007-07-16 Paul Davissupport for 16 bit native files
2007-06-28 Tim MayberryUse the file name as the track name when importing...
2007-06-17 Tim MayberryUse Session::session_directory and sys::path in Editor...
2007-06-15 David RobillardUse boost::shared_ptr instead of raw pointers for Route...
2007-05-10 David RobillardAdded nicer looking wrapper methods for ChanCount:...
2007-05-10 Paul DavisMIDI branch becomes trunk
2007-04-12 David RobillardMerged with trunk R1705.
2007-04-11 Paul Davismerged with 1697 revision of trunk (which is post-rc1...
next