merge with master and fix 4 conflicts by hand

diff --cc gtk2_ardour/ardev_common.sh.in
index d65a287701b3c83fa471417a7d253328c07c40cf,def4d4a456c31b9e083d87ca38d337482d19dc46..e5a424af6aeab773444e7325145932687121d04a
--- 1/gtk2_ardour/ardev_common.sh.in
--- 2/gtk2_ardour/ardev_common.sh.in
+++ b/gtk2_ardour/ardev_common.sh.in
@@@ -17,7 -17,8 +17,8 @@@ export ARDOUR_DATA_PATH=$TOP:$TOP/build
  export ARDOUR_MIDIMAPS_PATH=$TOP/midi_maps:.
  export ARDOUR_MCP_PATH=$TOP/mcp:.
  export ARDOUR_EXPORT_FORMATS_PATH=$TOP/export:.
 -export ARDOUR_BACKEND_PATH=$libs/backends/jack
 +export ARDOUR_BACKEND_PATH=$libs/backends/jack:$libs/backends/wavesaudio:$libs/backends/dummy
+ export ARDOUR_TEST_PATH=$libs/ardour/test/data
  
  #
  # even though we set the above variables, ardour requires that these 

diff --cc gtk2_ardour/sfdb_ui.cc
Simple merge

diff --cc gtk2_ardour/transcode_ffmpeg.cc
Simple merge

diff --cc gtk2_ardour/video_server_dialog.cc
Simple merge

diff --cc gtk2_ardour/video_timeline.cc
Simple merge

diff --cc libs/ardour/ardour/file_source.h
index 37a7e67d2ef4c35a460ba151941c84f15ce41c14,531cdf4d4cd3226eb1773857574f247a551483dc..c0e4fba0de4b99ecbc189179ec9634b45a7247c4
--- 1/libs/ardour/ardour/file_source.h
--- 2/libs/ardour/ardour/file_source.h
+++ b/libs/ardour/ardour/file_source.h
@@@ -80,11 -80,11 +80,14 @@@ public
  
        virtual void set_path (const std::string&);
        
 -      static PBD::Signal3<int,std::string,std::string,std::vector<std::string> > AmbiguousFileName;
 +      static PBD::Signal2<int,std::string,std::vector<std::string> > AmbiguousFileName;
 +
 +      void existence_check ();
 +      virtual void prevent_deletion ();
  
+       void existence_check ();
+       virtual void prevent_deletion ();
+ 
  protected:
        FileSource (Session& session, DataType type,
                    const std::string& path,

diff --cc libs/ardour/ardour/smf_source.h
index 9d85f943529d3e4d531d1ca27fe542804f8afe87,a068a3e3853b648849bc20ed987a2e87105f6a13..44d965a4f6dc44f784c9eae62a76da9aaca8a22e
--- 1/libs/ardour/ardour/smf_source.h
--- 2/libs/ardour/ardour/smf_source.h
+++ b/libs/ardour/ardour/smf_source.h
@@@ -34,11 -34,13 +34,13 @@@ namespace ARDOUR 
  template<typename T> class MidiRingBuffer;
  
  /** Standard Midi File (Type 0) Source */
 -class SMFSource : public MidiSource, public FileSource, public Evoral::SMF {
 +class LIBARDOUR_API SMFSource : public MidiSource, public FileSource, public Evoral::SMF {
  public:
+       /** Constructor for new internal-to-session files */
+       SMFSource (Session& session, const std::string& path, Source::Flag flags);
+ 
        /** Constructor for existing external-to-session files */
-       SMFSource (Session& session, const std::string& path,
-                       Source::Flag flags = Source::Flag(0));
+       SMFSource (Session& session, const std::string& path);
  
        /** Constructor for existing in-session files */
        SMFSource (Session& session, const XMLNode&, bool must_exist = false);
@@@ -75,9 -77,10 +77,12 @@@
        void ensure_disk_file ();
  
        static bool safe_midi_file_extension (const std::string& path);
+       static bool valid_midi_file (const std::string& path);
+ 
+       void prevent_deletion ();
  
 +      void prevent_deletion ();
 +
    protected:
        void set_path (const std::string& newpath);
  

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

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

diff --cc libs/evoral/evoral/SMF.hpp
Simple merge

diff --cc libs/evoral/src/SMF.cpp
Simple merge

diff --cc libs/pbd/clear_dir.cc
index 9d2d7ed88311b4024958138a11faac3a4d2484fe,a7564447aba5390b7f267766b5be7b233217f680..36c6fcf9f8bacd3ba3b3853a5a59329c41f89a14
--- 1/libs/pbd/clear_dir.cc
--- 2/libs/pbd/clear_dir.cc
+++ b/libs/pbd/clear_dir.cc
@@@ -32,7 -24,8 +32,7 @@@ using PBD::closedir
  #include <errno.h>
  #include <string.h>
  
- #include <glib/gstdio.h>
+ #include <glib.h>
 -#include <glib/gstdio.h>
  #include <glibmm/miscutils.h>
  
  #include "pbd/error.h"
@@@ -122,7 -115,7 +122,7 @@@ PBD::remove_directory (const std::strin
                }
  
                if (::g_unlink (fullpath.c_str())) {
--                      error << string_compose (_("cannot remove file %1 (%2)"), fullpath, strerror (errno)) << endmsg;
++                      error << string_compose (_("cannot remove file %1 (%2)"), fullpath, strerror (errno)) << endmsg;
                }
        }
        if (::g_rmdir(dir.c_str())) {

diff --cc libs/pbd/pbd/clear_dir.h
index f669b84485d5e03094f9405850977a5b614c8134,5f57483b63d26ffae1321b2197d682e04ee89252..efef67012df5b49ecbd7521e0fde10273c4f99d9
--- 1/libs/pbd/pbd/clear_dir.h
--- 2/libs/pbd/pbd/clear_dir.h
+++ b/libs/pbd/pbd/clear_dir.h
@@@ -24,11 -24,9 +24,13 @@@
  #include <vector>
  #include <sys/types.h>
  
 +#include "pbd/libpbd_visibility.h"
 +
  namespace PBD {
 +        LIBPBD_API int clear_directory (const std::string&, size_t* = 0, std::vector<std::string>* = 0);
 +        LIBPBD_API void remove_directory (const std::string& dir);
+         int clear_directory (const std::string&, size_t* = 0, std::vector<std::string>* = 0);
+         void remove_directory (const std::string& dir);
  }
  
  #endif /* __pbd_clear_dir_h__ */

diff --cc libs/surfaces/generic_midi/midicontrollable.cc
Simple merge