Commit graph

467 commits

Author SHA1 Message Date
Paul Davis
3020b224fa Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge windows branch to get changes from there 2014-01-10 16:07:57 -05:00
Robin Gareus
21ca6a10a9 rework panning -- Squashed commit of the following:
commit 6f4f4f161b00cb36252727f67ecc4913eb944fd7
Author: Robin Gareus <robin@gareus.org>
Date:   Wed Jan 8 22:13:09 2014 +0100

    fix panner plugin discovery (prev commit)

commit 26e514f4a80af9192cae3cbd62fde0ae95474dfc
Author: Robin Gareus <robin@gareus.org>
Date:   Wed Jan 8 18:56:59 2014 +0100

    update panner plugin discovery

    * recurse dirs in 'PANNER_PATH' and 'panner_dir_name' up to 1 level.
    * don't look in ardour_dll_directory() -- no panners are supposed to be in there
    * use .dylib on OSX exclusively.

commit a514c3f1c425dccf3d42eee9d2b183b44fd26a03
Author: Robin Gareus <robin@gareus.org>
Date:   Wed Jan 8 16:48:34 2014 +0100

    remove debug/devel printf()s

commit d863742ddc69af493ee6a8817bc778968d9b0800
Author: Robin Gareus <robin@gareus.org>
Date:   Wed Jan 8 16:17:13 2014 +0100

    panner-type: session backward/forward compatibility

commit 25d5e4c663ada34129451b0f9045ab047d6cc2f0
Author: Robin Gareus <robin@gareus.org>
Date:   Wed Jan 8 16:09:07 2014 +0100

    update URIs -> URLs

commit 00a606a43d9456cfbaf43cae4fb598549326ba71
Merge: 0f1cec1 382eb0f
Author: Robin Gareus <robin@gareus.org>
Date:   Wed Jan 8 03:29:45 2014 +0100

    Merge branch 'master' into panning

commit 0f1cec19babae538c9697eed4be5d6ddc851b013
Author: Robin Gareus <robin@gareus.org>
Date:   Wed Jan 8 02:41:15 2014 +0100

    switch panner ID to URI

commit 575282b412c3ae1cd8219cf75f00a1a4239e2813
Author: Robin Gareus <robin@gareus.org>
Date:   Wed Jan 8 00:50:15 2014 +0100

    prepare API for panner URI

commit ea62cd049308859782a7bb16e4f18169d8638b46
Author: Robin Gareus <robin@gareus.org>
Date:   Tue Jan 7 19:57:06 2014 +0100

    update development doc relating to panner selection

commit 586d7de2392e26b9d7f597b1a00b98dfaa42ecdc
Author: Robin Gareus <robin@gareus.org>
Date:   Tue Jan 7 19:56:24 2014 +0100

    clean up PanShell::set_user_selected_panner_type() API

commit 99077886a5a1cacece908d87c29c3be12903027e
Author: Robin Gareus <robin@gareus.org>
Date:   Tue Jan 7 04:46:22 2014 +0100

    panner bypass: visualize & [in]sensitivity

commit 46d688d216f0e67d672376a607157af02b359fb2
Merge: 4e67573 c4cdf61
Author: Robin Gareus <robin@gareus.org>
Date:   Tue Jan 7 02:18:54 2014 +0100

    Merge branch 'master' into panning

commit 4e67573517b3d60ddf65729783687b16cfb2adb7
Author: Robin Gareus <robin@gareus.org>
Date:   Tue Jan 7 01:05:17 2014 +0100

    don't call configure_io() for merely swapping panners

commit d32a4c51f6967f48f7680554866f1f7b311ccde1
Merge: a3226d4 cec3116
Author: Robin Gareus <robin@gareus.org>
Date:   Mon Jan 6 23:49:55 2014 +0100

    Merge branch 'master' into panning

commit a3226d46b598afae54a65ac69320eca84669f347
Author: Robin Gareus <robin@gareus.org>
Date:   Mon Jan 6 17:52:38 2014 +0100

    add notes about panner re-design

commit d1ae2366024605f22b05572a81ee249e6fdbcd2f
Author: Robin Gareus <robin@gareus.org>
Date:   Mon Jan 6 15:06:40 2014 +0100

    add simple stereo-balance panner for testing

commit e0ddd256ff2288b8d8cfad3ad485a916964ce5b5
Author: Robin Gareus <robin@gareus.org>
Date:   Mon Jan 6 17:02:52 2014 +0100

    add frontend/GUI for panner selection

commit 2cb8f846755eb5aea8a2620d31ea981c446c4041
Author: Robin Gareus <robin@gareus.org>
Date:   Mon Jan 6 17:02:20 2014 +0100

    prepare backend for panner selection
