fix merge conflict from master

diff --cc gtk2_ardour/ardour_ui.cc
Simple merge

diff --cc gtk2_ardour/ardour_ui.h
Simple merge

diff --cc gtk2_ardour/ardour_ui_dialogs.cc
Simple merge

diff --cc gtk2_ardour/editor_videotimeline.cc
Simple merge

diff --cc gtk2_ardour/export_video_dialog.cc
Simple merge

diff --cc gtk2_ardour/mixer_strip.cc
Simple merge

diff --cc gtk2_ardour/processor_box.cc
Simple merge

diff --cc gtk2_ardour/route_ui.cc
Simple merge

diff --cc gtk2_ardour/sfdb_ui.cc
Simple merge

diff --cc gtk2_ardour/transcode_ffmpeg.cc
Simple merge

diff --cc gtk2_ardour/transcode_video_dialog.cc
Simple merge

diff --cc gtk2_ardour/utils.cc
Simple merge

diff --cc gtk2_ardour/video_server_dialog.cc
Simple merge

diff --cc libs/ardour/ardour/session.h
Simple merge

diff --cc libs/ardour/audio_unit.cc
Simple merge

diff --cc libs/ardour/audiosource.cc
index e224186bd29890ac825df14cb3288ff11ac9ceef,84a5b687f969a84bbcfee89ac4fcafe82ab450de..65540d4e3dd153a8b00e9caa9068f36a143ea0bb
--- 1/libs/ardour/audiosource.cc
--- 2/libs/ardour/audiosource.cc
+++ b/libs/ardour/audiosource.cc
@@@ -189,9 -182,9 +189,9 @@@ AudioSource::touch_peakfile (
        struct utimbuf tbuf;
  
        tbuf.actime = statbuf.st_atime;
-       tbuf.modtime = time ((time_t) 0);
+       tbuf.modtime = time ((time_t*) 0);
  
 -      utime (peakpath.c_str(), &tbuf);
 +      g_utime (peakpath.c_str(), &tbuf);
  }
  
  int

diff --cc libs/ardour/ladspa_plugin.cc
Simple merge

diff --cc libs/ardour/lv2_plugin.cc
Simple merge

diff --cc libs/ardour/midi_track.cc
Simple merge

diff --cc libs/ardour/route.cc
Simple merge

diff --cc libs/ardour/session.cc
Simple merge

diff --cc libs/ardour/session_midi.cc
Simple merge

diff --cc libs/ardour/wscript
Simple merge

diff --cc libs/pbd/pbd/ringbuffer.h
Simple merge