merge with master, with minor conflict fixes
[ardour.git] / libs / ardour / audio_track.cc
2014-02-08 Paul Davismerge with master, with minor conflict fixes
2014-02-04 Paul Davismerge (w/fix) with master
2014-01-30 Paul DavisMerge branch 'master' into cairocanvas
2014-01-29 Paul DavisMerge branch 'master' into cairocanvas
2014-01-23 Paul Davisfix merge conflict with master
2014-01-22 Robin Gareusremove cruft
2014-01-19 Paul Davisvisibility macros and flush() added to SrcFileSource...
2014-01-17 Paul DavisMerge branch 'master' into cairocanvas
2014-01-17 Paul DavisMerge branch 'master' into cairocanvas
2014-01-16 Paul DavisMerge branch 'master' into cairocanvas
2014-01-16 Paul DavisMerge branch 'master' into cairocanvas
2014-01-16 Paul DavisMerge branch 'master' into cairocanvas
2014-01-15 Paul DavisMerge branch 'master' into cairocanvas
2014-01-15 Paul Davismerge with master
2014-01-15 Paul Davismerge with master
2014-01-14 Paul Davismerge (with conflict fixes) with master (even against...
2014-01-11 Paul Davisfix merge with master
2014-01-10 Paul DavisMerge windows+cc branch into cairocanvas branch. Not...
2013-12-04 Paul DavisMerge branch 'master' into windows
2013-12-03 Paul DavisMerge branch 'master' into windows
2013-11-30 Paul Davismerge and resolve conflict with master
2013-11-27 Paul DavisMerge branch 'master' into windows
2013-11-27 Paul DavisMerge branch 'master' into windows
2013-11-26 Paul DavisMerge branch 'master' into windows
2013-11-26 Paul Davisresolve merge with master (?)
2013-10-23 Paul Davisfix merge conflicts with master
2013-10-18 John EmmasMerge remote-tracking branch 'remotes/origin/exportvis...
2013-10-17 Paul DavisMerge branch 'master' into windows
2013-10-16 John EmmasMerge remote-tracking branch 'remotes/origin/master...
2013-10-15 Paul DavisMerge branch 'master' into windows
2013-10-14 John EmmasMerge branch 'master' into windows+cc
2013-10-09 Paul DavisMerge ... master, fixing conflicts in 3 wscript files
2013-10-06 John EmmasMerge branch 'master' into windows+cc
2013-09-25 John EmmasMerge branch 'cairocanvas' into windows+cc
2013-09-21 John EmmasMerge remote-tracking branch 'remotes/origin/cairocanva...
2013-09-18 Paul DavisMerge branch 'master' into windows
2013-09-17 Paul Davisfix conflicts and merge with master
2013-09-14 Paul Davisfix merge conflicts with master
2013-09-14 Paul DavisMerge branch 'master' into windows
2013-09-14 Paul DavisMerge branch 'master' into windows
2013-09-13 Paul DavisMerge branch 'master' into windows
2013-09-13 Paul DavisMerge branch 'master' into windows
2013-09-12 Paul Davismerge with master
2013-09-12 Paul Davisincomplete merge of master into windows (requires upcom...
2013-09-06 Paul Davisfix merge conflicts with audioengine
2013-09-06 Paul DavisMerge branch 'master' into windows
2013-09-05 John Emmas'libs/ardour' - Revert 'std::llabs' to 'llabs' until...
2013-09-03 Paul DavisMerge branch 'master' into audioengine
2013-09-03 John EmmasMerge branch 'windows' of git.ardour.org:ardour/ardour...
2013-09-03 Paul DavisMerge branch 'master' into windows
2013-09-02 Paul Davisadd std:: to clarify use of llabs on OS X
2013-08-24 Paul Davisfix merge conflicts from master
2013-08-14 Paul Davisfix merge issues with master
2013-08-09 Paul DavisMerge branch 'master' into audioengine
2013-08-09 Paul Davismore purging of JACK as an explicit name from libardour
2013-08-08 Robin Gareusadvance track's play-position even if processing is...
2013-08-08 Robin Gareusfix stupid copy/paste error in 00f26394a9
2013-08-08 Robin Gareuszero meters for inactive tracks
2013-08-08 Robin Gareusfix "monitor mode 11"
2013-08-08 Robin Gareusfix input metering:
2013-08-05 Paul Davisfix conflicts after merge with master
2013-08-03 Robin Gareusadvance track's play-position even if processing is...
2013-08-01 Paul Davisfix merge conflict from master
2013-07-31 Robin Gareusfix stupid copy/paste error in 00f26394a9
2013-07-17 John EmmasMerge branch 'windows' of git.ardour.org:ardour/ardour...
2013-07-17 Paul DavisMerge branch 'master' into windows
2013-07-16 Robin GareusMerge branch 'clang' of https://github.com/axetota...
2013-07-16 Robin Gareuszero meters for inactive tracks
2013-07-16 Robin Gareusfix "monitor mode 11"
2013-07-16 Robin Gareusfix input metering:
2013-04-06 Paul DavisMerge branch 'cairocanvas' of git.ardour.org:ardour...
2013-04-06 Paul DavisMerge ... master, including manual merge conflict resol...
2013-04-06 Paul Davisrename Route::is_hidden() to Route::is_auditioner(...
2013-03-29 Paul DavisMerge branch 'patches' of https://github.com/jdekozak...
2013-03-28 Paul DavisSquashed commit of the following:
2012-10-18 Paul Davischange input/output button context menus for mixer...
2012-07-25 Paul Davisconvert from Glib:: to Glib::Threads for all thread...
2012-07-13 Paul Davisdramatic overhaul of automation. too long to explain...
2012-07-06 Paul Davisdo not deactivate the meter in a frozen track
2012-05-24 David RobillardRemove over 500 unnecessary includes (including 54...
2012-03-15 Paul Davisradically rethink export/bounce/freeze code design...
2012-01-30 Carl HetheringtonFix non-summon of butler when a track that needs it...
2011-12-23 Carl HetheringtonClarify ensure vs. request for JACK monitoring, naming...
2011-12-13 Paul Davisfix up mess with unassigned Playlist::orig_track_id
2011-12-10 Paul Davisfix for most (all? we can dream ...) issues involved...
2011-11-21 Carl HetheringtonRemove unused with_processors parameter to
2011-11-16 Carl HetheringtonRemove set_state / _set_state dance in Route hierarchy
2011-10-31 Carl HetheringtonTake commit() out of process() in both types of
2011-10-24 Carl HetheringtonMove some code up from {Midi,Audio}Track to Track.
2011-10-24 Carl HetheringtonRemove unused call_base parameter from Route::_set_state.
2011-10-21 Paul Daviscorrectly track monitoring changes in libardour and...
2011-10-21 Paul Davissave&restore for track monitor state
2011-10-20 Paul Davisobey monitor=disk when recording also; remove debug...
2011-10-20 Paul Davisadd initial implementation of explicit monitor (input...
2011-09-18 Carl HetheringtonRemove unused rec_monitors_input variables.
2011-06-01 David RobillardFix broken whitespace. I'd apologize for the compile...
2011-04-25 Paul Davisremove some left over debugging
2011-04-09 Paul Davisformatting cleanup
2011-04-04 David RobillardFix broken whitespace (no functional changes).
2011-03-11 Paul Davissorta-kinda working latency compensation, latency repor...
next