ardour.git
10 years agoCast param for std::time to a pointer of time_t
Michael Fisher [Wed, 17 Jul 2013 21:05:09 +0000 (16:05 -0500)]
Cast param for std::time to a pointer of time_t
- bleeding clang (trunk 186535 v3.4) fails here

10 years agoProper OSX/CLANG/CXX11 support in stl_delete.h
Michael Fisher [Wed, 17 Jul 2013 01:46:46 +0000 (20:46 -0500)]
Proper OSX/CLANG/CXX11 support in stl_delete.h
- replaces fix in 066df0d218ee4391eb3e15259deca5ccc190ed84
- Check if _LIBCPP_VECTOR is defined for vector_delete.
  This is defined in libc++'s headers which Apple is using
  instead of libstdc++

10 years agoexplicitly re-init meter when theme changes.
Robin Gareus [Mon, 29 Jul 2013 14:31:33 +0000 (16:31 +0200)]
explicitly re-init meter when theme changes.

fixes:
14:14 < oofus> rgareus: BBC meter colour changed, all meters
               except the one on the tool bar picked it up

10 years agochange metric-scale on the sides of meterbridge when scrolling
Robin Gareus [Mon, 29 Jul 2013 13:26:36 +0000 (15:26 +0200)]
change metric-scale on the sides of meterbridge when scrolling

10 years agoallow to configure color of BBC meter
Robin Gareus [Mon, 29 Jul 2013 01:54:43 +0000 (03:54 +0200)]
allow to configure color of BBC meter

10 years agoleft/right meter marks in mixer (narrow red-stripe)
Robin Gareus [Sun, 28 Jul 2013 20:34:28 +0000 (22:34 +0200)]
left/right meter marks in mixer (narrow red-stripe)

10 years agochange default meter-fall-off to 13.3 dB/sec
Robin Gareus [Sun, 28 Jul 2013 19:34:01 +0000 (21:34 +0200)]
change default meter-fall-off to 13.3 dB/sec

10 years agouse 3px for peak-hold in LED mode -> display 2 bright lines
Robin Gareus [Sun, 28 Jul 2013 19:24:27 +0000 (21:24 +0200)]
use 3px for peak-hold in LED mode -> display 2 bright lines

10 years agofix diamond inheritance - gtkmm main class is sigc::trackable
Robin Gareus [Sun, 28 Jul 2013 18:43:21 +0000 (20:43 +0200)]
fix diamond inheritance - gtkmm main class is sigc::trackable

10 years agofix compiler warnings.
Robin Gareus [Sun, 28 Jul 2013 18:32:52 +0000 (20:32 +0200)]
fix compiler warnings.

10 years agotweak meter-LED style
Robin Gareus [Sun, 28 Jul 2013 16:29:39 +0000 (18:29 +0200)]
tweak meter-LED style

10 years agoupdate german translation for libardour
Edgar Aichinger [Sun, 28 Jul 2013 14:50:26 +0000 (16:50 +0200)]
update german translation for libardour

fixes x42's screwup with prev commit.

10 years agoupdate german translation
Edgar Aichinger [Sun, 28 Jul 2013 14:45:42 +0000 (16:45 +0200)]
update german translation

10 years agok-meter +4 marks
Robin Gareus [Sun, 28 Jul 2013 13:55:36 +0000 (15:55 +0200)]
k-meter +4 marks

10 years agofix meterbridge window on OSX
Robin Gareus [Sun, 28 Jul 2013 13:54:13 +0000 (15:54 +0200)]
fix meterbridge window on OSX

10 years agoadd dedicated line-up level for IEC1/DIN meter (15dbFS)
Robin Gareus [Sun, 28 Jul 2013 01:29:16 +0000 (03:29 +0200)]
add dedicated line-up level for IEC1/DIN meter (15dbFS)

10 years agomake LED meter style optional
Robin Gareus [Sun, 28 Jul 2013 01:01:37 +0000 (03:01 +0200)]
make LED meter style optional

