13
0
Commit Graph

539 Commits

Author SHA1 Message Date
b855e5f322 Merge remote-tracking branch 'remotes/origin/exportvis' into windows+cc
Conflicts (hopefully resolved):
	gtk2_ardour/wscript
	libs/ardour/ardour/audioregion.h
	libs/ardour/ardour/debug.h
	libs/ardour/ardour/directory_names.h
	libs/ardour/ardour/filesystem_paths.h
	libs/ardour/ardour/session_event.h
	libs/gtkmm2ext/gtkmm2ext/utils.h
	libs/panners/1in2out/wscript
	libs/panners/2in2out/wscript
	libs/panners/vbap/wscript
	libs/pbd/pbd/debug.h
	libs/pbd/pbd/file_utils.h
	libs/pbd/pbd/pathexpand.h
	libs/pbd/pbd/ringbuffer.h
	libs/pbd/pbd/ringbufferNPT.h
	libs/pbd/pbd/search_path.h
	libs/pbd/pbd/stacktrace.h
	libs/pbd/pbd/uuid.h
	libs/pbd/pbd/uuid_boost.h
	libs/surfaces/control_protocol/control_protocol/basic_ui.h
	libs/surfaces/control_protocol/control_protocol/control_protocol.h
2013-10-18 10:03:22 +01:00
2fab8182cc add -fvisibility=hidden to libgtkmm2ext, and make things work 2013-10-17 14:36:41 -04:00
f3d2ca0d9a get everything compiling with libardour built using -fvisibility=hidden 2013-10-17 12:41:28 -04:00
08fbc53d52 add new visibility macro headers omitted from previous commits 2013-10-17 12:41:11 -04:00
15471ca7dd add export control to libgtkmm2ext 2013-10-17 11:26:01 -04:00
75b933eadb Merge remote-tracking branch 'remotes/origin/master' into windows+cc 2013-10-16 15:55:59 +01:00
56fa4d9045 update russian translation (again) 2013-10-15 14:03:59 -04:00
fa71d82dda Merge branch 'windows' into windows+cc 2013-10-11 18:23:53 +01:00
2a6a16f980 merge with master, fixing conflicts in 3 wscript files 2013-10-09 14:00:42 -04:00
5265ceec51 change tortured GtkUI startup process into something just a little more sane, and remove "stopping" code since that belongs in a destructor 2013-10-07 20:27:04 -04:00
19bb2b33a8 Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows
Conflicts (hopefully resolved):
	gtk2_ardour/marker.cc
	gtk2_ardour/midi_region_view.h
	gtk2_ardour/region_gain_line.h
	gtk2_ardour/utils.cc
	gtk2_ardour/video_image_frame.cc
	gtk2_ardour/wscript
	libs/backends/jack/wscript
