13
0
livetrax/libs/ardour
John Emmas 19bb2b33a8 Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows
Conflicts (hopefully resolved):
	gtk2_ardour/marker.cc
	gtk2_ardour/midi_region_view.h
	gtk2_ardour/region_gain_line.h
	gtk2_ardour/utils.cc
	gtk2_ardour/video_image_frame.cc
	gtk2_ardour/wscript
	libs/backends/jack/wscript
2013-09-21 09:17:25 +01:00
..
ardour Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows 2013-09-21 09:17:25 +01:00
msvc
po
test
amp.cc
analyser.cc
async_midi_port.cc
audio_buffer.cc
audio_diskstream.cc
audio_library.cc
audio_playlist_importer.cc
audio_playlist_source.cc
audio_playlist.cc
audio_port.cc
audio_region_importer.cc
audio_track_importer.cc
audio_track.cc
audio_unit.cc
audioanalyser.cc
audioengine.cc
audiofile_tagger.cc
audiofilesource.cc
audioregion.cc
audiosource.cc Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows 2013-09-21 09:17:25 +01:00
auditioner.cc
auto_bundle.cc
automatable.cc
automation_control.cc
automation_list.cc
automation_watch.cc
automation.cc
backend_search_path.cc
beats_frames_converter.cc
broadcast_info.cc
buffer_manager.cc
buffer_set.cc
buffer.cc
bundle.cc
butler.cc
caimportable.cc
capturing_processor.cc
chan_count.cc
chan_mapping.cc
ChangeLog
configuration.cc
control_protocol_manager.cc
control_protocol_search_path.cc
coreaudiosource.cc
cycle_timer.cc
data_type.cc
debug.cc
default_click.cc
delivery.cc remove another naming that refers to JACK 2013-08-09 13:27:05 -04:00
directory_names.cc
diskstream.cc
element_import_handler.cc
element_importer.cc
enums.cc
event_type_map.cc
export_channel_configuration.cc
export_channel.cc
export_failed.cc
export_filename.cc
export_format_base.cc
export_format_manager.cc
export_format_specification.cc
export_formats_search_path.cc
export_formats.cc
export_graph_builder.cc
export_handler.cc
export_multiplication.cc
export_preset.cc Fix broken whitespace (no functional changes). 2011-04-04 22:46:48 +00:00
export_profile_manager.cc
export_status.cc
export_timespan.cc
file_source.cc
filename_extensions.cc
filesystem_paths.cc
filter.cc
find_session.cc
gettext.h
globals.cc
graph.cc Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows 2013-09-21 09:17:25 +01:00
graphnode.cc
i18n.h
iec1ppmdsp.cc
iec2ppmdsp.cc
import.cc
instrument_info.cc
internal_return.cc
internal_send.cc
interpolation.cc fix vari-speed phase (when used for calculation only) 2013-08-27 20:55:15 +02:00
io_processor.cc
io.cc
jack_slave.cc
kmeterdsp.cc
ladspa_plugin.cc
ladspa_search_path.cc
linux_vst_info_file.cc
linux_vst_support.cc
location_importer.cc
location.cc
ltc_slave.cc Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows 2013-09-21 09:17:25 +01:00
lv2_bundled_search_path.cc
lv2_evbuf.c
lv2_evbuf.h
lv2_plugin.cc
lxvst_plugin.cc
meter.cc
midi_automation_list_binder.cc
midi_buffer.cc
midi_clock_slave.cc
midi_diskstream.cc Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows 2013-09-21 09:17:25 +01:00
midi_model.cc
midi_patch_manager.cc
midi_patch_search_path.cc
midi_playlist_source.cc
midi_playlist.cc
midi_port.cc
midi_region.cc
midi_ring_buffer.cc
midi_source.cc
midi_state_tracker.cc
midi_stretch.cc
midi_track.cc
midi_ui.cc
midiport_manager.cc
mix.cc
monitor_processor.cc
mtc_slave.cc
mtdm.cc
mute_master.cc
onset_detector.cc
operations.cc
pan_controllable.cc
pannable.cc
panner_manager.cc
panner_search_path.cc
panner_shell.cc
panner.cc
pcm_utils.cc
pi_controller.cc
playlist_factory.cc
playlist_source.cc
playlist.cc
plugin_insert.cc
plugin_manager.cc
plugin.cc
port_insert.cc
port_manager.cc
port_set.cc
port.cc
process_thread.cc
processor.cc
progress.cc
quantize.cc
rb_effect.cc
rc_configuration.cc
rdff.c
rdff.h
recent_sessions.cc
region_factory.cc
region.cc fix merge conflicts with master 2013-09-14 16:42:40 -04:00
resampled_source.cc 'libs/ardour' - Platform specific changes and includes 2013-08-04 19:03:32 +01:00
return.cc
reverse.cc
route_graph.cc
route_group_member.cc
route_group.cc
route.cc
run-profiling.sh
run-session-tests.sh
run-tests.sh
send.cc
session_butler.cc
session_click.cc
session_command.cc
session_configuration.cc
session_directory.cc
session_events.cc
session_export.cc
session_handle.cc
session_jack.cc
session_ltc.cc
session_metadata.cc
session_midi.cc
session_object.cc
session_playlists.cc
session_process.cc
session_rtevents.cc
session_state_utils.cc
session_state.cc
session_time.cc
session_transport.cc
session_vst.cc
session.cc
slave.cc
smf_source.cc
sndfile_helpers.cc
sndfileimportable.cc
sndfilesource.cc
source_factory.cc
source.cc
speakers.cc
sse_functions_64bit.s
sse_functions_xmm.cc
sse_functions.s
st_pitch.cc
st_stretch.cc
strip_silence.cc
tape_file_matcher.cc
template_utils.cc
tempo_map_importer.cc
tempo.cc
test-env.sh
thread_buffers.cc
ticker.cc
track.cc
transient_detector.cc
unknown_processor.cc
uri_map.cc
user_bundle.cc
utils.cc
vst_plugin.cc
vumeterdsp.cc
windows_vst_plugin.cc
worker.cc
wscript Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows 2013-09-21 09:17:25 +01:00