Commit graph

7193 commits

Author SHA1 Message Date
Devin J. Pohly
90170ed4fb 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-08-16 16:38:35 -04:00
Tim Mayberry
8bea659f44 Use Glib::usleep in Editor::timefx_thread on Windows 2014-08-16 16:36:55 -04:00
Tim Mayberry
105d203427 Include windows.h for Registry access related API 2014-08-16 16:36:48 -04:00
Tim Mayberry
57ad9785f3 Fix collision between keyword interface used in glibmm and windows headers 2014-08-16 16:36:42 -04:00
John Emmas
074b1a21a3 Oops - minor spelling corrections 2014-08-16 16:36:38 -04:00
John Emmas
76a4a06b1c 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-08-16 16:36:27 -04:00
Colin Fletcher
338ff210f9 Ripple mode: tidy up
Remove a load of debug output and dead code.
Move implementation of RegionRippleDrag::y_movement_allowed() out of
header into .cc file.
2014-08-16 16:36:08 -04:00
Colin Fletcher
80f04cc298 Ripple mode: basic implementation
Add a value for Ripple to EditMode enum.

Add Ripple edit mode to edit mode dropdown, by adding it to the
Editor::build_edit_mode_menu() helper function, and remove the old code that
added items to the (now unused) Editor::edit_mode_strings.

Add the regions that should be affected by the drag to RegionDrag::_views so
that the drag carries them along automatically.

Use a copy of the RegionList in Playlist::core_ripple(), since bad things
happen when iterating over regions and they get moved around in the list.

Handle rippling in removal of regions from playlist.

When dragging in ripple mode, exclude all regions that lie before the
original start position of the selected regions being dragged from
rippling: this is what Mixbus does.

Make editor dragging respect snap-to settings, by using the existing
compute_x_delta() function, which did almost the right thing. Move setting
of _last_frame_position out of that function so all ripple-dragged regions
can move.

Ripple when dragging from region list: even though Mixbus doesn't do this, it
seems like a good idea.

Prevent multi-track selection being dragged across tracks, by making
RegionMotionDrag::y_movement_allowed() virtual, and overriding it in
RegionRippleDrag to forbid dragging of selections containing regions on more
than one track to dofferent tracks in ripple mode.

Remember which TimeAxisView a ripple-mode drag that's allowed cross-track
drags started from, so that the effect of rippling regions after any region
that's dragged off that track can be undone.
2014-08-16 16:36:03 -04:00
Colin Fletcher
597b27a222 Splice mode: fix comment typo 2014-08-16 16:35:56 -04:00
Colin Fletcher
a7af42716f Fix region content drag direction
Fix <Control>+drag in bottom of region to move the region contents in the
expected direction.
2014-08-16 16:35:40 -04:00
Colin Fletcher
fca8443d4b 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-08-16 16:35:34 -04:00
Paul Davis
83a6d2a4dc shift-modifier during trim dragging causes region to jump to original position (anchored at start or end, depending on trim type) 2014-08-16 16:35:28 -04:00
Adrian Knoth
1c832cdd89 Add ComboOption configuration for default-fade-shape
Let the user choose the preferred default fade shape in the editor
section of the preference menu.
2014-08-16 16:30:23 -04:00
Paul Davis
6a63ae3550 if using the audio/MIDI setup dialog because there are >1 backends, but the chosen backend is not under our control (i.e. JACK), remember to start it before returning from the dialog 2014-08-16 16:29:55 -04:00
Paul Davis
38ec61e640 change location marker ruler text for get_trx() == true case 2014-08-16 16:16:13 -04:00
Paul Davis
a7f5d7a94d correctly set up ruler preferences for get_trx() == true case 2014-08-16 16:16:07 -04:00
Robin Gareus
13dcc6eea0 script to run ardour under callgrind 2014-08-16 16:15:25 -04:00
Paul Davis
2627328fd5 remove two more unnecessary instances of os.path.join in install path definitions
Conflicts:
	gtk2_ardour/wscript
2014-08-16 16:14:46 -04:00
Paul Davis
e08ec37f69 "sequence regions" operation (remove space between selected regions) added, c/o Thomas Brand 2014-08-16 16:10:38 -04:00
Damien Zammit
f77d76ba9d Fixed problem where importing invalid midi files caused crash. 2014-08-16 16:02:14 -04:00
Robin Gareus
6b750f5e46 skeleton dummy audio-engine
Conflicts:
	libs/backends/wscript