2014-01-09 00:18:45 +01:00
Robin Gareus
0acafa4d3d add K12/RMS meter type 2013-12-22 09:25:33 +01:00
John Emmas
300b484cf6 Merge branch 'master' into windows+cc
Conflicts (hopefully resolved):
	gtk2_ardour/ardour_ui.cc
	gtk2_ardour/ardour_ui.h
	gtk2_ardour/ardour_ui_options.cc
2013-10-06 11:56:03 +01:00
Paul Davis
20fa19e69e more excision of "JACK" from labels, menu items, etc.
NOTE: users will lose the sample rate/latency display in the status bar display. Not yet sure what to do about this
2013-09-17 22:25:21 -04:00
Paul Davis
6a436fd826 fix merge conflict from master 2013-07-31 20:11:15 -04:00
Robin Gareus
06e7ad67ae restore session backwards compatibility to 3.3 2013-07-22 19:59:24 +02:00
Robin Gareus
708edd5866 implement new meter types 2013-07-22 18:45:08 +02:00
Robin Gareus
72aa1cd86c Revert "Revert new meter types (postponed until after 3.3 release)"
This reverts commit d80f672e84.
2013-07-22 18:42:01 +02:00
Paul Davis
650964f320 Merge branch 'master' into windows 2013-07-17 08:05:59 -04:00
Robin Gareus
d80f672e84 Revert new meter types (postponed until after 3.3 release)
This reverts commit ce621d1c8a.
This reverts commit 80aa257481.
2013-07-15 16:07:37 +02:00
Robin Gareus
80aa257481 add VU and IEC meter DSP (from jmeters) 2013-07-15 15:04:36 +02:00
Robin Gareus
9b1d7fd2f7 simplify meter-type context menu
in preparation for adding more meter-types
2013-07-15 15:04:32 +02:00
Robin Gareus
6908ad1053 move ardour meter globals into dedicated namespace (TODO meter_patters typedef) 2013-07-15 15:04:20 +02:00
Paul Davis
c08b336292 Fix ambiguous type CheckMenuItem that is also defined via windows.h 2013-07-11 15:32:31 -04:00
Robin Gareus
2b53ac2e31 amend cb7bcb6d - locked-solo button style 2013-07-11 02:31:30 +02:00
Robin Gareus
cb7bcb6d9f replace Lock^Wshopping-bag icon with button-sensitivity 2013-07-11 01:59:26 +02:00
Robin Gareus
56a4e2ee15 update mixer-meter (width) and panner if channel count changes 2013-07-11 00:14:27 +02:00
Robin Gareus
fc367f9b21 save width of mixer-strip when changing _all_ strips 2013-07-10 21:40:42 +02:00
Robin Gareus
f43aa995a8 slimming diet for the narrow-mixer strip 2013-07-10 17:13:55 +02:00
Robin Gareus
0571e5d6ae Revert "show track-ID in mixer" and "...towards unique track numbers."
This reverts commits:
  ca54ea2b462869bfd9254a493d073ca1e9ad4b8e.
  9e87e058e26b87013e89ddf5d3b7358d50024d60.
2013-07-10 15:27:17 +02:00
Robin Gareus
46c1e573c4 show track-ID in mixer 2013-07-10 15:27:15 +02:00
Robin Gareus
12780e4c8c add convenience functions to switch meter-types.. (maybe too much?!) 2013-07-10 15:27:13 +02:00
Robin Gareus
ffbc1c7a8b with RMS meters: use "peak indicator" as DPM 2013-07-10 15:27:13 +02:00
Robin Gareus
5dae93e5ea ignore state-changes during [meter] context-menu popup (gtkmm bug?) 2013-07-10 15:27:13 +02:00
Robin Gareus
5de0aee287 share meter-type among meter instances. 2013-07-10 15:27:13 +02:00
Robin Gareus
3a8f5a9770 remember meter type with session 2013-07-10 15:27:13 +02:00
Robin Gareus
2b9ee3b0f4 fix caching of Audio+Midi metrics
MIDI track meters can either be MIDI-only or Audio+MIDI
previously they used the same ID for gain-meter static
image cache.
2013-06-23 14:23:47 +02:00
Paul Davis
3973ce81b3 remove all of Gtk::Window::set_position (WIN_POS_MOUSE) for anything deriving from ArdourDialog or ArdourWindow; move the set_position() call into those classes' constructors, so that they are called before the windows are realized, and thus it actually works 2013-05-02 18:13:35 -04:00
Paul Davis
626dbf8abb fix problem with display of panner when adding instrument to a MIDI track
git-svn-id: svn://localhost/ardour2/branches/3.0@14177 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-07 19:35:10 +00:00
Paul Davis
627a99034a fix labels and time-of-labelling for iso+lock buttons in mixer strip
git-svn-id: svn://localhost/ardour2/branches/3.0@13993 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-24 21:57:28 +00:00
Paul Davis
2debe51993 more cleanup of crazy (?) stuff regarding gain display and peak display in GainMeter/MixerStrips
git-svn-id: svn://localhost/ardour2/branches/3.0@13960 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-21 22:27:39 +00:00
Paul Davis
dabd5bd174 fix/revert/modify changes from 13617 that hide the gain + peak display from a generic GainMeter; name import dialog preview fader (fixes 5288)
git-svn-id: svn://localhost/ardour2/branches/3.0@13947 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-21 14:24:57 +00:00
Robin Gareus
e40a8b384b narrow-mixer strip tweak:
make rec-enable and iso/lock buttons
vertically align with I/O and M/S buttons.

