smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-23 23:17:46 +01:00
Code Issues Projects Releases Wiki Activity
14568 commits 103 branches 145 tags 315 MiB
Commit graph

224 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
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
Ben Loftis
9583faed27 xfade rects should only pop-up in Object mode, when they are focusable 2014-08-17 20:43:17 -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
28fdc71d70 more canvas refactoring. 
Remove Canvas::Layout, use Canvas::Container for the same purpose, move child-rendering into Item::render_children() so that it
could theoretically be used by any derived type.
 2014-08-17 17:44:17 -04:00
Paul Davis
3be5f658ea use newly factored canvas in gtk2_ardour 2014-08-17 17:43:03 -04:00
Paul Davis
08768cef90 ensure that all waveviews have ALL their colors set accurately before first render 
Avoids occasional bright red zero line drawn because the color(s) had not been reset correctly
 2014-08-17 16:28:11 -04:00
Paul Davis
4d4851cffc a whole slew of changes related to centralizing and rationalizing cursor management. 
Debugging output left in place to help address the reports that will come in as people test this more
 2014-08-17 16:23:52 -04:00
Paul Davis
9199b9fc6e remove instances of RGBA_TO_UINT() macro from audio_region_view.cc 2014-08-17 15:02:50 -04:00
Paul Davis
72d9c38702 substantial changes in color management, involving a reduction in the use of Gdk::Color and more consistent logic for region coloring. 
Group tabs now also get the text drawn in an appropriately contrast-y color

Conflicts:
	gtk2_ardour/region_view.cc
	gtk2_ardour/time_axis_view_item.cc
 2014-08-17 15:02:28 -04:00
nick_m
017a4a8a87 Use global clip level from prefs. Restore clip colour, \ 2014-08-17 14:56:27 -04:00
Paul Davis
8f177fd723 streamline logic for setting waveform colors 2014-08-17 14:49:27 -04:00
Paul Davis
efc85f052e tweak logic for region coloring, particularly when muted 
Conflicts:
	gtk2_ardour/audio_region_view.cc
	gtk2_ardour/time_axis_view_item.cc
 2014-08-17 14:49:17 -04:00
Paul Davis
f8efcca6e2 hopefully fix up selection of color for region name text, under all conditions 2014-08-17 14:44:36 -04:00
Paul Davis
893452b388 remove timebar canvas and just use a single canvas instead. This is just part one - lots of minor fixes to be done 
Conflicts:
	gtk2_ardour/editor.cc
 2014-08-17 13:38:30 -04:00
Paul Davis
6e91e9fd5f remove unused variable 2014-08-17 13:37:23 -04:00
Robin Gareus
ebc797115b initialize variables 2014-08-16 17:59:25 -04:00
Robin Gareus
4b00dea155 show fade+trim handles only if the operation is possible 2014-08-16 17:59:20 -04:00
Robin Gareus
a8eb104f4c session fade-region-visible is for fades - not controls 2014-08-16 17:59:15 -04:00
Robin Gareus
102c1dc66c reduce outline of fade-in/active rectangle to line 2014-08-16 17:58:56 -04:00
Robin Gareus
7478412ce8 show x-fade-rectangle only when hovering 2014-08-16 17:58:49 -04:00
Robin Gareus
23a711d370 reset [trim] fade handle position if track-height changes 2014-08-16 17:58:38 -04:00
Robin Gareus
40ffd0600b towards region-trims preserving fade duration 2014-08-16 17:58:34 -04:00
Robin Gareus
4fcd902044 replace use of Curve with XFadeCurve. 2014-08-16 17:53:59 -04:00
Robin Gareus
9ec7b79ac9 Revert "cairo sub-surface prototype & example 
This reverts commit c57fcde78c.
and also     commit f1f8f89fcb.
 2014-08-16 17:21:08 -04:00
Robin Gareus
17e94e02e8 exercise subsurface rendering for x-fade curves 2014-08-16 17:20:57 -04:00
Robin Gareus
8d666210a9 x-fade drawing rework, part one 2014-08-16 17:20:15 -04:00
Robin Gareus
57ba2396f4 global one-time setup of waveform preferences. 
see note in previous commit.

