f0dbd6c085
Export dialog: tidy code, & remove some superfluous debug output
...
Remove some debug output, tidy up a few whitespace inconsistencies, use
DEBUG::Soundcloud in one more place, and zap a couple of unused variables.
2014-06-12 23:20:05 +01:00
70308f5174
Post-export hook tweaks
...
Remove the Soundcloud username & password from the parameter substitutions
passed to the post-export hook: having thought about this now, I can't
actually think of a case where these are of any use at all.
In compensation, add %s and %n parameters that expand to the session
directory and name - maybe people will think of uses for these.
2014-06-12 23:20:05 +01:00
a245250409
use the alpha/opacity value for the region base whether track colors are in use or not
2014-06-12 18:14:55 -04:00
684d45c0cc
restored track height adjustment using alt-scroll on track headers
2014-06-12 17:21:41 -04:00
720a9b73a5
fixed rulers stealing all canvas scroll events and corrected computation of correct track for track-height adjustment using alt-scroll
2014-06-12 17:21:23 -04:00
6958409187
remove no-longer-used code
2014-06-12 16:18:38 -04:00
85e2c60673
add back click behaviour for canvas rulers, and also cursor enforcement
2014-06-12 16:06:31 -04:00
ea355bfe15
add canvas rulers event dispatch and reinstate scrolling behaviour
2014-06-12 15:58:05 -04:00
551014240a
drag handles no longer exist as distinct item types (failed experiment)
2014-06-12 14:51:51 -04:00
887e75260d
use new ArdourCanvas::Ruler constructor
2014-06-12 10:35:32 -04:00
0762708d83
add new canvas vars for rulers
2014-06-12 10:32:34 -04:00
79c30ab766
make rulers color-sensitive (e.g. theme manager editable, etc)
2014-06-12 01:07:58 -04:00
b2ee6b4344
add new default colors for canvas rulers
2014-06-12 01:07:58 -04:00
95fc5ab0a8
removed unused rule GTK widget style definition
2014-06-12 01:07:58 -04:00
3d81944b1d
remove unused GTK style
2014-06-12 01:07:58 -04:00
0ab69cb8c7
OS X specific cleanup after canvas ruler introduction
2014-06-12 00:19:42 -04:00
9461fcb271
remove header file includes of now-removed gtk custom ruler
2014-06-12 00:18:58 -04:00
4b07d01532
remove header file includes of now-removed gtk custom ruler
2014-06-12 00:18:15 -04:00
6c9f4e9598
final ruler file removal
2014-06-12 00:01:30 -04:00
43e2baf54e
remove gtk ruler widget implementation - no longer in use
2014-06-12 00:01:06 -04:00
b73352880e
use canvas rulers now instead of gtk widgets
...
Some bugs that exist in master are still present.
2014-06-11 23:54:28 -04:00
18190eaa5e
clamp zoom level to show 3 days on a 4000 pixel wide screen; comment unused variable for now
2014-06-11 23:54:28 -04:00
22f45b5a78
Revert "do not allow canvas cursor changes while a drag is in progress". This
...
was a bad idea. There are lots of reasons to want to change cursors while
dragging, even if we don't do that yet.
This reverts commit 144033e55c
2014-06-10 18:50:42 -04:00
144033e55c
do not allow canvas cursor changes while a drag is in progress
2014-06-10 16:46:09 -04:00
b9f7aeb61e
first pass an alternate cursor set (updates expected soon)
2014-06-10 14:40:10 -04:00
c56d309bd7
make the icon set selector actually do something
2014-06-10 14:39:28 -04:00
324ef3b085
add icon set selector to theme manager
2014-06-10 14:39:28 -04:00
839a0063f2
add ::get_icon_sets() to utils
2014-06-10 14:39:28 -04:00
d59d26b89a
change ::get_icon_path() and ::get_icon() to accept an "icon set" name to provide ability to use different sets of icons; use when creating MouseCursors
2014-06-10 14:39:28 -04:00
eca6c9f998
remove ambiguous use of Rect (on OS X)
2014-06-10 11:00:15 -04:00
3f38a602cc
remove instances of RGBA_TO_UINT() macro from region_view.cc
2014-06-09 23:42:12 -04:00
96fbdd4bee
remove instances of RGBA_TO_UINT() macro from audio_region_view.cc
2014-06-09 23:39:07 -04:00
65ef1a8b8a
remove more unusued color members from TimeAxisViewItem
2014-06-09 23:33:14 -04:00
ce08ec0de0
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
2014-06-09 23:29:00 -04:00
c8ab1aaf7d
use Canvas::LineSet for tempolines rather than N different Canvas::Line items plus a cache
2014-06-09 15:39:57 -04:00
9933a80dd4
allow a drag down over the drop zone to be "reversed" and the region moved back up into existing tracks
2014-06-09 10:55:37 -04:00
d36afa6b8b
forward scroll events from track control headers to the canvas, to get consistent scroll behaviour (whatever that behaviour is)
2014-06-09 10:02:38 -04:00
95f2b4ba17
change height of canvas drop so last 20 pixels of bottom track is still visible when fully scrolled down
2014-06-09 09:12:42 -04:00
b530e8649e
rename Editor::_canvas_bottom_rect as Editor::_canvas_drop_zone; increase its size; remove debug message
2014-06-09 09:09:21 -04:00
0c5dae881c
fix up fit-selected-tracks so that we are filling the trackview area, not the entire canvas (which now includes rulers)
2014-06-09 09:08:51 -04:00
92bb0e0d7f
fix problem with calls to Editor::trackview_by_y_position() when using motion events. The coordinate passed in was in canvas space and the method expected trackview space
...
To handle any further issues like this, I generalized and added an optional argument specifying that the canvas=>trackview transform is required, thus
centralizing where this done.
2014-06-08 14:41:29 -04:00
c22e96522d
Merge branch 'waveview_caching_for_upstream' of https://github.com/nmains/ardour into cairocanvas
2014-06-08 13:01:47 -04:00
nick_m
e495577f98
Use global clip level from prefs. Restore clip colour, \
2014-06-09 02:50:14 +10:00
8487314069
introduce Drag::_trackview_only which indicates that all y-axis positions for the pointer during a drag should be relative to the top of the trackview group.
...
More or less all drags except for Cursor (playhead) and drags in the range marker bars have this true (which is the default value)
2014-06-08 11:26:32 -04:00
ba8d0e32f7
fix crash caused by click-on-region-name if name highlights are not in use - such a click is not a trim operation under those conditions
2014-06-08 11:26:32 -04:00
34e2cf7913
fix 'use_latency_button' (broken in prev. commit)
2014-06-08 17:19:10 +02:00
eb289a76af
basic Midi latency measurement GUI (re-use Audio latency notebook)
2014-06-08 14:48:10 +02:00
81182b5bf6
prepare MIDI latency measurement (backend)
2014-06-08 11:18:18 +02:00
5a41487a08
remove some 1920 tick constants and leave notes for some others.
2014-06-07 18:35:37 +02:00
nick_m
7a05dde39d
Use a dumb cache for waveview ImageSurfaces. This halves the size of the
...
previous one, but usually ends up using three of them at the current
CACHE_HIGH_WATER setting.
Should result in a smaller memory footprint for sessions with
multiple copies of nearby audio segments (electronic style).
The downside is the larger memory footprint for linear recording
sessions if CACHE_HIGH_WATER > 1 (1 giving a max of two
half - sized cache entries per audio stream).
2014-06-08 01:47:38 +10:00
94fa927861
limit automation event density - fixes #5928
...
Constrain control points to one per tick (1/1920 beats).
Prior to this it was possible to set two values to the
same time (interpolation and iteration failed).
2014-06-07 17:43:12 +02:00
436eecbb3c
check for xjadeo/xjremote >= 0.7.7
2014-06-07 17:28:46 +02:00
889f62328b
update for xjadeo 0.7.7 (don't connect to jackd by default)
2014-06-07 17:28:46 +02:00
7ba3e50e51
Fix paths in ardour.sh
2014-06-07 13:49:11 +10:00
5285bb587f
fix position where rubberband rect is drawn
2014-06-06 08:33:13 -04:00
eec24b6287
fix up drawing and selection process for range selections (caused by subtle change in semantics of TimeAxisView::covered_by_y_range())
2014-06-05 17:06:36 -04:00
24e357ae19
fix issues with verbose canvas cursor because it was in a horizontally-only scroll group
2014-06-05 15:33:56 -04:00
64701f3955
remove needlessly-added method
2014-06-05 15:22:26 -04:00
ad346dc638
reinstate a canvas group where we reparent regions while dragging, so that they are always on top.
...
I mistakenly removed this during the onecanvas changes.
2014-06-05 15:16:55 -04:00
ac33bb4256
streamline logic for setting waveform colors
2014-06-05 14:12:58 -04:00
05f476875b
tweak logic for region coloring, particularly when muted
2014-06-05 14:12:58 -04:00
2aa32ed349
unify Fade-Handle Cursors
2014-06-05 18:58:21 +02:00
4ad24b3a27
Revert "frankenstein'ed fade+trim cursors"
...
This reverts commit 3b717da783
2014-06-05 18:58:21 +02:00
73b27f2e9a
remove more unusued colors from TimeAxisViewItem
2014-06-05 12:34:47 -04:00
94b0d3bc25
remove unused label_color from TimeAxisViewItem
2014-06-05 12:04:42 -04:00
39eec5ac1b
hopefully fix up selection of color for region name text, under all conditions
2014-06-05 12:04:42 -04:00
a907d3455e
break out ALSA related functions into libardouralsautil
2014-06-04 19:16:37 +02:00
ec49e351c3
fixes to change engines while Ardour is running.
...
When a new backend is selected, it is loaded to query
available devices etc. This effectively drops the current backend.
2014-06-04 17:17:14 +02:00
0889336aac
disable pluginbox in RouteUI window when a track is frozen
2014-06-04 02:19:46 +02:00
8b745aa4b4
fix two mysterious problems with stdint types
2014-06-03 16:38:33 -04:00
8fa81c1436
merge onecanvas and cairocanvas branches, and manually resolve conflicts, including rounding in item_to_window() methods
2014-06-03 16:37:53 -04:00
e0533e9dd7
more profound changes to canvas scrolling, in particular find appropriate ScrollGroup for Canvas::{window,canvas}_to_{canvas,window}()
2014-06-03 16:13:12 -04:00
dc349514fa
remove utterly useless unused code
2014-06-03 16:11:24 -04:00
da7a860256
remove useless groups from timebar area, clarify scroll group naming in editor
2014-06-03 16:11:24 -04:00
ee8fb7758a
remove timebar canvas item from markers
2014-06-03 16:10:27 -04:00
5696199daf
remove timebar canvas and just use a single canvas instead. This is just part one - lots of minor fixes to be done
2014-06-03 16:10:27 -04:00
c9f890bd7c
avoid recursing through the entire canvas when scrolling - only scroll explicitly identified ScrollGroups
2014-06-03 16:10:27 -04:00
a551181842
remove incorrect calls to Editor::maybe_autoscroll() from specific Drag classes (autoscroll is handled by the Drag manager)
2014-06-03 16:10:27 -04:00
da67cb92e9
whitespace deletion
2014-06-03 16:10:27 -04:00
6019f06bdf
different approach to independent scrolling, involving ArdourCanvas::ScrollGroup
...
The idea now is that a scroll group item can be added to the canvas which will causes its children to scroll in either or both
directions (horizontal or vertical). There are few complications: the position() of the ScrollGroup is ambiguous depending
on whether you want it with scroll taken into account or not, so Item::canvas_position() was added, which defaults to
the same value as Item::position() but is overridden by ScrollGroup to return the position independent of scrolling. This
method is used when translating between item/canvas/window coordinate systems.
Note that the basic idea is that we MOVE the scroll group when a scroll happens. This mirrors what happens in the GnomeCanvas,
where Nick Mainsbridge came up with a great idea that allowed unification of the time bar and track canvases.
2014-06-03 16:10:27 -04:00
fc9e6651dd
remove unused variable
2014-06-03 16:09:06 -04:00
97109672c7
initial redesign of canvas scrolling to facilitate independent x- and y-axis scrolling of specific groups within the canvas.
...
This commit should cause no change in behaviour, but contains all the code and changes necessary
for the next step
2014-06-03 16:09:06 -04:00
ee6c483d18
non-copy region drag now creates a new track when a region is dragged to the drop zone
2014-06-03 16:07:05 -04:00
7e36d4c9bb
part one of allowing region drag to the bottom (drop-zone) rect of track canvas
2014-06-03 16:06:41 -04:00
d5fa80e01d
fix linking against libasound
2014-06-02 21:09:21 +02:00
8e9b02cfa2
ALSA backend (based on Dummy backend and zita-alsa-pcmi)
2014-06-02 19:23:07 +02:00
b517695256
allow latency measurement at startup
2014-06-02 19:21:15 +02:00
6dfb63bb46
tentative fix for requesting driver+device list from backend
2014-06-02 19:21:15 +02:00
8c9749e42f
merge with master and fix 4 conflicts by hand
2014-06-02 11:32:13 -04:00
3f82052d11
fix display of cd-track-detail UI
2014-06-01 19:48:21 +02:00
ea3918ba2d
disable snap fades to 'other' region (for now)
2014-06-01 00:40:07 +02:00
3b717da783
frankenstein'ed fade+trim cursors
2014-05-31 16:07:38 +02:00
6894b1c7de
initialize variables
2014-05-31 15:18:43 +02:00
12d4989067
show fade+trim handles only if the operation is possible
2014-05-31 15:15:46 +02:00
ef3c27bc1d
session fade-region-visible is for fades - not controls
2014-05-31 14:16:15 +02:00
d6b1a9f6e3
prepare fade+trim cursors (cursor image still missing)
2014-05-31 14:04:41 +02:00
f0536816ab
reduce outline of fade-in/active rectangle to line
2014-05-31 14:00:28 +02:00
1c32e45771
show x-fade-rectangle only when hovering
2014-05-31 14:00:04 +02:00
bfa58e58c3
fix fade+trim handle hover color
2014-05-31 04:51:02 +02:00
9decd39de9
reset [trim] fade handle position if track-height changes
2014-05-31 04:17:47 +02:00
4843c5d5cf
towards region-trims preserving fade duration
2014-05-31 03:53:59 +02:00
08a1409b1f
back port 6576105 from cairocanvas as fix for data loss/file deletion
2014-05-29 16:28:57 -04:00
be575b7945
fix data loss/file deletion caused by mistaken used of Session::source_by_path() to check if an AUDIO filesource with a given path already exists.
...
::source_by_path() was written for MIDI files only. I fixed the call and renamed the two similar functions (one for audio and one for MIDI) to make it more clear.
2014-05-29 16:27:41 -04:00
2d82446f59
set Gtk::RadioAction state on instant.xml load.
...
This should really be done in ArdourDropdown somehow.
Fixes issues introduced at b9708d5
2014-05-29 14:16:15 +02:00
bc523665fe
more new fade icons from Chris Goddard
2014-05-29 13:19:47 +02:00
918a0ac5f9
update x-fade context-menu
2014-05-29 07:49:26 +02:00
7e44308471
replace use of Curve with XFadeCurve.
2014-05-29 03:10:22 +02:00
f226ed086b
update fade icons
2014-05-28 22:23:42 +02:00
d96a6ed247
fix x-fade icons in context menu
2014-05-28 19:46:31 +02:00
034f3dafd7
Revert "cairo sub-surface prototype & example
...
This reverts commit c57fcde78cf1f8f89fcb
2014-05-28 19:13:25 +02:00
24537477c4
fix up operation of Editor::temporal_zoom_to_frame() which had not been updated since samples_per_pixel was changed to an integer (framecnt_t)
2014-05-28 12:18:37 -04:00
f1f8f89fcb
exercise subsurface rendering for x-fade curves
2014-05-28 17:38:42 +02:00
d9b7c8b864
for trx, use the primary clock for verbose cursor units
2014-05-27 13:26:49 -04:00
4cf93fffc2
x-fade drawing rework, part one
2014-05-27 16:37:01 +02:00
cadf07e362
global one-time setup of waveform preferences.
...
see note in previous commit.
2014-05-27 16:37:01 +02:00
a8f11b6004
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-05-27 16:37:01 +02:00
a0037ee2d8
fixup freeze operation.
...
since rev. 1e3a955
2014-05-26 07:00:00 +02:00
58d6c39b3d
fix sensitivity of engine dialog driver_combo.
2014-05-24 20:10:14 +02:00
b49e398250
Visual tweaks to Soundcloud panel
...
Re-arrange the items in the Soundcloud panel into a more sensible order &
arrangement, and add a (not-yet functional) tick-box to set the uploaded
files to be downloadable.
2014-05-23 18:45:40 +01:00
84bcf59812
Better names for Soundcloud-related members of ExportHandler
...
Rename the Soundcloud-related members of ExportHandler to all begin with
soundcloud_, and rename a couple of members of SoundcloudExportSelector
too for consistency.
2014-05-23 18:33:43 +01:00
9daab3db84
Make Soundcloud upload applicable to any export format.
...
Add soundcloud_upload property back into ExportFormatSpecification, but
instead of making it settable in the export format specification dialog,
add a tick-box in each tab of ExportFileNotebook to allow setting it.
2014-05-23 18:14:37 +01:00
2f6debf0d2
Remove Soundcloud upload from export format specification
...
Remove the Soundcloud upload property from export formats - it doesn't
belong there, since it's a thing which can apply (or not) to any format
preset.
2014-05-23 17:42:35 +01:00
8ebd8a99ab
Fix MS-DOS line endings
...
Somehow sfdb_freesound_mootcher.cc has ended up with MS-DOS style line
endings again. Put it back to UNIX-style.
2014-05-23 17:42:34 +01:00
3d2b8f1d84
meterbridge: don't include disk/input buttons on busses; fixes #5935
2014-05-23 00:41:43 +02:00
b0842d29de
fix binding name for set-tempo-from-region
2014-05-22 14:11:02 -04:00
0de7c8920b
Merge branch 'mingw-updates' of https://github.com/mojofunk/ardour into cairocanvas
2014-05-19 17:19:43 -04:00
5399425f53
Merge branch 'export-dialog' into cairocanvas
...
Fix merge conflicts in:
gtk2_ardour/export_range_markers_dialog.cc
gtk2_ardour/wscript
libs/ardour/ardour/export_handler.h
libs/ardour/system_exec.cc
libs/pbd/pbd/system_exec.h
libs/pbd/system_exec.cc
2014-05-19 20:54:36 +01:00
c464feb6aa
indent in wscript uses spaces
2014-05-19 20:50:37 +01:00
0cecd2f7d5
Use libardour SystemExec wrapper in gtk2_ardour
...
#include ardour/system_exec.h where SystemExec is used in gtk2_ardour to
get the libardour wrapper class, and remove the include completely where
it's no longer required.
2014-05-19 19:52:32 +01:00
529a31bde7
remove unnecessary and wierd constant for bottom rect (drop zone) of track canvas
2014-05-19 14:00:36 -04:00
1e907cedc5
comment tweak
2014-05-19 14:00:36 -04:00
8fd69776ea
adding a new track via copy-region-drag now works (and shares code with the non-copy case
2014-05-19 14:00:36 -04:00
00c7abe926
non-copy region drag now creates a new track when a region is dragged to the drop zone
2014-05-19 14:00:36 -04:00
356c1013ae
change return type of Editor::axis_view_from_route()
2014-05-19 14:00:36 -04:00
e8d3c16187
remove unused variable
2014-05-19 14:00:36 -04:00
a8c56ff927
part one of allowing region drag to the bottom (drop-zone) rect of track canvas
2014-05-19 14:00:36 -04:00
ccdb047a0a
don't load selected session if other-project is chosen:
...
1) Open Ardour
2) Select project from recent list
3) "Open Other" project
4) project from (2) is opened instead of the one chosen at (3)
2014-05-16 23:16:03 +02:00
4ece16be8e
replace gettimeofday() with g_get_monotonic_time()
2014-05-16 18:13:08 +02:00
Devin J. Pohly
e7b3020294
fix rounding error in the min:sec ruler
...
When zoomed in to the millisecond level, the framerate was being divided
by 1000 as an integer to generate a ruler tick interval, which doesn't
work so well at things like 44100 or 88200. Instead, just count this
value in milliseconds, dividing by 1000 when we are done.
This was purely a display issue - the grid was in the correct place.
2014-05-14 09:08:43 -04:00
Devin J. Pohly
db48bee3c7
fix major/minor ticks on min:sec ruler
...
All ticks from 0:00.000 to 0:00.999... were major, and everything after
was minor, instead of the correct distribution.
2014-05-14 09:08:14 -04:00
Devin J. Pohly
32f62beb90
fix major/minor ticks on min:sec ruler
...
All ticks from 0:00.000 to 0:00.999... were major, and everything after
was minor, instead of the correct distribution.
2014-05-14 08:36:03 -04:00
Devin J. Pohly
3b4b848d5a
fix rounding error in the min:sec ruler
...
When zoomed in to the millisecond level, the framerate was being divided
by 1000 as an integer to generate a ruler tick interval, which doesn't
work so well at things like 44100 or 88200. Instead, just count this
value in milliseconds, dividing by 1000 when we are done.
This was purely a display issue - the grid was in the correct place.
2014-05-14 08:35:43 -04:00
8a796bd5e1
Use Glib::usleep in Editor::timefx_thread on Windows
2014-05-14 09:47:40 +10:00
b768d6c39d
Include windows.h for Registry access related API
2014-05-14 09:47:40 +10:00
ce5744ae51
Fix collision between keyword interface used in glibmm and windows headers
2014-05-14 09:47:40 +10:00
592a21db5f
Oops - minor spelling corrections
2014-05-10 08:41:49 +01:00
b377bc44c2
Bug fix imported from Mixbus2 (SVN r11448)
...
If we couldn't figure out a plugin creator's name, either use as much of it as we could determine or mark the creator as 'Unknown'
2014-05-10 08:32:14 +01:00
349f66f413
Fix region content drag direction
...
Fix <Control>+drag in bottom of region to move the region contents in the
expected direction.
2014-05-07 19:38:22 +01:00
9a35f73b9e
Fix undo of layer-changing region drags
...
Move clear_changes() of the playlist on which a region has been dragged
before calling set_layer() on that playlist, so that undo of region drags
in layered mode undoes any layer changes too.
Should fix #5904
2014-05-07 19:38:07 +01:00
56af57d682
shift-modifier during trim dragging causes region to jump to original position (anchored at start or end, depending on trim type)
2014-05-07 12:13:34 -04:00
