Paul Davis
94d2105f84
manually correct a borked manual merge conflict resolution
2014-08-17 18:36:07 -04:00
Tim Mayberry
dbcc1f1d39
Rename PBD::find_file_in_search_path to just PBD::find_file
...
saves a bit of typing and not necessary if you look at how it is used.
Conflicts:
gtk2_ardour/about.cc
gtk2_ardour/session_dialog.cc
libs/pbd/system_exec.cc
2014-08-17 18:36:02 -04:00
Tim Mayberry
093fb77b88
Use PBD::find_files_matching_pattern instead of other variations
2014-08-17 18:12:40 -04:00
Tim Mayberry
1a4fdf0b22
Add a variation of PBD::find_files_matching_pattern for convenience
2014-08-17 18:12:34 -04:00
Tim Mayberry
a6c2609068
Add new function PBD::find_files_matching_pattern
...
This new function is intended to replace the three existing
PBD::find_matching_files_* functions.
The order of parameters matches find_files_matching_regex and
find_files_matching_filter
2014-08-17 18:12:26 -04:00
Tim Mayberry
c126e8cc45
Change PBD::find_files_matching_regex and PBD::find_files_matching_filter to take a Searchpath
2014-08-17 18:12:19 -04:00
Tim Mayberry
ce36eee9ab
Reimplement PBD::find_files_matching_filter using SearchPath and get_directory_contents
2014-08-17 18:12:14 -04:00
Tim Mayberry
9597f5468d
Remove limit parameter from PBD::find_files_matching_regex
...
This limit was not used or documented. The same functionality can be
performed when iterating through the results.
2014-08-17 18:12:09 -04:00
Tim Mayberry
ef6d6816aa
Remove parameters from PBD::find_files_matching_regex
...
The only users of this API always used the same options so just remove
them.
2014-08-17 18:12:04 -04:00
Tim Mayberry
4ffa970135
Change PBD::get_files_in_directory to return full paths in result
...
get_files_in_directory uses get_directory_contents internally now
2014-08-17 18:11:59 -04:00
Tim Mayberry
1e442feb53
Add PBD::get_directory_contents to pbd/file_utils.h
2014-08-17 18:11:52 -04:00
Tim Mayberry
7bb2c88963
GLib functions for listing directory contents don't include "." or ".." entries
2014-08-17 18:11:46 -04:00
Paul Davis
cc2987d320
expose Gtk::HScale member of OptionEditor::HSliderOption
2014-08-17 18:11:19 -04:00
Ben Loftis
17b601a9f3
last piece of scroll-wheel checkin, oops
2014-08-17 18:10:21 -04:00
Ben Loftis
d0f41a4f5e
add scroll wheel handler to canvas
2014-08-17 18:10:15 -04:00
Robin Gareus
130023ff7d
fix f6aaa16 (boost shared pointer)
2014-08-17 18:07:43 -04:00
Paul Davis
d893b493d6
return of the zero line
2014-08-17 18:07:37 -04:00
Paul Davis
1b58dd6ecf
revert drawing of rectified waves back to previous approach since it (might be) slightly more efficient and is simpler to understand; add comments
2014-08-17 18:07:32 -04:00
Paul Davis
87cc9f7d4f
completely rethink waveform rendering (again)
...
There are 3 possible components to draw at each x-axis position: the waveform "line", the zero line and an outline/clip indicator.
We have to decide which of the 3 to draw at each position, pixel by pixel. This makes the rendering less efficient but it is
the only way I can see to do this correctly.
2014-08-17 18:07:24 -04:00
Paul Davis
9dd5e2769b
reset time axis view item name text color when selected status changes
2014-08-17 18:07:19 -04:00
Paul Davis
e0bceb3e4e
fix logic error that meant one side of the waveform outline is not drawn; draw zero line before outline, for better effects with low amplitude waves
2014-08-17 18:07:14 -04:00
Robin Gareus
887dc842ef
don't let enumerated device list strings go out of scope.
2014-08-17 18:07:10 -04:00
Robin Gareus
f56564258e
statically allocate midi-options
...
fixes possible segfault when the data in the vector
goes out of scope due to RVO.
2014-08-17 18:07:04 -04:00
Robin Gareus
8798f8d88a
for backends w/o control, save a fake state with only the "active" attribute.
...
This makes ardour start directly with external jack without asking if jack
was previously used. It also retains jackd settings if jackd was previously
started by ardour.
2014-08-17 18:07:00 -04:00
Paul Davis
71e3f4a72c
when exporting regions, use ::legalize_for_path() on the playlist name so that filenames are legal.
...
Also, use Glib::build_filename() rather than hardcoding / as the separator. How did this escape the search for this error?
Conflicts:
libs/ardour/session.cc
2014-08-17 18:06:51 -04:00
Robin Gareus
0df12b78a3
en/disable internal send+returns with tracks en/disable.
2014-08-17 18:05:20 -04:00
Paul Davis
437a655026
fix broken manually merge conflict fix from earlier cherry-pick
2014-08-17 18:04:58 -04:00
Paul Davis
8d84c21e73
#if 0-out a method not used in Tracks rather than remove it, to make merges with Ardour easier
2014-08-17 18:04:40 -04:00
Paul Davis
9ebbcdde09
Canvas::Group was removed
2014-08-17 18:04:05 -04:00
Robin Gareus
b130dc032e
Do not allow to de/activate a track while the transport is rolling.
...
roll_delay and latency are only re-calculated when the transport is stopped.
de/activating a track is also not RT-safe.
Conflicts:
gtk2_ardour/mixer_strip.cc
gtk2_ardour/route_time_axis.cc
2014-08-17 17:53:50 -04:00
Paul Davis
d003eda9c3
button click (release, to be precise) within the canvas drop zone cancels all object and track selections
2014-08-17 17:44:34 -04:00
Robin Gareus
1a68b43ee8
fix latency-measurement dialog back-button.
2014-08-17 17:44:29 -04:00
Robin Gareus
c18826b858
ALSA-backend: dedicated Midi-Buffer n-periods (only use for HW output)
2014-08-17 17:44:23 -04:00
Paul Davis
28fdc71d70
more canvas refactoring.
...
Remove Canvas::Layout, use Canvas::Container for the same purpose, move child-rendering into Item::render_children() so that it
could theoretically be used by any derived type.
2014-08-17 17:44:17 -04:00
Paul Davis
72ab6f6fe5
add missing new files for canvas redesign
2014-08-17 17:44:12 -04:00
Paul Davis
f11ad4f901
explicitly qualify cast to ArdourCanvas::Container so that it works.
...
I assume that gcc is failing to complain about ambiguity with Gtk::Container even though there should
really be no ambiguity
2014-08-17 17:43:51 -04:00
John Emmas
c7240fa01d
Rename all 3 backends for the MSVC sln file
2014-08-17 17:43:46 -04:00
John Emmas
32503e1585
Rename dummy backend to match Tim's name
2014-08-17 17:43:27 -04:00
John Emmas
53d387398b
Rename jack backend to match Tim's name
2014-08-17 17:43:21 -04:00
John Emmas
211bfda0a5
Rename waves backend to match Tim's name
2014-08-17 17:43:14 -04:00
Paul Davis
3be5f658ea
use newly factored canvas in gtk2_ardour
2014-08-17 17:43:03 -04:00
Paul Davis
98aa604aa0
refactor Canvas so that all Items have children; add Container abstract base class; rename Group as "Layout" and retain only drawing semantics
2014-08-17 17:42:59 -04:00
Robin Gareus
eeca22c67a
virtual abstraction of Alsa Raw+Seq
2014-08-17 17:42:45 -04:00
Robin Gareus
048d127208
prepare ALSA sequencer
2014-08-17 17:42:39 -04:00
Robin Gareus
35b5f853cd
alsa sequencer device/port listing
2014-08-17 17:42:34 -04:00
Paul Davis
dc757ab7c1
fix conflicts caused by XML-ization of old 2-canvas design
2014-08-17 17:40:48 -04:00
Paul Davis
af3143ba4a
manually catch up on API changes in libs/ardour/import.cc
2014-08-17 17:40:19 -04:00
Paul Davis
157512cce3
fix missed API changes in editor dragging code
2014-08-17 17:39:50 -04:00
Paul Davis
4af36f221d
new API for Session::possible_states() required minor changes in session dialog logic
2014-08-17 17:39:19 -04:00
Paul Davis
2219436888
clean up un-fixed merge conflict
2014-08-17 17:38:48 -04:00
