smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-21 06:06:25 +01:00
Code Issues Projects Releases Wiki Activity
13526 commits 102 branches 145 tags 313 MiB
Commit graph

261 commits

Author SHA1 Message Date
nikolay
229f5a34ef [Summary] Fix bug in Track Header. In the past Shift+Click set SoloButton in Solo Save Mode. Now Ctrl+Click set Solo Button in Solo Save Mode (according to PRD). 
[Review] Nobody
 2014-07-22 11:56:06 +03:00
VKamyshniy
c666cd922f [Summary] Fixing the following bugs: 
- INSPECTOR's Mixer Strip should be "NO SELF DESTRUCT"
- When a RouteUI object is non-self-destruct, it should "reset ()" instead of "delete this";
 2014-07-20 22:25:23 +03:00
nikolay
be0d2210cc [Summary] Delete context menu in Track Header and Inspector 
[Review] GZharun
 2014-07-18 12:41:58 +03:00
VKamyshniy
596e3b9140 [Summary] Progressing MASTER UI and occasional cleanup 2014-07-16 00:12:14 +03:00
VKamyshniy
c171f328a2 [Summary] Implementing TRACK Header and Inspector UI 2014-07-08 14:57:47 +03:00
VKamyshniy
9958f084e5 [Summary] Implementing TRACK Header and INSPECTOR UI 2014-07-08 12:12:12 +03:00
VKamyshniy
72ea39fe5a [Summary] Implementing Color selection in the inspector 2014-07-08 01:03:46 +03:00
VKamyshniy
6e3cdd4023 [Summary[Summary] Implementing TRACK Header UI 2014-07-07 15:16:34 +03:00
VKamyshniy
3833e3b627 Merge branch 'master' of git.waves.com:waves/tracks 2014-07-04 18:04:39 +03:00
Grygorii Zharun
ce2a519afa [Summary] Merging from GIT 
[Details] Starting point:
Mar 24 2014, 11:47 PM
Commit: 87184ab80d

Target point:
Commit: 59e6694405
Apr 16 2014, 4:01 PM

[git-p4: depot-paths = "//Abdaw/dev_main/tracks/": change = 453690]
 2014-04-18 04:21:54 -05:00
Valeriy Kamyshniy
a26f056cdd [P4/git history rebuild] Remove use of Stock:: item (NOTE: this is a highly questionable edit) 2014-05-27 21:31:04 -04:00
Paul Davis
49d9397770 manually apply d697a31abf from master (git could not apply cleanly) 2014-02-19 23:44:53 -05:00
Paul Davis
a0abf608d6 replace a few creeping instances of the string "Ardour" with PROGRAM_NAME 2014-02-10 10:53:01 -05:00
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
nick_m
5b62e88fbf Unify editor / mixer ordering. 2013-10-21 00:19:43 +11:00
Paul Davis
bb826f4bee incomplete merge of master into windows (requires upcoming changes to master to be complete) 2013-09-12 11:28:50 -04:00
Paul Davis
616f2a0370 fix conflicts after merge with master 2013-08-05 14:22:32 -04:00
Paul Davis
6a436fd826 fix merge conflict from master 2013-07-31 20:11:15 -04:00
Paul Davis
fbfa0acebe remove compile errors (still will not link and JACKPortEngine is not close to done) 2013-07-30 23:26:46 -04:00
Robin Gareus
9b091a52cb clean up 44fc92c3 (not a threading issue but sigc++ problem) 
RouteUI is not sigc::trackable itself (only derived classes are)
RouteUI::~RouteUI() does not disconnect from signals on destruction.
 2013-07-30 17:54:52 +02:00
Robin Gareus
44fc92c33d disconnect AuxSend connection when deleting bus 
fixes crash:
 - add bus
 - aux-send a signal to that bus
 - delete bus
 - add another bus
 - aux-send a signal to "another bus"
 - click "Aux Send" button on "another bus"
 - crash
 2013-07-30 15:12:32 +02:00
Robin Gareus
8013160eb3 meterbridge metrics update: 
* display metrics for every used meter-type
* show metrics between meters with differnet types
* update text and label alignment for meterbridge
* fix crash when deleting metrics-strip (zero route)
* clean up metric pattern code (use float for dBFS)
 2013-07-23 13:30:23 +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
ffc9a2cc70 Revert "replace "-inf" with UTF8 infinity symbol" 
This reverts commit 7f2000ec8b0d6e0d3a6e22db44a8859301d35791.
 2013-07-10 15:27:16 +02:00
Robin Gareus
c3a6b94090 hide solo button on master-bus 2013-07-10 15:27:16 +02:00
Robin Gareus
0f1f7ca4fd replace "-inf" with UTF8 infinity symbol 2013-07-10 15:27:16 +02:00
Robin Gareus
08167d6ac4 overhaul meterbridge metrics part one. 2013-07-10 15:27:04 +02:00
Paul Davis
7dd6b4c915 more consistency for mute/solo/rec-enable press including making ctrl-click work even if the route is not part of a group 
git-svn-id: svn://localhost/ardour2/branches/3.0@14054 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2013-02-05 21:39:38 +00:00
Paul Davis
2398b955c3 fix (1) lack of mute on master (2) lack of route-group driven behaviour for PRIMARY-click on mute button 
git-svn-id: svn://localhost/ardour2/branches/3.0@14049 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2013-02-05 18:16:10 +00:00
Robin Gareus
35cbfc9c0a improve international understanding. 
git-svn-id: svn://localhost/ardour2/branches/3.0@13787 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2013-01-05 13:29:55 +00:00
Paul Davis
4481cca74a do not start editing track/bus names on a single click in the name entry of the track header - require double click; show name label rather than name entry when rec-enabled, to allow using the name area for track selection (name entry would have been visually still available for editing, which is misleading 
git-svn-id: svn://localhost/ardour2/branches/3.0@13738 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-12-27 14:08:38 +00:00
Paul Davis
3b8b088bd8 finish recent revert 
git-svn-id: svn://localhost/ardour2/branches/3.0@13737 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-12-27 00:57:39 +00:00
Paul Davis
728374810d revert previous change- semantic confusion 
git-svn-id: svn://localhost/ardour2/branches/3.0@13736 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-12-26 23:49:34 +00:00
Paul Davis
d1c6e8b6d8 if route group shares color, make RouteUI::set_color() affect the group 
git-svn-id: svn://localhost/ardour2/branches/3.0@13735 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-12-26 23:35:31 +00:00
Paul Davis
6e337459a9 add a new Tweak to ArdourButton that makes ImplicitActive state use a solid color (the "led active" color), and adjst rec-enable buttons to use pink (like ardour2) when in this state (which means rec-enabled but not recording). and yes, this means that you can't use ImplicitUsesSolidColor with a button that also uses an LED - acceptable limitation 
git-svn-id: svn://localhost/ardour2/branches/3.0@13645 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-12-12 02:22:12 +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
0b55529ec4 tweak display of remote control id (dialog text) 
git-svn-id: svn://localhost/ardour2/branches/3.0@13541 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-11-21 19:54:52 +00:00
Paul Davis
11415b49be first pass at the big rethink of managing sort order keys for editor and mixer. this appears to work, but remote control IDs are not yet correct (frequently off by one because of the presence of the master bus in the editor) 
git-svn-id: svn://localhost/ardour2/branches/3.0@12953 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-27 22:57:06 +00:00
Paul Davis
97d920593f drastic rethink of the relationship between remote control ID and route order keys. unless the user explicitly switches to UserOrdered, Route::_remote_control_id is an unallocated pointer, and Route::remote_control_id() simply returns a value based on the relevant order_key() value. Also, change the key used in the Route::order_keys std::map<> from a string to an enum, since there is no evidence that we are benefitting from the theoretical benefit of using a string. Generally tidy up allocation of order keys so that the master and monitor busses always get a "special" MixerSort key value, based on the MMC ID for master (already defined within Ardour), and all other tracks/busses start at zero. Syncing keys between editor and mixer will leave the MixerSort key for the master and monitor bus alone, reflecting the fact that we display these in their own distinct parts of the GUI and they are not orderable like other tracks or busses within the mixer window 
git-svn-id: svn://localhost/ardour2/branches/3.0@12923 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-25 12:46:13 +00:00
Tim Mayberry
306e6475e5 Replace use of PBD::sys::path in ardour/template_utils.h 
some associated changes from not including pbd/filesystem.h in template_utils.h

git-svn-id: svn://localhost/ardour2/branches/3.0@12833 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-23 05:07:05 +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
ca993f56d6 make solo lock/safe button only respond to mouse button1 (#4691) 
git-svn-id: svn://localhost/ardour2/branches/3.0@12354 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-21 10:10:26 +00:00
Paul Davis
4235e9a1a2 a variety of mostly unused parameter errors from OS X Lion's compiler 
git-svn-id: svn://localhost/ardour2/branches/3.0@12148 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-02 20:29:46 +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
f8b570db5e Show the number of channels in brackets when there is a single invert button for multiple channels, as suggested by colinf (#4699). 
git-svn-id: svn://localhost/ardour2/branches/3.0@11598 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-03-05 22:06:16 +00:00
Carl Hetherington
8fca7c840d If there is one invert button for many channels, always use a menu; in this case, also partially light the invert button if only a subset of channels are inverted (#4699). 
git-svn-id: svn://localhost/ardour2/branches/3.0@11593 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-03-05 01:16:50 +00:00
Paul Davis
b08d13706f remove additional "mid" color from ArdourButton; replace Active/Mid widget state with ExplicitActive/ImplicitActive; represent implicit-active state with colored border around ArdourButton; tune button colors; new rounded_foo() functions, some in use, some not in use right now 
git-svn-id: svn://localhost/ardour2/branches/3.0@11466 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-02-07 17:43:55 +00:00
Paul Davis
5e92f14dc5 make rec-enable click while step-editing exit step-editing mode... d'uh! 
git-svn-id: svn://localhost/ardour2/branches/3.0@11442 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-02-03 21:02:18 +00:00
Paul Davis
b34e9155db remove apparently vestigial code from RouteUI::update_solo_display() that really could not/should not possibly have any effect because solo_button->set_active_state() is called unconditionally later in the function 
git-svn-id: svn://localhost/ardour2/branches/3.0@11382 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-01-29 18:45:20 +00:00