10 years agotweak meter-metric red-boxes/stripes
Robin Gareus [Sun, 28 Jul 2013 01:31:34 +0000 (03:31 +0200)]
tweak meter-metric red-boxes/stripes

10 years agoadd red-boxes to meter-marks and fix Nordic scale color
Robin Gareus [Sat, 27 Jul 2013 20:44:38 +0000 (22:44 +0200)]
add red-boxes to meter-marks and fix Nordic scale color

10 years agoupdate meter marks and colors..
Robin Gareus [Sat, 27 Jul 2013 19:26:22 +0000 (21:26 +0200)]
update meter marks and colors..

10 years agoAux-sends do not have a GUI - fixes #5621
Robin Gareus [Sat, 27 Jul 2013 13:02:19 +0000 (15:02 +0200)]
Aux-sends do not have a GUI - fixes #5621

10 years agosome more VU-meter tick marks..
Robin Gareus [Fri, 26 Jul 2013 20:57:39 +0000 (22:57 +0200)]
some more VU-meter tick marks..

10 years agocache shaded meter-background regardless of color
Robin Gareus [Fri, 26 Jul 2013 15:17:05 +0000 (17:17 +0200)]
cache shaded meter-background regardless of color

previously, shaded patterns were assumed to have different colors as well.

10 years agofix meter background redraw issue #5601
Robin Gareus [Fri, 26 Jul 2013 15:10:05 +0000 (17:10 +0200)]
fix meter background redraw issue #5601

10 years agofix typo for 0VU = 8dBu in config
Robin Gareus [Thu, 25 Jul 2013 21:33:11 +0000 (23:33 +0200)]
fix typo for 0VU = 8dBu in config

10 years agocache midi metrics depending on meter-type and data-type(s)
Robin Gareus [Thu, 25 Jul 2013 18:56:25 +0000 (20:56 +0200)]
cache midi metrics depending on meter-type and data-type(s)

10 years agoremember meter-background highlight when type or width changes..
Robin Gareus [Thu, 25 Jul 2013 17:55:26 +0000 (19:55 +0200)]
remember meter-background highlight when type or width changes..

10 years ago[re]implement horizontal meter
Robin Gareus [Thu, 25 Jul 2013 17:04:52 +0000 (19:04 +0200)]
[re]implement horizontal meter

10 years agovtl: replace Ardour with Program-Name in messages
Robin Gareus [Thu, 25 Jul 2013 12:19:28 +0000 (14:19 +0200)]
vtl: replace Ardour with Program-Name in messages

10 years agoprepare horizontal meters (level-meter H/V Box abstraction)
Robin Gareus [Thu, 25 Jul 2013 12:18:39 +0000 (14:18 +0200)]
prepare horizontal meters (level-meter H/V Box abstraction)

10 years agoset midi-metric ticks depending on meter-type
Robin Gareus [Thu, 25 Jul 2013 11:06:58 +0000 (13:06 +0200)]
set midi-metric ticks depending on meter-type

10 years agoVU meter label color&shadow tweak by the_CLA
Robin Gareus [Thu, 25 Jul 2013 09:06:58 +0000 (11:06 +0200)]
VU meter label color&shadow tweak by the_CLA

10 years agotweak label alignment
Robin Gareus [Thu, 25 Jul 2013 09:03:36 +0000 (11:03 +0200)]
tweak label alignment

10 years agoDon't allow to deactivate meter.
Robin Gareus [Thu, 25 Jul 2013 08:59:24 +0000 (10:59 +0200)]
Don't allow to deactivate meter.

before this change:

1) switch to 'custom' meter point,
2) deactivate meter processor.

-> meters does not run regardless of meter-point
-> meter can only be re-nabled in 'custom' mode

10 years agoreset meters only when *really* necessary
Robin Gareus [Thu, 25 Jul 2013 08:53:11 +0000 (10:53 +0200)]
reset meters only when *really* necessary