2014-08-16 16:02:02 -04:00
Carl Hetherington
88bb67e101 Fix some capitalisation in the preferences dialog. 2014-08-16 16:01:00 -04:00
Robin Gareus
95bd979c1b NOOP, no whitespace at EOF 2014-08-16 16:00:54 -04:00
Robin Gareus
ae2a7279d9 fix packing of LXVST UIs (minimum size, border) 2014-08-16 16:00:48 -04:00
Robin Gareus
90806e3448 try get_win_special_folder() for harvid & xjadeo (if registry fails) 2014-08-16 16:00:41 -04:00
Robin Gareus
5e6311c5f0 query windows registry for xjadeo & harvid path 2014-08-16 16:00:26 -04:00
Robin Gareus
3640bf3a76 fix xjadeo on windows (directly use xjadeo.exe) 2014-08-16 16:00:21 -04:00
Robin Gareus
6b2aae5668 dynamically adjust open-video-dialog layout depending on configuration 2014-08-16 16:00:17 -04:00
Robin Gareus
33029e6433 increase LXVST GUI idle call regularity, aim for 25Hz 2014-08-16 16:00:12 -04:00
Robin Gareus
1660ac7f54 vtl: fix leftover typo in request URL (noop) 2014-08-16 16:00:07 -04:00
Robin Gareus
780243179b update GUI while waiting for video server to respond 2014-08-16 15:59:23 -04:00
Robin Gareus
65ffc7cdbd add missing "Path" to label, re-order VST preferences 2014-08-16 15:59:18 -04:00
John Emmas
7052567ae6 Save any cached fonts into our dedicated cache folder (msvc)
(modifies the appropriate entry in 'fonts.conf')
2014-08-16 15:59:11 -04:00
Colin Fletcher
f74ab3f21f Move system_exec from gtk2_ardour/ to libs/pbd/
Conflicts:
	gtk2_ardour/ardour_ui.cc
	gtk2_ardour/transcode_ffmpeg.h
	gtk2_ardour/video_monitor.h
	libs/pbd/system_exec.cc
2014-08-16 15:11:42 -04:00
Colin Fletcher
17b0f6d336 Rudimentary post-processing of exported files.
Export format contains a string to be passed to system() after expanding
%1, %2, & %3 via string_compose() to the full path & filename, containing
directory, and basename respectively. No error-checking or any niceties
like that - real programmers will of course always type the command
correctly, and know to watch Ardour's standard output for the results...
2014-08-16 15:06:00 -04:00
Colin Fletcher
afd67483b3 Update export format when 'upload to soundcloud' changes. 2014-08-16 15:05:07 -04:00
Colin Fletcher
ac494effbe cherry pick a3465ff5d3 from ardour-cc and resolve conflicts 2014-08-15 23:45:37 -04:00
Colin Fletcher
b92110b4cc cherry-pick 15b4ebbb07 from ardour-cc and hand resolve conflicts 2014-08-15 22:27:10 -04:00
Colin Fletcher
db47121fc6 soundcloud export: use tabs for indentation. 2014-08-15 22:25:02 -04:00
Colin Fletcher
38d2b121b0 soundcloud export: fix MS-DOS line endings. 2014-08-15 22:24:12 -04:00
Colin Fletcher
7b08218cce soundcloud upload - initial copy of files from Mixbus. 2014-08-15 22:24:01 -04:00
Colin Fletcher
467f762e3b Fix comment typos. 2014-08-15 22:23:52 -04:00
Colin Fletcher
0fd4faa44f cherry-pick ebd00236f8 from ardour-cc 2014-08-15 22:23:36 -04:00
Colin Fletcher
cded9b6f42 Show ranges in more sensible order in export dialog.
Show ranges in order in which they appear on the timeline in export dialog,
but always show the session range first.
2014-08-15 22:21:11 -04:00
Paul Davis
16afdf26d6 fix missed detail of previous cherry pick, which changed visible_tracks_selector into ArdourDropdown 2014-08-15 22:15:38 -04:00
Ben Loftis
cbddc02511 cherry-pick 6bcee4e9 then manually resolve conflicts (via git rerere) 2014-08-15 22:07:59 -04:00
Paul Davis
1a9ffac32d add forgotten new file dialog API implementation file for *nix 2014-08-15 22:06:42 -04:00
harrison
c7d4ce1399 cherry-pick b9708d5f6b, then manually resolve conflicts (thanks git rerere) 2014-08-15 22:06:18 -04:00
Ben Loftis
b5222012c0 files for ArdourMenu 2014-08-15 22:03:23 -04:00
Paul Davis
4262f25fa9 fix typo in hand resolution of merging new file dialog API 2014-08-15 21:55:15 -04:00