Conflicts:
	gtk2_ardour/ardour_ui_options.cc
 2014-08-16 17:20:01 -04:00
Robin Gareus
cc942e25f3 persistent waveform shape setting. 
NOTE: the call to set_global_shape() only needs to happen once,
presumably in a hook in the editor that catches Config::Changed

The same is true for waveform-scale and clipping. But for now it's
at least consistent.
 2014-08-16 17:19:23 -04:00
Grygorii Zharun
1f79aea284 [Summary] Merging from git 
[Details]
59e6694405
to
002dfbd0862cabce925056cee566ee0cd8a19134

[git-p4: depot-paths = "//Abdaw/dev_main/tracks/": change = 453713]
 2014-04-18 06:21:34 -05:00
Valeriy Kamyshniy
7a5da2410e [P4/git history rebuild] adjustments to colors and opacity of audio regions 2014-05-27 21:13:55 -04:00
Paul Davis
344f326919 use Canvas::Curve for drawing xfades 
Pixel-by-pixel we shall rule the earth.
 2014-02-26 18:52:14 -05:00
Paul Davis
0bcf3001f5 fiddle with single pixel adjustments to time axis view item heights; fix region gain envelope visibility 2014-02-25 12:02:50 -05:00
Paul Davis
156a5a0e5f add the with-guard-point distinction to region gain lines 2014-02-20 14:01:40 -05:00
Paul Davis
d93050661c reinstate zero line in waveforms (can be hidden by changing the color to something with alpha=0 2014-02-14 14:03:07 -05:00
Paul Davis
7e34ce96c6 fix up placement of fade out handle 2014-02-14 10:21:51 -05:00
Paul Davis
e9e08f59ce fix up details of time axis view item drawing. 
* remove top and bottom edges - rely on track edges for that.
* move right edge of time axis view items 1 pixel right to get a much
   nicer effect when splitting regions. the end line and start line
   of two adjacent regions are now on the same pixel.
* adjust audio region view components to be properly placed.

still need to do ghost regions and MIDI regions
 2014-02-13 18:18:19 -05:00
Paul Davis
2c79f74e49 correctly (?) indicate muted status of audio regions 2014-01-26 16:03:04 -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
Paul Davis
395c3d35d1 tweak up pixel-level positioning 2014-01-10 11:54:32 -05:00
Paul Davis
33cf341381 avoid 1 pixel overlap of end xfade 2014-01-07 22:51:41 -05:00
Paul Davis
c22459d1b5 fix a whole set of errors in the placement of xfade visual elements (not 100% finished) 2014-01-07 20:55:04 -05:00
Paul Davis
68af0fdc07 fix up visibility control for automation lines 2013-12-31 13:28:20 -05:00
Paul Davis
e7059e5a16 remove use of canvas property_foo() since it did nothing (and has now been removed) 2013-12-31 11:54:38 -05:00
Paul Davis
28759617c4 Revert "switch fade in/out lines to ArdourCanvas::Curve rather than ArdourCanvas::PolyLine, though for no apparent benefit" 
This reverts commit e169f5c17f.
 2013-12-27 11:24:56 -05:00
Paul Davis
9fb3247350 rationalize color handling for fade in/out handles 2013-12-09 22:04:13 -05:00
Paul Davis
e169f5c17f switch fade in/out lines to ArdourCanvas::Curve rather than ArdourCanvas::PolyLine, though for no apparent benefit 2013-12-09 21:02:42 -05:00
Paul Davis
ba26316857 make region fade in/out curve shapes into PolyLines not Polygons so that they don't close the stroke path at the top/bottom 2013-10-31 15:39:29 -04:00
Paul Davis
ff560fa361 remove debug output 2013-10-31 11:48:36 -04:00
Paul Davis
7bbd28aa08 notable changes to try to improve most of enter/leave handling for canvas items 2013-10-30 23:36:30 -04:00