..and continue to calculate fall-off in
audio-cycle (rather than UI thread)

TODO: check if this works properly when switching
between audio/midi meter modes on a midi-track.

One of the motivations to always reset meters when the
meter-point changes was to resolve peak-hold & fall-off
issues when a midi-meter replaces an audio-meter and vice
versa.

10 years agoproper shadow for metric labels..
Robin Gareus [Thu, 25 Jul 2013 00:08:38 +0000 (02:08 +0200)]
proper shadow for metric labels..

10 years agofix compiler warning
Robin Gareus [Thu, 25 Jul 2013 00:05:10 +0000 (02:05 +0200)]
fix compiler warning

10 years ago'overlay shadow' on meter-metrics experiment
Robin Gareus [Wed, 24 Jul 2013 23:44:16 +0000 (01:44 +0200)]
'overlay shadow' on meter-metrics experiment

TODO: shadow should really be 'behind'. ie save color,
stroke_preserve() shadow, paint text-layout with saved color
and eventually cairo_new_path() reset the path...

10 years agofix crash with "send" meters.
Robin Gareus [Wed, 24 Jul 2013 22:06:12 +0000 (00:06 +0200)]
fix crash with "send" meters.

Meters in send-UI don't necessarily have a route,
but their type cannot be changed, anyway.
So just use "PeakMeter".

10 years agouse only two colors for VU meter indicator and bright-gray for BBC
Robin Gareus [Wed, 24 Jul 2013 21:24:11 +0000 (23:24 +0200)]
use only two colors for VU meter indicator and bright-gray for BBC

10 years agoalign gradient with meter-metrics
Robin Gareus [Wed, 24 Jul 2013 20:57:25 +0000 (22:57 +0200)]
align gradient with meter-metrics

10 years agoreduce brightness of VU meter backplate & increase contrast of peak-label
Robin Gareus [Wed, 24 Jul 2013 20:29:46 +0000 (22:29 +0200)]
reduce brightness of VU meter backplate & increase contrast of peak-label

10 years agoget meter color from gtkrc style file
Robin Gareus [Wed, 24 Jul 2013 20:05:24 +0000 (22:05 +0200)]
get meter color from gtkrc style file

10 years agoadd [master] meter to the toolbar
Robin Gareus [Wed, 24 Jul 2013 20:04:46 +0000 (22:04 +0200)]
add [master] meter to the toolbar

http://tracker.ardour.org/view.php?id=5601

10 years agorevert VU meter background to default gray-shade
Robin Gareus [Wed, 24 Jul 2013 14:14:27 +0000 (16:14 +0200)]
revert VU meter background to default gray-shade

10 years agoincrease saturation of meter-shader
Robin Gareus [Wed, 24 Jul 2013 13:47:01 +0000 (15:47 +0200)]
increase saturation of meter-shader

10 years agofix display-type of editor-mixer level-meter
Robin Gareus [Wed, 24 Jul 2013 14:15:06 +0000 (16:15 +0200)]
fix display-type of editor-mixer level-meter

10 years agoincrease meterbridge with if scrollbar is not visible..
Robin Gareus [Wed, 24 Jul 2013 13:26:40 +0000 (15:26 +0200)]
increase meterbridge with if scrollbar is not visible..

10 years agoadd separator line to meterbridge
Robin Gareus [Wed, 24 Jul 2013 13:47:53 +0000 (15:47 +0200)]
add separator line to meterbridge

10 years agocolor meterbridge strips
Robin Gareus [Wed, 24 Jul 2013 09:59:40 +0000 (11:59 +0200)]
color meterbridge strips

10 years agoamend to 8deccea6 (resize meterbridge window)
Robin Gareus [Wed, 24 Jul 2013 09:57:11 +0000 (11:57 +0200)]
amend to 8deccea6 (resize meterbridge window)

