13
0
Commit Graph

70 Commits

Author SHA1 Message Date
da08f8b1c5 add options to show/hide master and midi tracks;; hide inactive tracks 2013-07-10 15:27:10 +02:00
c23a537b61 session property - include busses in meterbridge 2013-07-10 15:27:02 +02:00
66ee2c8e59 enable videotimeline by default 2013-04-11 19:49:48 +02:00
0c3e840700 videotimline
squashed 694 commits from http://gareus.org/gitweb/?p=ardour3.git
2013-03-13 20:28:15 +01:00
97abc19803 remove confusing RC preferences option for get/set use monitor section, and simplymake the RC configuration parameter follow the last session preference setting
git-svn-id: svn://localhost/ardour2/branches/3.0@14114 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-02 01:28:57 +00:00
5da4e2be2d remove timecode subframe configuration
There is no actual use-case to set it to anything else than 100.
timecode subframes are only used for ruler marks and the snap to grid.
libtimecode is still /aware/ of the subframe setting.

git-svn-id: svn://localhost/ardour2/branches/3.0@13817 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-09 15:47:19 +00:00
db36cb793a fix for #5224
git-svn-id: svn://localhost/ardour2/branches/3.0@13741 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-27 18:49:35 +00:00
Ben Loftis
b8a8abeb8f code cleanup; crossfade shape drawing is now more closely associated with the fade-in shape rather than a separate thing. could probably be consolidated into fewer functions, but this is an interim step for testing. Also remove the use-current-fade-shape option which is not meaningful in new model
git-svn-id: svn://localhost/ardour2/branches/3.0@13669 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-14 17:21:44 +00:00
Ben Loftis
2292e33ee4 crossfade hack and slash. removed overlap checks, overlap mode, default length, fade_is_xfade, fade_is_short, and other leftovers from previous crossfade models. Draw crossfade drags in realtime so fade_line is no longer needed. remove code for hiding crossfades during a drag. moved crossfade rect to top layer so crossfade lines dont grab mouse focus. drag-trim-with-fixed-fade-anchor is partially implemented and needs discussion
git-svn-id: svn://localhost/ardour2/branches/3.0@13659 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-13 16:42:05 +00:00
86b4b1b56e add tooltips to Offset config
git-svn-id: svn://localhost/ardour2/branches/3.0@13487 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-14 00:15:52 +00:00
e1581242ca implement TC offset for slave&generator.
Many related changes that require atomic update, mostly
because ClockOption slots changed:

  * change offset config format to std:string (backwards compat - reads 0)
  * make Timecode offset independent from fps
  * sample_to_timecode() handle negative sample-num
  * audio-clock fix entry and edit of negative numbers
  * option editor:
    - remove old global internal offset
    - add slave & generator TC entry
    - still needs UI cleanup, tooltops, maybe sep. tab..
  * LTC & MTC slave& generator:
    - cache offset
    - subscribe to parameter changes

git-svn-id: svn://localhost/ardour2/branches/3.0@13485 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-13 20:29:28 +00:00
ad4d781477 make pull-up/down truly exclusive with JACK
git-svn-id: svn://localhost/ardour2/branches/3.0@13454 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-12 16:49:05 +00:00
b8b8384a26 add support for using - as prefix keys to enter a negative value in an audio clock. so far only used for session timecode offset option clock
git-svn-id: svn://localhost/ardour2/branches/3.0@13443 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-11 22:20:40 +00:00
b0fb2a032b fix label for 24.975fps
the enum is not changed; it would break loading existing sessions.

git-svn-id: svn://localhost/ardour2/branches/3.0@13365 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-10-29 17:29:31 +00:00
a9abe3b1e1 move TimecodeFormat to libtimecode
provide a way to convert any TimecodeFormat to float frame-rate,
not only the currently active timecode_foramt.

