Commit graph

946 commits

Author SHA1 Message Date
Paul Davis
fa22520fd2 Merge branch 'master' into cairocanvas 2013-11-25 09:26:35 -05:00
Paul Davis
3ce39cc410 update .po files with --no-fuzzy-matching in use 2013-11-05 11:15:46 -05:00
Paul Davis
ea1ccb869a fix merge with master 2013-10-31 13:16:51 -04:00
Robin Gareus
4316eda89f remove fuzzy and obsolete translations 2013-10-23 20:01:23 +02:00
Paul Davis
f85c67501c reverse the visibility.h files assumptions that we don't build shared libs by default
This avoids having to define define LIBFOO_DLL=1 all over the place. If we ever go with static libs we will
need to define LIBFOO_STATIC=1 but hopefully in some central location like the top level wscript.

Oh, and I also dropped support for gcc older than version 4.x because ardour will already not build
on such an old version.
2013-10-18 11:50:44 -04:00
John Emmas
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
Paul Davis
2fab8182cc add -fvisibility=hidden to libgtkmm2ext, and make things work 2013-10-17 14:36:41 -04:00
Paul Davis
f3d2ca0d9a get everything compiling with libardour built using -fvisibility=hidden 2013-10-17 12:41:28 -04:00
Paul Davis
08fbc53d52 add new visibility macro headers omitted from previous commits 2013-10-17 12:41:11 -04:00
Paul Davis
15471ca7dd add export control to libgtkmm2ext 2013-10-17 11:26:01 -04:00
Paul Davis
e5888d3983 merge with master and fix 2 conflicts 2013-10-16 22:06:56 -04:00
Paul Davis
fb313fb174 Merge branch 'master' into windows 2013-10-16 21:57:17 -04:00
John Emmas
75b933eadb Merge remote-tracking branch 'remotes/origin/master' into windows+cc 2013-10-16 15:55:59 +01:00
Paul Davis
56fa4d9045 update russian translation (again) 2013-10-15 14:03:59 -04:00
John Emmas
fa71d82dda Merge branch 'windows' into windows+cc 2013-10-11 18:23:53 +01:00
Paul Davis
2a6a16f980 merge with master, fixing conflicts in 3 wscript files 2013-10-09 14:00:42 -04:00
Paul Davis
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
John Emmas
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
John Emmas
e5c426ed41 Merge branch 'windows' of git.ardour.org:ardour/ardour into windows 2013-09-18 10:16:40 +01:00
John Emmas
6b1261ed30 'libs/gtkmm2ext/idle_adjustment.cc' - Add a missing header file 2013-09-18 10:02:20 +01:00
Paul Davis
5e0e41e068 Merge branch 'master' into cairocanvas 2013-09-16 22:11:50 -04:00
Paul Davis
fb45fdc052 fix conflicts and merge with master 2013-09-16 22:11:06 -04:00
Paul Davis
710ee36eaa a few DEBUG_TRACE improvements 2013-09-16 22:02:36 -04:00
Paul Davis
7a30e63eaa fix merge conflicts with master 2013-09-14 16:42:40 -04:00
John Emmas
2f3c62c5da 'libs/gtkmm2ext' - Minor modification to prevent MSVC from complaining about a malformed comment 2013-09-04 15:46:14 +01:00
John Emmas
e99a85ac92 'libs/gtkmm2ext' - Add the file 'gtkapplication_win32.c' to complement gtkapplication_x11 and gtkapplication_quartz 2013-09-04 15:43:35 +01:00
Paul Davis
d074bc586e Merge branch 'master' into audioengine 2013-09-03 17:41:49 -04:00
Paul Davis
0013feddbf Merge branch 'master' into windows 2013-09-03 08:34:27 -04:00
Robin Gareus
66292718a1 improve scroll and drag behaviour of volume-controller knob 2013-09-01 03:19:13 +02:00
Robin Gareus
dd0a1cd846 fix keyboard interaction with volume knobs (monitor section) 2013-08-31 20:37:02 +02:00
John Emmas
9482702bdc 'libs/gtkmm2ext' - Compiler specific includes 2013-08-26 17:47:28 +01:00
John Emmas
316b72eb0e 'libs/gtkmm2ext' - Main body of changes required for building with MSVC (mostly #includes and casting) 2013-08-26 17:45:18 +01:00
John Emmas
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
John Emmas
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
Paul Davis
ee1b49f87e fix merge conflicts from master 2013-08-24 12:18:06 -04:00
Paul Davis
1421a34e52 pot/po file updates caused by waf i18n 2013-08-24 11:46:45 -04:00
Paul Davis
7fe7e7ad4b update czech translations from pavel fric 2013-08-15 14:55:10 -04:00
Paul Davis
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
Robin Gareus
6b02d50d5e clean up some valgrid "Uninitialised value was created by a heap allocation" wanings 2013-08-08 15:26:18 -04:00
Robin Gareus
69c6ef1aa1 initialize some uninitialized values 2013-08-08 15:26:18 -04:00
Robin Gareus
b6b614acac minimize meter-peak re-draw area 2013-08-08 15:26:18 -04:00
Robin Gareus
82e1d9655f use 3px for peak-hold in LED mode -> display 2 bright lines 2013-08-08 15:26:16 -04:00
Robin Gareus
3098e5963c tweak meter-LED style 2013-08-08 15:26:01 -04:00
Robin Gareus
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
Robin Gareus
2bdd29d3ac fix meter background redraw issue #5601 2013-08-08 15:26:01 -04:00
Robin Gareus
12c9055659 [re]implement horizontal meter 2013-08-08 15:26:01 -04:00
Robin Gareus
ba8742edd1 align gradient with meter-metrics 2013-08-08 15:25:40 -04:00
Robin Gareus
d10b712897 increase saturation of meter-shader 2013-08-08 15:24:49 -04:00
Robin Gareus
bc66985710 allow to en/disable shade and LED meter style 2013-08-08 15:24:49 -04:00
Colin Fletcher
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