10 years agoallow to en/disable shade and LED meter style
Robin Gareus [Wed, 24 Jul 2013 00:47:37 +0000 (02:47 +0200)]
allow to en/disable shade and LED meter style

10 years agometer background color..
Robin Gareus [Wed, 24 Jul 2013 00:46:53 +0000 (02:46 +0200)]
meter background color..

10 years agometerbridge: meter-type dependent color-schema
Robin Gareus [Tue, 23 Jul 2013 23:43:24 +0000 (01:43 +0200)]
meterbridge: meter-type dependent color-schema

10 years agolimit width and resize meterbride window
Robin Gareus [Tue, 23 Jul 2013 23:39:16 +0000 (01:39 +0200)]
limit width and resize meterbride window

10 years agoadd "0VU = +8dBu" VU meter config
Robin Gareus [Tue, 23 Jul 2013 21:53:22 +0000 (23:53 +0200)]
add "0VU = +8dBu" VU meter config

10 years agochange default VU mode to "0VU = +4dBu (standard)"
Robin Gareus [Tue, 23 Jul 2013 21:11:50 +0000 (23:11 +0200)]
change default VU mode to "0VU = +4dBu (standard)"

10 years agoclarify meter preference options
Robin Gareus [Tue, 23 Jul 2013 21:07:41 +0000 (23:07 +0200)]
clarify meter preference options

10 years agoBBC meter labels are always white
Robin Gareus [Tue, 23 Jul 2013 21:07:17 +0000 (23:07 +0200)]
BBC meter labels are always white

10 years agoimplement meter-lineup and VU standard preferences
Robin Gareus [Tue, 23 Jul 2013 19:20:51 +0000 (21:20 +0200)]
implement meter-lineup and VU standard preferences

10 years agoclean up video related messages
Robin Gareus [Tue, 23 Jul 2013 18:24:23 +0000 (20:24 +0200)]
clean up video related messages

10 years agouse fixed fall-off time for k-meter
Robin Gareus [Tue, 23 Jul 2013 12:23:20 +0000 (14:23 +0200)]
use fixed fall-off time for k-meter

10 years agoFix special handling of 'zoom vertical' scroll wheel modifier key.
Colin Fletcher [Tue, 23 Jul 2013 15:15:23 +0000 (16:15 +0100)]
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.

10 years agofix #5609 (import with 1 track per channel mis-associates tracks + channels)
Paul Davis [Tue, 23 Jul 2013 15:28:45 +0000 (11:28 -0400)]
fix #5609 (import with 1 track per channel mis-associates tracks + channels)

when using ImportDistinctChannels, correctly name regions so that playlists for each channel/track
are also named differently, and thus reloaded properly when the session is reloaded.

10 years agometerbridge metrics update:
Robin Gareus [Tue, 23 Jul 2013 11:30:23 +0000 (13:30 +0200)]
meterbridge metrics update:

* display metrics for every used meter-type
* show metrics between meters with differnet types
* update text and label alignment for meterbridge
* fix crash when deleting metrics-strip (zero route)
* clean up metric pattern code (use float for dBFS)

10 years agorestore session backwards compatibility to 3.3
Robin Gareus [Mon, 22 Jul 2013 17:59:24 +0000 (19:59 +0200)]
restore session backwards compatibility to 3.3

10 years agominor tweaks to meter-names and legend
Robin Gareus [Mon, 22 Jul 2013 17:56:30 +0000 (19:56 +0200)]
minor tweaks to meter-names and legend

10 years agoimplement new meter types
Robin Gareus [Mon, 22 Jul 2013 16:45:08 +0000 (18:45 +0200)]
implement new meter types

10 years agoRevert "Revert new meter types (postponed until after 3.3 release)"
Robin Gareus [Mon, 22 Jul 2013 16:42:01 +0000 (18:42 +0200)]
Revert "Revert new meter types (postponed until after 3.3 release)"

