13
0
Commit Graph

6706 Commits

Author SHA1 Message Date
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: If after session-load some
radio-item other than the first one is set active, it is
impossible to switch to the first.
e.g. set "Snap to Grid", Save Session, Load Session, trying to
switch to "Snap to None" fails until another mode is selected first.
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 c57fcde78c.
and also     commit f1f8f89fcb.
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, Session::write_one_track() gets and drops
thread buffers.
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