git-svn-id: svn://localhost/ardour2/branches/3.0@13249 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-10-12 01:08:29 +00:00
9707a0e827 move the external sync source selection tobe a global config parameter, not per-session, since this is likely a reflection of studio setup, h/w etc.; starting using real tooltips in the RC option editor
git-svn-id: svn://localhost/ardour2/branches/3.0@13237 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-10-11 03:10:18 +00:00
71b7326576 move timecode-is-clock-synced option to global configuration parameters, not per session
git-svn-id: svn://localhost/ardour2/branches/3.0@13235 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-10-10 22:56:21 +00:00
6fa6514cfd Remove over 500 unnecessary includes (including 54 of session.h).
It's slightly possible that this causes trivial build failures on different
configurations, but otherwise shouldn't cause any problems (i.e. no actual
changes other than include/naming/namespace stuff).  I deliberately avoided
removing libardour-config.h since this can mysteriously break things, though a
few of those do seem to be unnecessary.

This commit only targets includes of ardour/*.h.  There is also a very large
number of unnecessary includes of stuff in gtk2_ardour; tackling that should
also give a big improvement in build time when things are modified.


git-svn-id: svn://localhost/ardour2/branches/3.0@12420 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 06:09:29 +00:00
Carl Hetherington
f015482088 More text tweaks.
git-svn-id: svn://localhost/ardour2/branches/3.0@12218 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-09 10:33:54 +00:00
Carl Hetherington
9228b1cbf6 Text tweaks.
git-svn-id: svn://localhost/ardour2/branches/3.0@12207 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-08 01:50:24 +00:00
Carl Hetherington
7614dc158a Remove unused options related to crossfades.
git-svn-id: svn://localhost/ardour2/branches/3.0@12120 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-30 01:12:59 +00:00
f78913cc99 Crossfades: default xfades are now constant-power, -3dB rule, other options are constant power(-6dB) rule or use existing region fade shape as is; provide GUI control over options; fix some inconsistent behaviour regarding xfades when relayering
git-svn-id: svn://localhost/ardour2/branches/3.0@12113 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-27 20:57:48 +00:00
Ben Loftis
45ac9c8861 add User metadata. user metadata is edited from the same dialog and read/writable using the same mechanism as session metadata, but it is stored in the ardour.rc file instead of with the session. Importing metadata from another session does not change user metadata. SessionMetadata is now a singleton that is available to the session object and the various config objects.
git-svn-id: svn://localhost/ardour2/branches/3.0@12014 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-18 17:46:29 +00:00
bb98baf413 fix a few dangling uses of Ardour as program name, in favor of PROGRAM_NAME
git-svn-id: svn://localhost/ardour2/branches/3.0@11563 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-29 20:18:18 +00:00
5e8403ff69 reword label for session properties item
git-svn-id: svn://localhost/ardour2/branches/3.0@11358 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-27 13:20:54 +00:00
508c5eb5bd make monitor section an optional feature than can be added/removed as needed. this is a big commit, and breakage is possible. it has been moderately tested. this commit also locks the remote control ID of the master bus to 318 and the monitor section (if any) to 319. the numbers are based on MIDI Machine Control limits
git-svn-id: svn://localhost/ardour2/branches/3.0@11256 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-18 01:30:44 +00:00
Carl Hetherington
b177514930 Revert internals of the last layering-related commit, and go back a slightly-cleaned-up version of how it was before. Remove all layering modes; only option now is add-is-higher. Move-add-higher could easily be re-added if anyone uses it.
git-svn-id: svn://localhost/ardour2/branches/3.0@11111 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-29 22:14:15 +00:00
Carl Hetherington
6304261b98 Re-work layering in possibly debatable ways. Sketchy docs in doc/layering.
git-svn-id: svn://localhost/ardour2/branches/3.0@11088 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-27 01:42:49 +00:00
Carl Hetherington
e355b5df27 Add option to glue new regions to bars and beats (#4202).
git-svn-id: svn://localhost/ardour2/branches/3.0@10821 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-24 19:33:13 +00:00
47a11efb12 put JACK time master option into Session -> Properties -> Timecode, and fully remove the time master button
git-svn-id: svn://localhost/ardour2/branches/3.0@10546 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-11 16:42:38 +00:00
17da9339c2 move auto-input into session options/properties dialog, move auto-play and auto-return next to the transport buttons; show ">24hrs" when there is truly a lot of disk space available
git-svn-id: svn://localhost/ardour2/branches/3.0@10507 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-09 17:29:23 +00:00
521937a9d1 catchup on previous commit relating to who owns ActiveState and VisualState
git-svn-id: svn://localhost/ardour2/branches/3.0@10372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-01 01:22:08 +00:00
7cded3707f add new per-session MIDI-region-copy-is-fork: if set, all MIDI region copies will be independent from each other (via MIDIRegion::clone()); visible in Session properties editor under the Misc tab
git-svn-id: svn://localhost/ardour2/branches/3.0@10207 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-13 17:57:33 +00:00
Carl Hetherington
315f41f82f Option to glue new markers to bars and beats (part of
#4202).


git-svn-id: svn://localhost/ardour2/branches/3.0@10087 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-14 20:39:03 +00:00
ed626628b5 Delete trailing whitespace
git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 17:00:29 +00:00
Carl Hetherington
75b1f698a1 Disable solo-controls-are-listen-controls if we don't have a monitor bus. Should fix #3660.
git-svn-id: svn://localhost/ardour2/branches/3.0@8436 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-04 20:52:30 +00:00
9dcea43b1d tweak and rename timecode settings tab
git-svn-id: svn://localhost/ardour2/branches/3.0@8219 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-08 17:36:12 +00:00
Carl Hetherington
a5ea47ff0d Re-expose timecode offset in the session option editor.
git-svn-id: svn://localhost/ardour2/branches/3.0@8146 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-01 20:49:22 +00:00
Carl Hetherington
4d5f26902d Tidy up a couple of bits in the session option editor.
git-svn-id: svn://localhost/ardour2/branches/3.0@7992 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-10 14:49:46 +00:00
84ddf22169 handle multiple imports of the same file better (via better source naming); make session properties editor pretty much work for search paths
git-svn-id: svn://localhost/ardour2/branches/3.0@7989 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-09 22:18:52 +00:00
5c6ba165f6 initial pass at a missing file dialog and "relocatable" source files. lots more to do here
git-svn-id: svn://localhost/ardour2/branches/3.0@7983 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-09 06:03:51 +00:00
Carl Hetherington
700726a040 Remove unnecessary connection option editor. Add GPL boilerplate. A little copy-editing. Fixes #3388.
git-svn-id: svn://localhost/ardour2/branches/3.0@7568 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-09 14:10:23 +00:00
Carl Hetherington
648a169d8f Move MIDI control port ownership into the MIDI Manager, since control port state should be Ardour-wide, not per-session. Fix up port connection state management.
git-svn-id: svn://localhost/ardour2/branches/3.0@7394 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-08 22:55:20 +00:00
Carl Hetherington
5f67a72c34 Basic tweaks to make the bundles and the port matrix accept that MIDI tracks may have audio IO, and vice versa. Allows connection of instrument tracks using the global port matrix.
git-svn-id: svn://localhost/ardour2/branches/3.0@7335 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-30 02:59:13 +00:00
4f16de5cfe GUI control of insert merge policy for overlapping MIDI notes; quite a bit of whitespace reformatting for some reason
git-svn-id: svn://localhost/ardour2/branches/3.0@7284 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-21 14:46:17 +00:00
fcbb78b010 session prefs editor gets renamed as session properties
git-svn-id: svn://localhost/ardour2/branches/3.0@7223 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-03 17:09:28 +00:00
14b0ca31bc handle deletion of UI objects between the time that a callback is queued with the UI event loop and the execution of the callback (intrusive, big)
git-svn-id: svn://localhost/ardour2/branches/3.0@6807 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-30 15:18:43 +00:00
f450df300c fully implement and deploy explicit x-thread signal connection syntax (testing comes next)
git-svn-id: svn://localhost/ardour2/branches/3.0@6379 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-21 18:23:07 +00:00
aae367b63c use new syntax for connecting to backend signals that enforces explicit connection scope, plus a few other related matters
git-svn-id: svn://localhost/ardour2/branches/3.0@6376 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-19 20:26:31 +00:00
8687895abb remove using namespace sigc everywhere to ensure clarity over which bind/mem_fun is being used; make Config::map_parameters take a boost::function rather than a sigc::slot ; continue debugging crash caused by regionviews not tracking their Region's lifetime
git-svn-id: svn://localhost/ardour2/branches/3.0@6357 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-12 15:02:15 +00:00