smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-01 11:27:45 +01:00
Code Issues Projects Releases Wiki Activity
15059 commits 103 branches 145 tags 318 MiB
Commit graph

130 commits

Author SHA1 Message Date
GZharun
a522463603 [Summary] Solution for the issue when ordinals on some tracks are higher then should be after track deletion 2014-09-29 12:58:07 +03:00
Paul Davis
33c2baa462 Merge branch 'master' into ardour-merge 
Conflicts:
	gtk2_ardour/time_axis_view_item.cc
 2014-09-03 14:55:10 -04:00
GZharun
9b42141bd2 [Summary] Fixed DnD issue, when master track could change position 2014-09-03 19:25:44 +03:00
Paul Davis
31d500e3a9 Merge branch 'master' into ardour-merge 
Conflicts:
	gtk2_ardour/ardour_ui.cc
	gtk2_ardour/ardour_ui2.cc
	gtk2_ardour/editor.cc
	gtk2_ardour/mixer_strip.cc
	gtk2_ardour/route_time_axis.cc
	gtk2_ardour/route_ui.h
	gtk2_ardour/ui/audio_time_axis.xml
	gtk2_ardour/ui/editor_mixer.xml
	gtk2_ardour/ui/meter_strip.xml
	gtk2_ardour/waves_button.cc
	gtk2_ardour/waves_button.h
	gtk2_ardour/waves_zoom_control.cc
	gtk2_ardour/waves_zoom_control.h
 2014-08-27 12:38:27 -04:00
GZharun
dd9d40a4db [Summary] Removed redundant and sometimes harmful actions from DnD reordering algorithm. 2014-08-22 17:59:50 +03:00
GZharun
a8f7e0c053 [Summary] Improved reordering algorithm triggered by DnD, fixed bugs 2014-08-21 17:53:31 +03:00
GZharun
a1844529e0 [Summary] Fix of mingw compiletion error 2014-08-21 12:40:03 +03:00
GZharun
2a5f669c45 [Summary] DnD for track headers in editor, version 1.0 
[Details] Track headers became reorder able by DnD
 2014-08-21 12:22:53 +03:00
GZharun
1f243fd0d6 [Summary] Removed unused code 2014-08-18 18:43:55 -04:00
GZharun
c94a36a980 [Summary] Fixed build 2014-08-18 18:43:50 -04:00
GZharun
68e9ae383b [Summary] Removed unused code 2014-08-18 16:15:42 -04:00
GZharun
fbbac3277d [Summary] Fixed build 2014-08-18 16:15:38 -04:00
Robin Gareus
94632100a6 suspend route redisplay for (rec-en, solo, mute and monitor) batch changes 
Conflicts:
	gtk2_ardour/ardour_ui.cc
	gtk2_ardour/route_ui.cc
 2014-08-17 19:56:45 -04:00
Robin Gareus
a17616f1da move utility functions into a dedicated namespace 
Conflicts:
	gtk2_ardour/about.cc
	gtk2_ardour/editor_ops.cc
 2014-08-17 18:51:22 -04:00
Paul Davis
2219436888 clean up un-fixed merge conflict 2014-08-17 17:38:48 -04:00
Paul Davis
2987e8ba8b fix some confusion when redrawing editor/mixer track/strip displays after track/bus deletion 
The code relied on the idea that the order-key resync that occurs after deletion would change the order keys and thus cause
a redisplay. But since both the editor and mixer can initiate an order-key resync, the other window's resync will actually
do nothing (the order keys will already be correct). This led to the incorrect placement of material in the tracks canvas,
because the first resync triggered a redisplay while the route still existed, and then the second resync didn't cause a
redisplay (repositioning) but the canvas elements representing the track went away.

Fixed by forcing a redisplay in both editor and mixer if a route deletion is believed to be triggering a row deletion
in their underlying data models.

Conflicts:
	gtk2_ardour/editor_routes.cc
 2014-08-17 16:39:01 -04:00
Paul Davis
207bbbb395 fix some confusion when redrawing editor/mixer track/strip displays after track/bus deletion 
The code relied on the idea that the order-key resync that occurs after deletion would change the order keys and thus cause
a redisplay. But since both the editor and mixer can initiate an order-key resync, the other window's resync will actually
do nothing (the order keys will already be correct). This led to the incorrect placement of material in the tracks canvas,
because the first resync triggered a redisplay while the route still existed, and then the second resync didn't cause a
redisplay (repositioning) but the canvas elements representing the track went away.

Fixed by forcing a redisplay in both editor and mixer if a route deletion is believed to be triggering a row deletion
in their underlying data models.

Conflicts:
	gtk2_ardour/editor_routes.cc
	gtk2_ardour/editor_routes.h
 2014-08-17 16:29:16 -04:00