This reverts commit d80f672e8487f459d76ab291958bffcded08f0fd.

10 years agore-nice rendering of channel-splitting icon
Robin Gareus [Thu, 18 Jul 2013 09:27:21 +0000 (11:27 +0200)]
re-nice rendering of channel-splitting icon

10 years agoWrap calls to add_shortcut_folder() in try { ... } block.
Colin Fletcher [Fri, 19 Jul 2013 11:04:58 +0000 (12:04 +0100)]
Wrap calls to add_shortcut_folder() in try { ... } block.

Gtk::FileChooserButton::add_shortcut_folder() throws a Glib::Error
exception if the folder being added already has a shortcut, causing the
'New session' dialogue to appear empty when choosing 'New...' from the
Session menu. This happens if Ardour's default session folder is
set to a location that has a standard shortcut in the Gtk file chooser,
e.g. the user's home directory, desktop, &c.

Catch the exception in ArdourStartup::setup_new_session_page(), so that the
'New session' dialogue appears as expected, and likewise in
ARDOUR_UI::open_session() to avoid a similar problem there.

Fixes #5591.

10 years agoupdate processor-name (short|long) when mixer-strip width changes
Robin Gareus [Fri, 19 Jul 2013 08:37:49 +0000 (10:37 +0200)]
update processor-name (short|long) when mixer-strip width changes

10 years agoadjust meter-width when configuration changes
Robin Gareus [Fri, 19 Jul 2013 08:37:00 +0000 (10:37 +0200)]
adjust meter-width when configuration changes

fixes http://tracker.ardour.org/view.php?id=5592

10 years agoreset meter when meter-point changes
Robin Gareus [Thu, 18 Jul 2013 07:01:47 +0000 (09:01 +0200)]
reset meter when meter-point changes

10 years agomixer metric background color fix (MIDI & inactive)
Robin Gareus [Thu, 18 Jul 2013 07:00:24 +0000 (09:00 +0200)]
mixer metric background color fix (MIDI & inactive)

fixes http://tracker.ardour.org/view.php?id=5594

10 years agorevert to right-side mixer metric-labels
Robin Gareus [Wed, 17 Jul 2013 21:33:23 +0000 (23:33 +0200)]
revert to right-side mixer metric-labels

10 years agodon't hide ticks in narrow mode
Robin Gareus [Wed, 17 Jul 2013 21:11:48 +0000 (23:11 +0200)]
don't hide ticks in narrow mode

10 years agometer metrics: ignore global font-scaling
Robin Gareus [Wed, 17 Jul 2013 21:04:52 +0000 (23:04 +0200)]
meter metrics: ignore global font-scaling

10 years agoadd a stripe-pattern to the meters
Robin Gareus [Wed, 17 Jul 2013 20:45:08 +0000 (22:45 +0200)]
add a stripe-pattern to the meters

10 years agouse ArdourMono font for metric patterns
Robin Gareus [Wed, 17 Jul 2013 20:39:55 +0000 (22:39 +0200)]
use ArdourMono font for metric patterns

10 years agomove mixer-metric pattern to the left
Robin Gareus [Wed, 17 Jul 2013 20:26:51 +0000 (22:26 +0200)]
move mixer-metric pattern to the left

10 years agofix typo
Robin Gareus [Wed, 17 Jul 2013 13:12:13 +0000 (15:12 +0200)]
fix typo

10 years agopossible fix for 5591 (show elements after re-adding them)
Robin Gareus [Wed, 17 Jul 2013 11:35:45 +0000 (13:35 +0200)]
possible fix for 5591 (show elements after re-adding them)

10 years agowork around sparse motion notification events when tooltips are disabled
Robin Gareus [Wed, 17 Jul 2013 00:35:02 +0000 (02:35 +0200)]
work around sparse motion notification events when tooltips are disabled

fixes http://tracker.ardour.org/view.php?id=5174