2013-09-21 09:17:25 +01:00
e5c426ed41 Merge branch 'windows' of git.ardour.org:ardour/ardour into windows 2013-09-18 10:16:40 +01:00
6b1261ed30 'libs/gtkmm2ext/idle_adjustment.cc' - Add a missing header file 2013-09-18 10:02:20 +01:00
5e0e41e068 Merge branch 'master' into cairocanvas 2013-09-16 22:11:50 -04:00
fb45fdc052 fix conflicts and merge with master 2013-09-16 22:11:06 -04:00
710ee36eaa a few DEBUG_TRACE improvements 2013-09-16 22:02:36 -04:00
7a30e63eaa fix merge conflicts with master 2013-09-14 16:42:40 -04:00
2f3c62c5da 'libs/gtkmm2ext' - Minor modification to prevent MSVC from complaining about a malformed comment 2013-09-04 15:46:14 +01:00
e99a85ac92 'libs/gtkmm2ext' - Add the file 'gtkapplication_win32.c' to complement gtkapplication_x11 and gtkapplication_quartz 2013-09-04 15:43:35 +01:00
d074bc586e Merge branch 'master' into audioengine 2013-09-03 17:41:49 -04:00
0013feddbf Merge branch 'master' into windows 2013-09-03 08:34:27 -04:00
66292718a1 improve scroll and drag behaviour of volume-controller knob 2013-09-01 03:19:13 +02:00
dd0a1cd846 fix keyboard interaction with volume knobs (monitor section) 2013-08-31 20:37:02 +02:00
9482702bdc 'libs/gtkmm2ext' - Compiler specific includes 2013-08-26 17:47:28 +01:00
316b72eb0e 'libs/gtkmm2ext' - Main body of changes required for building with MSVC (mostly #includes and casting) 2013-08-26 17:45:18 +01:00
c1a25550d1 'libs/gtkmm2ext' - Use 'std::vector' instead of dynamically sized arrays (required to be buildable with MSVC) 2013-08-26 17:28:03 +01:00
9a877a54e8 'libs/gtkmm2ext' - Remove "using namespace Gdk;" to avoid confusion (in 'fastmeter.cc') over whether we want namespace ::Cairo or namespace Gdk::Cairo 2013-08-26 15:43:20 +01:00
ee1b49f87e fix merge conflicts from master 2013-08-24 12:18:06 -04:00
1421a34e52 pot/po file updates caused by waf i18n 2013-08-24 11:46:45 -04:00
7fe7e7ad4b update czech translations from pavel fric 2013-08-15 14:55:10 -04:00
2de09888b6 some const_cast<> additions for OS X where gcc believes that volatile int* means const int* 2013-08-14 12:40:49 -04:00
6b02d50d5e clean up some valgrid "Uninitialised value was created by a heap allocation" wanings 2013-08-08 15:26:18 -04:00
69c6ef1aa1 initialize some uninitialized values 2013-08-08 15:26:18 -04:00
b6b614acac minimize meter-peak re-draw area 2013-08-08 15:26:18 -04:00
82e1d9655f use 3px for peak-hold in LED mode -> display 2 bright lines 2013-08-08 15:26:16 -04:00
3098e5963c tweak meter-LED style 2013-08-08 15:26:01 -04:00
11c49ab8d1 cache shaded meter-background regardless of color
previously, shaded patterns were assumed to have different colors as well.
2013-08-08 15:26:01 -04:00
2bdd29d3ac fix meter background redraw issue #5601 2013-08-08 15:26:01 -04:00
12c9055659 [re]implement horizontal meter 2013-08-08 15:26:01 -04:00
ba8742edd1 align gradient with meter-metrics 2013-08-08 15:25:40 -04:00
d10b712897 increase saturation of meter-shader 2013-08-08 15:24:49 -04:00
bc66985710 allow to en/disable shade and LED meter style 2013-08-08 15:24:49 -04:00
1da655c2eb Fix special handling of 'zoom vertical' scroll wheel modifier key.
gtkmm2ext/keyboard.cc has a special case to emit a signal on the key-up of
the modifier key used to adjust track heights in conjunction with the
scroll wheel, so that the same track continues to be resized even when
it's shrunk to no longer be under the mouse cursor. However, this code
assumed that the modifier key for this was <Shift>.

Fix it to use the event->state bit corresponding to
ScrollZoomVerticalModifier instead, and rename the relevant functions to
clarify that it's the 'zoom vertical' modifier key they're dealing with.

Partially fixes #5610.
2013-08-08 15:24:15 -04:00
dbe31bcf22 add a stripe-pattern to the meters 2013-08-08 15:23:10 -04:00
a4edd1ed7a possible fix for http://tracker.ardour.org/view.php?id=5586 2013-08-08 15:23:10 -04:00
e3978edabb add option to disable cairo-RGBA overlays for meters. 2013-08-08 15:23:09 -04:00
a0ac0dca85 implement visual-sensitivity (gray out) for faders
Note: bar-controller sensitivity state is not yet set if
automation-mode changes to/from play, but the widget now
supports that.
2013-08-08 15:23:08 -04:00
443c0a2240 minor peak-meter performance tweak
* redraw only missing parts of the outside rectangle,
* don't redraw RMS meter if value has not changed
2013-08-08 15:23:08 -04:00
c209078c12 fix compiler warning 2013-08-08 15:23:08 -04:00
6a436fd826 fix merge conflict from master 2013-07-31 20:11:15 -04:00