Commit graph

111 commits

Author SHA1 Message Date
Paul Davis
2b99520451 OS X specific cleanup after canvas ruler introduction 2014-08-17 15:07:56 -04:00
GZharun
7a410d5a45 [Summary] Refactored master ui according to requirements
[Details] Changed global MUTE button
Made Master UI selectable
Refactored "show master bus in the inspector" usecases
2014-08-13 10:43:03 +03:00
VKamyshniy
65035584c9 [Summary] Adding the TRACKs specific meter bridge view. 2014-08-11 12:56:58 +03:00
GZharun
408165bec4 [Summary] Implemented additional use case to show master bus in inspector.
[Details] Master bus must be shown in inspector when Master Track is selected in Stereo Out mode
2014-08-08 13:59:24 +03:00
GZharun
d1413f60a6 [Summary] Implemented use case to show and select master bus on MasterLevelMeter click 2014-08-05 16:18:08 +03:00
nikolay
d685afd90f [Summary] Implemented Master Mute, Clear Solo and Global Record in MasterUI
[Reviewed] GZharun
2014-08-05 13:17:02 +03:00
GZharun
6acabf15ce [Summary] Implemented master bus use cases for inspector track view
[Details] 1. Made master bus shownable in inspector when no track selected in StereoOut, StereoOut mode has just been enabled, or there is no tracks at all in StereoOut.
2. Made master bus hidden in MultiOut mode in any case.
2014-08-04 14:35:13 +03:00
VKamyshniy
0f3f0d0a4a [Summary] Implementing synchronously changed tracks/busses selection in the editor and embedded mixer bridge view. 2014-07-29 09:29:40 +03:00
VKamyshniy
f2251dd1c2 [Summary] Progressing UI 2014-07-28 11:06:02 +03:00
VKamyshniy
9c8bd78b5a [Summary] Switching from deriving from RouteUI to self-sufficient functioning. Adding peak reset function. Adding rmpty reactions on the clicked buttons "MASTER MUTE" , "CLEAR SOLO" and "GLOBAL REC" 2014-07-21 13:24:54 +03:00
VKamyshniy
a5caa2778b [Summary] Progressing TRACKS Meter Bridge (invented name = compact meter bridge) 2014-07-19 18:32:45 +03:00
VKamyshniy
596e3b9140 [Summary] Progressing MASTER UI and occasional cleanup 2014-07-16 00:12:14 +03:00
VKamyshniy
44dcd48be4 [Summary] Progressing MASTER UI 2014-07-15 00:44:46 +03:00
VKamyshniy
3833e3b627 Merge branch 'master' of git.waves.com:waves/tracks 2014-07-04 18:04:39 +03:00
Paul Davis
36c233fe6c Merge branch 'master' into cairocanvas 2014-01-07 21:37:48 -05:00
Robin Gareus
382eb0fc68 fix issue with editor-mixer:
* width+processor box display:
  - show editor-mixer
  - hide editor-mixer
  - select a different track or bus
  - show editor mixer
  -> width is wrong, processor may be displayed w/1px height
* no routes on initial display -> possible segfault
2014-01-08 03:29:06 +01:00
Paul Davis
ea1ccb869a fix merge with master 2013-10-31 13:16:51 -04:00
Paul Davis
1c2de76991 give those who insist on seeing the mixer window and/or editor mixer on stupidly small screens the chance to do so 2013-10-27 20:55:06 -04:00
Paul Davis
aaea166135 initial commit of hand merging, plus getting "ancient" waf script to work correctly 2013-04-04 00:32:52 -04:00
Paul Davis
cb55bd1a52 do not show the mixer window if the (current) screen height is < 700 pixels (since this results in a very, very irritating situation)
git-svn-id: svn://localhost/ardour2/branches/3.0@13635 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-11 01:17:23 +00:00
Paul Davis
bced4a466c make newly-added string translatable
git-svn-id: svn://localhost/ardour2/branches/3.0@13588 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-02 01:55:48 +00:00
Paul Davis
9e18a5d70a refuse to show the editor mixer is the screen is < 700 pixels high (makes the editor very hard to use)
git-svn-id: svn://localhost/ardour2/branches/3.0@13586 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-02 01:44:09 +00:00
Paul Davis
d23a6de077 fix for most (all? we can dream ...) issues involved in #4399 (editing multiply-applies operations to playlists used more than once), and as a side-issue, fix playlist selection which broke when we hid Diskstreams inside Tracks by using orig_track_id() rather than orig_diskstream_id()
git-svn-id: svn://localhost/ardour2/branches/3.0@10968 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-10 19:20:15 +00:00
Carl Hetherington
adfce3b762 Trim includes.
git-svn-id: svn://localhost/ardour2/branches/3.0@10666 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-18 00:04:49 +00:00
Paul Davis
e2757229a7 provide link-editor-and-mixer-selection option. gui implementation is slightly hacky because of the implicit endless loop that the link creates
git-svn-id: svn://localhost/ardour2/branches/3.0@10624 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-15 19:33:09 +00:00
David Robillard
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
4569f40a38 Prevent erroneous splitting icons in the editor mixer strip's processor box.
git-svn-id: svn://localhost/ardour2/branches/3.0@8816 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-10 02:44:56 +00:00
Carl Hetherington
8d29a1ce20 Remember editor mixer size setting across close and reopen. Fixes #3624.
git-svn-id: svn://localhost/ardour2/branches/3.0@8354 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-28 21:29:36 +00:00
David Robillard
8b68ed57ec Fix some messed up code (spacey tabs).
(There is faar more of this... FIX YOUR EDITORS!)