10 years agobump actual publically visible version (oops) 3.3
Paul Davis [Tue, 16 Jul 2013 22:54:45 +0000 (18:54 -0400)]
bump actual publically visible version (oops)

10 years agometer-state 17 and 49 + code-comment
Robin Gareus [Tue, 16 Jul 2013 21:30:21 +0000 (23:30 +0200)]
meter-state 17 and 49 + code-comment

10 years agopossible fix for http://tracker.ardour.org/view.php?id=5586
Robin Gareus [Tue, 16 Jul 2013 20:44:54 +0000 (22:44 +0200)]
possible fix for tracker.ardour.org/view.php?id=5586

10 years agorework metering states 2, 6, 18 and 22
Robin Gareus [Tue, 16 Jul 2013 20:43:23 +0000 (22:43 +0200)]
rework metering states 2, 6, 18 and 22

10 years agofix re-drawing of splitting icon
Robin Gareus [Tue, 16 Jul 2013 20:18:51 +0000 (22:18 +0200)]
fix re-drawing of splitting icon

10 years agorevert functionality of f842e8af2 (meter display in DISK mode)
Robin Gareus [Tue, 16 Jul 2013 19:18:52 +0000 (21:18 +0200)]
revert functionality of f842e8af2 (meter display in DISK mode)

10 years agoRevert "C++11 Building - Use new style struct field inititializing" (this code
Paul Davis [Tue, 16 Jul 2013 18:52:52 +0000 (14:52 -0400)]
Revert "C++11 Building - Use new style struct field inititializing" (this code
change breaks gcc on several platforms).

This reverts commit bf153e58a5e3b31536648bff4b95bf6e0a107c6c.

10 years agoyet another meter+monitoring detail:
Robin Gareus [Tue, 16 Jul 2013 18:37:30 +0000 (20:37 +0200)]
yet another meter+monitoring detail:

"explicit Monitor DISK" + "Transport Stop" + "not track rec-en"
 -> meter is always zero

10 years agoMerge branch 'clang' of https://github.com/axetota/ardour
Robin Gareus [Tue, 16 Jul 2013 17:49:50 +0000 (19:49 +0200)]
Merge branch 'clang' of https://github.com/axetota/ardour

10 years agofix metering states 34, 38, 49, 50, 53 and 54
Robin Gareus [Tue, 16 Jul 2013 17:37:36 +0000 (19:37 +0200)]
fix metering states 34, 38, 49, 50, 53 and 54

for state descriptions see
http://www.oofus.co.uk/ardour/Ardour3MonitorModesV3.pdf

10 years agozero meters for inactive tracks
Robin Gareus [Tue, 16 Jul 2013 17:36:57 +0000 (19:36 +0200)]
zero meters for inactive tracks

10 years agomove ff* structs & typedef into dedicated namespace
Robin Gareus [Sun, 14 Jul 2013 14:34:49 +0000 (16:34 +0200)]
move ff* structs & typedef into dedicated namespace

(further avoid conflicts with plugins)

10 years agoincrease spacing between meter ticks and labels
Robin Gareus [Tue, 16 Jul 2013 15:55:18 +0000 (17:55 +0200)]
increase spacing between meter ticks and labels

10 years agoRMS meter - reset after calculating new data
Robin Gareus [Tue, 16 Jul 2013 14:25:27 +0000 (16:25 +0200)]
RMS meter - reset after calculating new data

10 years agofix "monitor mode 11"
Robin Gareus [Tue, 16 Jul 2013 14:04:41 +0000 (16:04 +0200)]
fix "monitor mode 11"

see http://www.oofus.co.uk/ardour/Ardour3MonitorModesV2.pdf
the overall logic can probably be simplified somewhat
track-rec-enable on -> always monitor input

10 years agofix input metering:
Robin Gareus [Tue, 16 Jul 2013 13:11:50 +0000 (15:11 +0200)]
fix input metering:

if meter==input, meter depends on In/Disk
see also 29108187ed