Commit graph

14567 commits

Author SHA1 Message Date
Paul Davis
9c24d10862 Merge branch 'master' into ardour-merge
Conflicts:
	gtk2_ardour/editor.cc
	gtk2_ardour/editor_mouse.cc
	gtk2_ardour/public_editor.h
	gtk2_ardour/time_axis_view_item.cc
	gtk2_ardour/time_axis_view_item.h
2014-08-28 10:58:49 -04:00
nikolay
b40a491a9a [Summary] Change text color in Mixer Strip
[Reviewed] GZharun
2014-08-28 16:47:34 +03:00
nikolay
055a841787 [Summary] Enable change track name when track is not recording
[Reviewed] GZharun
2014-08-28 16:46:59 +03:00
nikolay
267a628b96 [Summary] Delete old INFO panel upon the TOP BAR
[Reviewed] GZharun
2014-08-28 16:45:54 +03:00
nikolay
97cadeae33 [Summary] Start recording on record button press
[Reviewed] GZharun
2014-08-28 16:43:12 +03:00
GZharun
6009b609f6 [Summary] Simplified device information retrieving. Previous complicity was related to previous workflow which has nothing to do with current workflow. 2014-08-28 10:47:01 +03:00
GZharun
c9c7a0961a [Summary] Reworked region view according to the PRD
[Details] Note: the code is promoted ahead without some cosmetic stuff
What is not finished: 1. Move rec color and name highlight color to the config.
2. Make region name displayed above the wave.
2014-08-28 10:20:21 +03:00
Paul Davis
8b0d7a173f extend replication support to provide (a) global enable/disable (b) per-track replication path (c) arbitrary numbers of replication locations 2014-08-27 18:45:50 -04:00
Paul Davis
306e57d92b basically functioning replicated recording 2014-08-27 15:38:46 -04:00
Paul Davis
66e7186a01 continuing work on replicated recording paths and sources 2014-08-27 14:52:50 -04:00
Paul Davis
e80ff9b723 some missing conflict resolution from most recent merge with master 2014-08-27 14:09:15 -04:00
Paul Davis
18a9bd459a basic support for replicated sources, part two 2014-08-27 13:48:04 -04:00
Paul Davis
595585d84f initial additions for Diskstream-level replication path 2014-08-27 13:16:39 -04: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
b061a56c21 [Summary] Made master added to the beginning of older session which do not have this track 2014-08-27 18:56:34 +03:00
nikolay
df67b26bfb [Summary] New icons 2014-08-27 17:25:13 +03:00
nikolay
47142ef74d [Summary] Change in MeterStips name
[Reviewed] GZharun
2014-08-27 11:38:35 +03:00
VKamyshniy
5a885ba3a4 [Summary] Changing path which is opened by MEDIA button 2014-08-27 10:37:50 +03:00
VKamyshniy
c804fd079d [Summary] Applying new splash images 2014-08-26 17:41:34 +03:00
VKamyshniy
c381c67f1c [Summary] Adding touch cursor to the mono panner. 2014-08-26 17:41:34 +03:00
VKamyshniy
9124eaec6a [Summary] Adding deletion of _touch_cursor into the destructor 2014-08-26 17:41:33 +03:00
VKamyshniy
abb85e0c1b [Summary] Applying new icons 2014-08-26 17:41:32 +03:00
nikolay
d6687d8ff5 [Summary] Implemented functionality for buttons in top bar
[Reviewed] GZharun
2014-08-26 17:10:45 +03:00
nikolay
f56ccdb00e [Summary] Updated hard disk usage calculation
[Reviewed] GZharun
2014-08-26 17:09:33 +03:00
VKamyshniy
0180909a38 [Summary] Implementing touch cursor for faders. 2014-08-26 17:05:50 +03:00
Valeriy Kamyshniy
aa44a0e796 [Summary] Adding action, applied to MEDIA button (for MACOS) 2014-08-26 13:42:59 +03:00
VKamyshniy
ea4a1948a4 [Summary] Implementing action, applied to MEDIA button 2014-08-26 12:23:39 +03:00
GZharun
799f053eed [Summary] Unleashed control_event_box height. Now it depends on the amount of tracks.
Defined height value caused issue that you were not able to DnD tracks which exceed this value.
2014-08-24 17:18:08 +03:00
VKamyshniy
e60c12964d [Summary] Pixel hunting 2014-08-23 16:42:01 +03:00
VKamyshniy
d20e190c47 [Summary] Hiding the compact meter bridge when showing the meter bridge view 2014-08-23 16:41:30 +03:00
VKamyshniy
0c66ac0e58 [Summary] Making the panner vertical movement driven 2014-08-23 16:40:37 +03:00
GZharun
dd9d40a4db [Summary] Removed redundant and sometimes harmful actions from DnD reordering algorithm. 2014-08-22 17:59:50 +03:00
Greg Zharun
bb5c74fa62 [Summary] Resolved DnD and track selection conflict on mouse button one release, refactored some tracks selection usecases according to PRD 2014-08-22 14:51:04 +03:00
Greg Zharun
78319da918 [Summary] Fixed bug with uninitialized class member 2014-08-21 18:40:52 +03:00
GZharun
a8f7e0c053 [Summary] Improved reordering algorithm triggered by DnD, fixed bugs 2014-08-21 17:53:31 +03:00
GZharun
4d9d7b933e [Summary] Resolved conflicts of track header DnD with other operations 2014-08-21 17:41:34 +03:00
Greg Zharun
e8be86537f [Summary] Added flag to indicate DnD operation is in progress 2014-08-21 14:46:58 +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
nikolay
1ed4ea684b [Summary] Fix bug with master's color
[Reviewed] GZharun
2014-08-21 12:19:25 +03:00
GZharun
3d185858ff [Summary] Fixed issue in tracks_control_panel: device playback control was removed for wrong list during cleanup 2014-08-21 12:15:24 +03:00
nikolay
2c4f8e3314 [Summary] Hot fix 2014-08-20 14:47:14 +03:00
nikolay
c84f46fe68 [Summary] Show HD usage and remained time. Pixel hunting.
[Reviewed] GZharun
2014-08-20 14:10:16 +03:00
nikolay
8a6be6cb75 [Summary] Changed max name size in the meter strips
[Reviewed] GZharun
2014-08-20 14:09:03 +03:00
nikolay
0f59999c43 [Summary] Changed default color for new added tracks and for master
[Reviewed] GZharun
2014-08-20 14:07:58 +03:00
nikolay
98e80b2ae3 [Summary] Change color of the meter strips
[Reviewed] GZharun
2014-08-20 14:07:02 +03:00
nikolay
c30b45606f [Summary] Increase NormalHeight of the TrackHeader
[Reviewed] GZharun
2014-08-20 14:06:13 +03:00
VKamyshniy
7d16a041da [Summary] Changing pixels per found bug. 2014-08-20 12:06:14 +03:00
VKamyshniy
0011645b7c [Summary] Removing mockap pixels 2014-08-20 11:33:39 +03:00
Paul Davis
0c123205d6 continue tweaks to get packing correct now that there is only 1 canvas 2014-08-19 14:31:05 -04:00