git-svn-id: svn://localhost/ardour2/branches/3.0@8086 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-25 20:37:39 +00:00
Paul Davis
b85b4d9e54 make ardour3 build and link on OS X (tiger, at least)
git-svn-id: svn://localhost/ardour2/branches/3.0@8018 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-13 05:14:48 +00:00
Paul Davis
c2e491b8fc version of 6997 from 2.x: if selecting an automation track, show its parent in the editor mixer strip, plus don't deselect a track when the editor mixer strip is hidden
git-svn-id: svn://localhost/ardour2/branches/3.0@7660 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-20 21:34:18 +00:00
Carl Hetherington
2c16f7aa7f Move a couple of methods into editor.cc, where they seem to be more at home than in editor_mixer.cc
git-svn-id: svn://localhost/ardour2/branches/3.0@6647 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 23:11:17 +00:00
Carl Hetherington
d73d3f3652 Restore old behaviour when updating the view when the playhead goes off it during roll.
git-svn-id: svn://localhost/ardour2/branches/3.0@6502 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-15 23:50:40 +00:00
Carl Hetherington
11bd4eed89 Allow multiple simulataneous Drags to be active, and hence set up and drag time ranges when moving regions in PT-edit mode.
git-svn-id: svn://localhost/ardour2/branches/3.0@6478 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-12 16:14:49 +00:00
Carl Hetherington
ea7cb51ed8 When moving around using nudge / move to next region etc., arrange the canvas so that the playhead is either a quarter of the way from the left (when moving right) or a quarter of the way from the right (when moving left).
git-svn-id: svn://localhost/ardour2/branches/3.0@6461 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-06 01:36:20 +00:00
Paul Davis
b6f4cdaea2 rationalize destruction pathway (some more); tidy-ify some ImageFrame code
git-svn-id: svn://localhost/ardour2/branches/3.0@6398 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-25 21:06:52 +00:00
Paul Davis
f53cbaede8 clean up editor mixer strip when session is going away; slightly improved boost debugging
git-svn-id: svn://localhost/ardour2/branches/3.0@6397 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-24 04:04:01 +00:00
Paul Davis
c83389b8ec cleanup up cleanup at session destruction; clarify the meaning of 3 signals (DropReferences & Destroyed in libardour ; CatchDeletion in the GTK UI); clarify ownership of objects (session no longer pays attention to DropReferences for objects that it is considered to own, such as routes, sources, etc); fix up MIDI parsing and a couple of other places by correcting syntax for return of values from a boost::signals2::signal (possible danger elsewhere to be checked)
git-svn-id: svn://localhost/ardour2/branches/3.0@6389 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-22 20:21:43 +00:00
Paul Davis
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
Paul Davis
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
Paul Davis
f6fdd8dcbf switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash
git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 18:24:23 +00:00
Paul Davis
64dc5427e4 make all use of bind/mem_fun be explicitly sigc::
git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-11 23:29:48 +00:00
Paul Davis
ff9ddf5100 tidy up (a bit) locations editing widget ; use pixbuf/string code from 2.0;remove edit point clock
git-svn-id: svn://localhost/ardour2/branches/3.0@6074 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-12 20:39:53 +00:00
Paul Davis
7857ec8b45 comments for BBT math methods; remove chunks from GUI; split location UI into a widget and a window; add the widget part to the editor RHS notebook. this is unfinished - it looks absurd. but its the starting point for a reworking of the location UI in its rightful place
git-svn-id: svn://localhost/ardour2/branches/3.0@6071 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-12 05:47:05 +00:00
David Robillard
c83e48e07a Trim session.h include dependency tree.
git-svn-id: svn://localhost/ardour2/branches/3.0@5979 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-30 15:30:22 +00:00
Carl Hetherington
0e601ee51a Always call set_width_enum after set_route on mixer strips, to ensure that width is correctly set to editor_mixer_strip_width (as set_route will probably call set_width_enum itself)
git-svn-id: svn://localhost/ardour2/branches/3.0@5810 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-19 19:20:48 +00:00
David Robillard
bb9cc45cd2 Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only.
Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red.  I don't know the emacs equivalent...


git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 16:10:01 +00:00
Carl Hetherington
402cc384ce Back out big shared_ptr change. Moving to a branch. Apologies all.
git-svn-id: svn://localhost/ardour2/branches/3.0@5343 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-09 17:58:13 +00:00
Carl Hetherington
4297071b3f Use shared_ptr for the TimeAxisView hierarchy.
git-svn-id: svn://localhost/ardour2/branches/3.0@5339 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-09 13:39:45 +00:00
Carl Hetherington
a3f7f86d9b Factor regions list out of Editor.
git-svn-id: svn://localhost/ardour2/branches/3.0@5312 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-03 22:42:22 +00:00