e5888d3983
merge with master and fix 2 conflicts
2013-10-16 22:06:56 -04:00
fb313fb174
Merge branch 'master' into windows
2013-10-16 21:57:17 -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
7a02d9e08d
clean up some valgrid "Uninitialised value was created by a heap allocation" wanings
2013-07-31 19:29:20 +02:00
b5a2b4e84e
initialize some uninitialized values
2013-07-31 15:22:51 +02:00
476da4f3df
minimize meter-peak re-draw area
2013-07-31 01:59:50 +02:00
893e26cc68
use 3px for peak-hold in LED mode -> display 2 bright lines
2013-07-28 21:24:27 +02:00
d1c2d53afe
tweak meter-LED style
2013-07-28 18:29:39 +02:00
069fd15c79
cache shaded meter-background regardless of color
...
previously, shaded patterns were assumed to have different colors as well.
2013-07-26 17:17:05 +02:00
cd35040535
fix meter background redraw issue #5601
2013-07-26 17:10:05 +02:00
43bd836778
[re]implement horizontal meter
2013-07-25 19:04:52 +02:00
2ec45cfd1b
align gradient with meter-metrics
2013-07-24 22:57:25 +02:00
33b067c12c
increase saturation of meter-shader
2013-07-24 16:15:12 +02:00
fa332f31fa
allow to en/disable shade and LED meter style
2013-07-24 02:47:37 +02:00
8e376f7a2a
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-07-23 16:42:34 +01:00
533e40ca52
Work around badly chosen argument name in giomm/dbusmessage.h
...
interface is defined in windows/mingw headers. hopefully this will
be fixed in giomm at some point and this crap can be removed
2013-07-22 13:44:32 +10:00
d51a1ec06b
add a stripe-pattern to the meters
2013-07-17 22:45:08 +02:00
650964f320
Merge branch 'master' into windows
2013-07-17 08:05:59 -04:00
562bd6811e
possible fix for http://tracker.ardour.org/view.php?id=5586
2013-07-16 22:44:54 +02:00
9f6d97376d
add option to disable cairo-RGBA overlays for meters.
2013-07-16 00:56:36 +02:00
15be154515
use g_unlink() rather than unlink() universally, requires <glib/gstdio.h> in several files
2013-07-15 14:29:00 -04:00
0aac62e013
Merge branch 'master' into windows
2013-07-14 08:27:22 -04:00
5bae4373c7
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-07-12 19:07:07 +02:00
e0bbc0b435
minor peak-meter performance tweak
...
* redraw only missing parts of the outside rectangle,
* don't redraw RMS meter if value has not changed
2013-07-12 17:56:42 +02:00
b8c369fe2d
Include pbd/timersub.h for mingw build
2013-07-11 15:16:11 -04:00
965883bc22
Use Glib functions to create tmp file path
2013-07-11 15:15:40 -04:00
ef3ea6c6a6
Work around badly chosen argument name in giomm/dbusmessage.h
...
interface is defined in windows/mingw headers. hopefully this will
be fixed in giomm at some point and this crap can be removed
2013-07-11 15:14:51 -04:00
75f0dfb4a8
fix compiler warning
2013-07-11 20:39:24 +02:00
4adb2f97cc
Use timeout source to process ui requests on windows
...
Using a timeout source to process ui events/requests is suboptimal
but it works for the moment. Have to use g_source functions as glibmm
functions are not thread safe AFAIK.
Behaviour should be exactly the same on unix.
2013-07-11 12:56:35 -04:00
7626cd68ac
Hide UI request mechanism from inheriting classes
2013-07-11 12:52:46 -04:00
580520b12f
fix conflicts caused by meterbridge merge
2013-07-11 09:11:53 -04:00
7a62d31056
Episode VI: Return of the ZeroDBline
2013-07-10 15:27:16 +02:00
656cc9a0ad
Episode V: the gainfader line strikes back
2013-07-10 15:27:16 +02:00
40bc6f5b83
Task Force Viking: operation green line
2013-07-10 15:27:14 +02:00
ffbc1c7a8b
with RMS meters: use "peak indicator" as DPM
2013-07-10 15:27:13 +02:00
09243a326a
use digital max-peak with RMS meter
2013-07-10 15:27:13 +02:00
0710171d90
don't reset meter background/highlight on click.
2013-07-10 15:27:12 +02:00
03a510c3d7
prepare meter-widget for dual background color
2013-07-10 15:27:12 +02:00
f801144472
less prominent meter shade
2013-07-10 15:27:09 +02:00
580cec03ad
add shade gradient to meter
2013-07-10 15:27:08 +02:00
d4b1941796
fix meter gradient y-axis only
2013-07-10 15:27:08 +02:00
8a16e61b11
make all meter-colors configurable,..
2013-07-10 15:27:07 +02:00
571b2d70e9
refactor level-meter widget: 5x2 stops meter colors
2013-07-10 15:27:07 +02:00
447e736139
remove b0rked horizontal meter code.
2013-07-10 15:27:07 +02:00
a07c50ad80
reduce peak-hold indicator to 2px height
2013-07-10 15:27:05 +02:00
a13bdf4153
meter rounded rectangle
2013-07-10 15:27:04 +02:00
3823ffc942
configurable meter background color
2013-07-10 15:27:04 +02:00
e4d754390e
meter border
2013-07-10 15:27:04 +02:00
5b6fd190cb
remove border around meter gradients, again.
2013-07-10 15:27:04 +02:00
fdbb0ef780
meter background gradient (hardcoded colors so far)
...
this is a quick test w/black borders only left+right
for Mr oofus to assess.
2013-07-10 15:27:03 +02:00
d6d27f10cb
fastmeter: 1px padding left&right
2013-07-10 15:27:03 +02:00
3031a99364
Merge branch 'master' into cairocanvas
2013-06-25 22:24:47 -04:00
21914c884e
Make scroll-wheel modifier keys consistent in main editor window.
...
Add constants for the keyboard modifiers that should be used for vertical
zoom, horizontal zoom, and horizontal scrolling in the main editor window,
and use these where appropriate rather than using Keyboard::PrimaryModifier
and friends directly.
2013-06-21 20:13:44 +01:00
bebe2af95a
merge with master
2013-05-08 14:48:28 -04:00
a902737db9
various changes to window visibility mgmt, including use of the mixbus2 code for toggling editor + mixer windows. no longer attempt to track changes made outside of ardour, which is a lost cause
2013-05-07 13:01:26 -04:00
074ef3c859
fix bigclockwindow's lack of hiding, set ArdourWindow to just-hide-on-delete and add a bit of visibility tracking debugging
2013-05-05 15:07:52 -04:00