GZharun
d2135c25a8 [SUMMARY] Changed track numbering and hided number for master track 2014-08-13 13:49:08 +03:00
GZharun
c61558b761 [Summary] Implemented correct behavior for Master Track in tracks list 
[Details] Removed context menu item "Remove" for master track
Made master track unmovable in any case
 2014-08-08 15:52:10 +03:00
GZharun
de017b4662 Revert "[Summary] Made master bus shown and placed as the first item" 
This reverts commit c565bb580791138621b3738244c34781b05e7bfd.
 2014-08-06 11:09:32 +03:00
GZharun
c40b8bc1a3 [Summary] Made master bus shown and placed as the first item 2014-08-05 17:26:09 +03:00
VKamyshniy
596e3b9140 [Summary] Progressing MASTER UI and occasional cleanup 2014-07-16 00:12:14 +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
Grygorii Zharun
78196e1c17 [Summary] Master bus should be always hidden in main view of Tracks 
[git-p4: depot-paths = "//Abdaw/dev_main/tracks/": change = 452980]
 2014-04-16 04:40:35 -05:00
Paul Davis
ea1ccb869a fix merge with master 2013-10-31 13:16:51 -04:00
Paul Davis
7ce86cec7d handle enter/leave items when zooming and scrolling occur 2013-10-31 03:10:18 -04:00
nick_m
be69bf15dd New routes are placed after highest selected route. 2013-10-24 01:27:13 +11:00
Paul Davis
664e715a00 merge from master 2013-10-22 15:29:44 -04:00
nick_m
5b62e88fbf Unify editor / mixer ordering. 2013-10-21 00:19:43 +11:00
Paul Davis
525cb6b4a7 some sort-of-deep fixes to get autoscroll/vertical scroll to work properly for cairocanvas 2013-07-10 19:10:06 -04:00
Paul Davis
4e9108cd1e remove TimeAxisView::clip_to_viewport() and Editor::update_canvas_now() and Editor::flush_canvas() which should no longer be necessary with a sane canvas design 2013-04-12 18:01:44 -04:00
Paul Davis
19bd641915 commit immediately post linking 2013-04-04 18:45:27 -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
851a392495 likely fix for #5426 (hide all tracks doesn't work and causes inconsistent state 2013-04-01 19:56:33 -04:00
Paul Davis
076d919ac3 fix crash when pressing "s" with kbd focus in editor route list 
git-svn-id: svn://localhost/ardour2/branches/3.0@14055 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2013-02-06 14:38:13 +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
Paul Davis
89d1a2fdf5 dramatically speed up the addition of large numbers of busses + tracks. consists of a backend part (ignore JACK graph/latency callbacks while we're adding tracks) and a GUI side (avoid O(N^N) behaviour while adding each new time axis view) 
git-svn-id: svn://localhost/ardour2/branches/3.0@13595 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-12-04 14:32:28 +00:00
Paul Davis
f750aa3207 fix serious logic error in re-ordering treeviews after route order keys/RIDs change - fixes major memory corruption bug that overwrote random memory as soon as a track gets deleted and/or user-defined remote IDs are in use 
git-svn-id: svn://localhost/ardour2/branches/3.0@13355 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-10-27 00:15:45 +00:00
Paul Davis
4f77bf201e make more or less all LHS treeviews use the same style 
git-svn-id: svn://localhost/ardour2/branches/3.0@13056 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-07-20 01:47:27 +00:00
Paul Davis
e43d91949b more work on RID and editor/mixer order matching; when a track/bus is hidden in the GUI controlling RID, it gets a extremely large RID to prevent it showing up on a control surface (but ... for now ... is still visible in the other GUI, even if "sync order between mixer + editor" is enabled); change font in editor route list 
git-svn-id: svn://localhost/ardour2/branches/3.0@13054 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-07-19 22:35:43 +00:00
Paul Davis
7db500301d further efforts at cleaning up the design of the interaction/relationship between route sort order keys and remote control IDs 
git-svn-id: svn://localhost/ardour2/branches/3.0@12962 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-28 22:27:37 +00:00
Paul Davis
958c63bd18 minor cleanups from 12952 
git-svn-id: svn://localhost/ardour2/branches/3.0@12956 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-28 14:32:26 +00:00
Paul Davis
f46a7bc509 reorder #includes to avoid the usual Apple BS with un-namespaced typenames like Style 
git-svn-id: svn://localhost/ardour2/branches/3.0@12954 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-28 02:11:26 +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
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
Paul Davis
2b7d17e904 reorder editor route list columns to put visible and active first (from joern) 
git-svn-id: svn://localhost/ardour2/branches/3.0@11732 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-03-20 17:08:07 +00:00
Paul Davis
c52c2b7368 forward-port some fixes from a2 
git-svn-id: svn://localhost/ardour2/branches/3.0@11630 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-03-09 17:15:25 +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
946dc070f8 add monitoring column to route group list; make click in blank area of route list and route group list cancel selection and/or name editing 
git-svn-id: svn://localhost/ardour2/branches/3.0@10911 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-12-06 16:46:50 +00:00