git-svn-id: svn://localhost/ardour2/branches/3.0@13835 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-12 03:22:29 +00:00
Paul Davis
d89f209f4a tentative redesign of MIDI looping, will probably fix #5050 but needs more extensive testing; remove several unused parameter names
git-svn-id: svn://localhost/ardour2/branches/3.0@13810 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-08 21:36:42 +00:00
Ben Loftis
4747313261 crash fix. looks like narrow mixer strips need more work again
git-svn-id: svn://localhost/ardour2/branches/3.0@13618 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-07 23:34:55 +00:00
Ben Loftis
5249f82603 more theming and layout tweaks. new faders that pre-light. fixed some spacing around mixer buttons. tweaked some colors (returned mutes to yellow). removed group button at bottom of mixer strip and replaced it with fader automation mode.
git-svn-id: svn://localhost/ardour2/branches/3.0@13617 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-07 22:38:49 +00:00
Ben Loftis
92e5a13fd4 several theme changes. changed drawing of rounded_rectangle to be more correct. operation and feel should be more consistent. rec-mute-solo buttons are now dull until enabled. this might be debatable. otherwise if it looks weird, try loading Window->Theme Manager and clicking Restore Defaults
git-svn-id: svn://localhost/ardour2/branches/3.0@13611 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-06 20:48:44 +00:00
Paul Davis
12fadcc43e try another fix for the crash created by rev 13547
git-svn-id: svn://localhost/ardour2/branches/3.0@13554 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-27 13:21:21 +00:00
Paul Davis
c36b0e661d avoid crash caused by referencing non-existent route in mixer strip button name setting
git-svn-id: svn://localhost/ardour2/branches/3.0@13553 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-27 13:07:43 +00:00
Paul Davis
14f11a9e63 some tweaks to make narrow mixer strips actually narrow
git-svn-id: svn://localhost/ardour2/branches/3.0@13547 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-26 22:05:45 +00:00
Robin Gareus
0e2396cd78 markup-escape track/playlist titles in tooltips.
git-svn-id: svn://localhost/ardour2/branches/3.0@13530 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-19 16:18:03 +00:00
Paul Davis
3fa84d0caa add alt-i as a binding in both the editor and mixer windows to toggle the state of MIDI input on the selected track(s); in the mixer this will also operate on the strip under the mouse. fixes #4838
git-svn-id: svn://localhost/ardour2/branches/3.0@13475 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-13 02:19:04 +00:00
Paul Davis
2d9ed69fe2 change input/output button context menus for mixer strip to be non-additive: when selecting a new IO bundle, disconnect from any existing connections before connecting to the new one (fixes #5087)
git-svn-id: svn://localhost/ardour2/branches/3.0@13308 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-10-18 16:15:11 +00:00
Paul Davis
de835047d9 force I/O selector windows to stay-on-top (experimental)
git-svn-id: svn://localhost/ardour2/branches/3.0@13034 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-11 20:14:53 +00:00
Carl Hetherington
d57be75d1a Fix logic for setting mixer strip name button widths (#4448).
git-svn-id: svn://localhost/ardour2/branches/3.0@12778 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-19 13:23:48 +00:00
David Robillard
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
David Robillard
27a1cf2cf7 Compile cleanly with clang.
To compile Ardour with LLVM/clang, do the usual thing but set the CXX and CC
environment variables, e.g.:

CC=/usr/bin/clang CXX=/usr/bin/clang++ ./waf configure build


git-svn-id: svn://localhost/ardour2/branches/3.0@12418 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 02:54:10 +00:00
Paul Davis
ec1ef5d6b5 remove the apparently unnecessary "ui_bind()" macro from entire source base
git-svn-id: svn://localhost/ardour2/branches/3.0@12088 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-25 12:58:19 +00:00
Carl Hetherington
23973bae24 A few tweaks to make Ardour build in GCC -std=c++0x mode.
git-svn-id: svn://localhost/ardour2/branches/3.0@11983 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-15 19:28:44 +00:00