Commit Graph

6801 Commits

Author SHA1 Message Date
Robin Gareus
2e88935bbf add GUI for midi-device settings (and properly indent the code) 2014-06-13 12:01:55 +02:00
Colin Fletcher
be7da2e952 Fix opening of recent sessions with mismatched directory & file names
When populating the list of recent sessions, and there's only one session
file in the session folder, don't assume that the base name of the session
file is the same as the name of the session directory.

Allows loading sessions that were created with trailing spaces in their
names from the recent sessions list, and also helps in the case that the
session file (or directory) was renamed.

There are actually two implementations of the 'recent sessions' chooser:
this applies to both. I suppose a useful project one of these days
would be to unify the two...
2014-06-12 23:20:06 +01:00
Colin Fletcher
83ce8dde6b Prevent creation of session directory with leading or trailing space. 2014-06-12 23:20:06 +01:00
Colin Fletcher
60349bcee6 Show Soundcloud credentials and upload options only when required
A slightly hacky patch to make the Soundcloud username & password and the
upload options only become visible when at least one export format is
chosen for upload to Soundcloud.

I think that changing ExportDialog::soundcloud_selector to a
boost::shared_ptr is the right thing to do, but I must confess to having
only a hazy understanding of what boost::scoped_ptr was doing in the first
place.

Also it feels a bit wrong to be passing a pointer to ExportDialog's
SoundcloudExportSelector around, but I can't (for the moment, at least)
think of any better way to affect its visibility from inside
ExportFileNotebook.
2014-06-12 23:20:06 +01:00
Colin Fletcher
d5cbb098da Add #include guards to soundcloud_export_selector.h 2014-06-12 23:20:06 +01:00
Colin Fletcher
a82aba8581 Actually pass Soundcloud downloadable flag to export handler 2014-06-12 23:20:06 +01:00
Colin Fletcher
cc2e6aeac3 Remove unused function
Remove the unused ExportFileNotebook::get_nth_format_name()
2014-06-12 23:20:05 +01:00
Colin Fletcher
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
Colin Fletcher
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
Paul Davis
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
Paul Davis
684d45c0cc restored track height adjustment using alt-scroll on track headers 2014-06-12 17:21:41 -04:00
Paul Davis
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
Paul Davis
6958409187 remove no-longer-used code 2014-06-12 16:18:38 -04:00
Paul Davis
85e2c60673 add back click behaviour for canvas rulers, and also cursor enforcement 2014-06-12 16:06:31 -04:00
Paul Davis
ea355bfe15 add canvas rulers event dispatch and reinstate scrolling behaviour 2014-06-12 15:58:05 -04:00
Paul Davis
551014240a drag handles no longer exist as distinct item types (failed experiment) 2014-06-12 14:51:51 -04:00
Paul Davis
887e75260d use new ArdourCanvas::Ruler constructor 2014-06-12 10:35:32 -04:00
Paul Davis
0762708d83 add new canvas vars for rulers 2014-06-12 10:32:34 -04:00
Paul Davis
79c30ab766 make rulers color-sensitive (e.g. theme manager editable, etc) 2014-06-12 01:07:58 -04:00
Paul Davis
b2ee6b4344 add new default colors for canvas rulers 2014-06-12 01:07:58 -04:00
Paul Davis
95fc5ab0a8 removed unused rule GTK widget style definition 2014-06-12 01:07:58 -04:00
Paul Davis
3d81944b1d remove unused GTK style 2014-06-12 01:07:58 -04:00
Paul Davis
0ab69cb8c7 OS X specific cleanup after canvas ruler introduction 2014-06-12 00:19:42 -04:00
Paul Davis
9461fcb271 remove header file includes of now-removed gtk custom ruler 2014-06-12 00:18:58 -04:00
Paul Davis
4b07d01532 remove header file includes of now-removed gtk custom ruler 2014-06-12 00:18:15 -04:00
Paul Davis
6c9f4e9598 final ruler file removal 2014-06-12 00:01:30 -04:00
Paul Davis
43e2baf54e remove gtk ruler widget implementation - no longer in use 2014-06-12 00:01:06 -04:00
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
144033e55c do not allow canvas cursor changes while a drag is in progress 2014-06-10 16:46:09 -04:00
Paul Davis
b9f7aeb61e first pass an alternate cursor set (updates expected soon) 2014-06-10 14:40:10 -04:00
Paul Davis
c56d309bd7 make the icon set selector actually do something 2014-06-10 14:39:28 -04:00
Paul Davis
324ef3b085 add icon set selector to theme manager 2014-06-10 14:39:28 -04:00
Paul Davis
839a0063f2 add ::get_icon_sets() to utils 2014-06-10 14:39:28 -04:00
Paul Davis
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
Paul Davis
eca6c9f998 remove ambiguous use of Rect (on OS X) 2014-06-10 11:00:15 -04:00
Paul Davis
3f38a602cc remove instances of RGBA_TO_UINT() macro from region_view.cc 2014-06-09 23:42:12 -04:00
Paul Davis
96fbdd4bee remove instances of RGBA_TO_UINT() macro from audio_region_view.cc 2014-06-09 23:39:07 -04:00
Paul Davis
65ef1a8b8a remove more unusued color members from TimeAxisViewItem 2014-06-09 23:33:14 -04:00
Paul Davis
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
Paul Davis
c8ab1aaf7d use Canvas::LineSet for tempolines rather than N different Canvas::Line items plus a cache 2014-06-09 15:39:57 -04:00
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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