Remove unnecessary 0 checks before delete; see http://www.parashift.com/c++-faq-lite...
[ardour.git] / libs / ardour / globals.cc
index 6f3b772eced5cb228886ecf48f5f65b5ea84289b..8be2e3b8b643ef8a1e0a23d4229666ff4bcf8846 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000 Paul Davis 
+    Copyright (C) 2000 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
 */
 
 #include <cstdio> // Needed so that libraptor (included in lrdf) won't complain
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/time.h>
+#include <sys/resource.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <locale.h>
+#include <errno.h>
 
 #ifdef VST_SUPPORT
 #include <fst.h>
 #endif
 
+#ifdef HAVE_AUDIOUNITS
+#include <ardour/audio_unit.h>
+#endif
+
+#ifdef __SSE__
+#include <xmmintrin.h>
+#endif
+
+#include <glibmm/fileutils.h>
+#include <glibmm/miscutils.h>
+
 #include <lrdf.h>
 
 #include <pbd/error.h>
 #include <pbd/id.h>
 #include <pbd/strsplit.h>
+#include <pbd/fpu.h>
+#include <pbd/file_utils.h>
 
 #include <midi++/port.h>
-#include <midi++/port_request.h>
 #include <midi++/manager.h>
 #include <midi++/mmc.h>
 
 #include <ardour/ardour.h>
+#include <ardour/analyser.h>
 #include <ardour/audio_library.h>
 #include <ardour/configuration.h>
+#include <ardour/profile.h>
 #include <ardour/plugin_manager.h>
 #include <ardour/audiosource.h>
 #include <ardour/utils.h>
 #include <ardour/session.h>
+#include <ardour/source_factory.h>
 #include <ardour/control_protocol_manager.h>
 #include <ardour/audioengine.h>
+#include <ardour/filesystem_paths.h>
 
 #ifdef HAVE_LIBLO
 #include <ardour/osc.h>
 #endif
 
 #include <ardour/mix.h>
+#include <ardour/runtime_functions.h>
 
 #if defined (__APPLE__)
        #include <Carbon/Carbon.h> // For Gestalt
 #endif
-       
+
 #include "i18n.h"
 
 ARDOUR::Configuration* ARDOUR::Config = 0;
+ARDOUR::RuntimeProfile* ARDOUR::Profile = 0;
 ARDOUR::AudioLibrary* ARDOUR::Library = 0;
 
 #ifdef HAVE_LIBLO
@@ -73,9 +92,10 @@ using namespace ARDOUR;
 using namespace std;
 using namespace PBD;
 
-MIDI::Port *default_mmc_port = 0;
-MIDI::Port *default_mtc_port = 0;
-MIDI::Port *default_midi_port = 0;
+MIDI::Port *ARDOUR::default_mmc_port = 0;
+MIDI::Port *ARDOUR::default_mtc_port = 0;
+MIDI::Port *ARDOUR::default_midi_port = 0;
+MIDI::Port *ARDOUR::default_midi_clock_port = 0;
 
 Change ARDOUR::StartChanged = ARDOUR::new_change ();
 Change ARDOUR::LengthChanged = ARDOUR::new_change ();
@@ -83,127 +103,234 @@ Change ARDOUR::PositionChanged = ARDOUR::new_change ();
 Change ARDOUR::NameChanged = ARDOUR::new_change ();
 Change ARDOUR::BoundsChanged = Change (0); // see init(), below
 
+compute_peak_t          ARDOUR::compute_peak = 0;
+find_peaks_t            ARDOUR::find_peaks = 0;
+apply_gain_to_buffer_t  ARDOUR::apply_gain_to_buffer = 0;
+mix_buffers_with_gain_t ARDOUR::mix_buffers_with_gain = 0;
+mix_buffers_no_gain_t   ARDOUR::mix_buffers_no_gain = 0;
+
+sigc::signal<void,std::string> ARDOUR::BootMessage;
+
 #ifdef HAVE_LIBLO
 static int
 setup_osc ()
 {
        /* no real cost to creating this object, and it avoids
-          conditionals anywhere that uses it 
+          conditionals anywhere that uses it
        */
-       
+
        osc = new OSC (Config->get_osc_port());
-       
+
        if (Config->get_use_osc ()) {
+               BootMessage (_("Starting OSC"));
                return osc->start ();
        } else {
                return 0;
        }
 }
+
 #endif
 
-static int 
-setup_midi (AudioEngine& engine        )
+int
+ARDOUR::setup_midi ()
 {
-       std::map<string,Configuration::MidiPortDescriptor*>::iterator i;
-       int nports;
-
-       if ((nports = Config->midi_ports.size()) == 0) {
+       if (Config->midi_ports.size() == 0) {
                warning << _("no MIDI ports specified: no MMC or MTC control possible") << endmsg;
                return 0;
        }
 
-       MIDI::Manager::instance()->set_api_data(engine.jack());
+       BootMessage (_("Configuring MIDI ports"));
 
-       for (i = Config->midi_ports.begin(); i != Config->midi_ports.end(); ++i) {
-               Configuration::MidiPortDescriptor* port_descriptor;
+       for (std::map<string,XMLNode>::iterator i = Config->midi_ports.begin(); i != Config->midi_ports.end(); ++i) {
+               MIDI::Manager::instance()->add_port (i->second);
+       }
 
-               port_descriptor = (*i).second;
+       MIDI::Port* first;
+       const MIDI::Manager::PortMap& ports = MIDI::Manager::instance()->get_midi_ports();
 
-               MIDI::PortRequest request (port_descriptor->device, 
-                                          port_descriptor->tag, 
-                                          port_descriptor->mode, 
-                                          port_descriptor->type);
+       if (ports.size() > 1) {
 
-               if (request.status != MIDI::PortRequest::OK) {
-                       error << string_compose(_("MIDI port specifications for \"%1\" are not understandable."), port_descriptor->tag) << endmsg;
-                       continue;
-               }
-               
-               MIDI::Manager::instance()->add_port (request);
-       }
-
-       if (nports > 1) {
+               first = ports.begin()->second;
 
                /* More than one port, so try using specific names for each port */
 
-               map<string,Configuration::MidiPortDescriptor *>::iterator i;
-
                if (Config->get_mmc_port_name() != N_("default")) {
                        default_mmc_port =  MIDI::Manager::instance()->port (Config->get_mmc_port_name());
-               } 
+               }
 
                if (Config->get_mtc_port_name() != N_("default")) {
                        default_mtc_port =  MIDI::Manager::instance()->port (Config->get_mtc_port_name());
-               } 
+               }
 
                if (Config->get_midi_port_name() != N_("default")) {
                        default_midi_port =  MIDI::Manager::instance()->port (Config->get_midi_port_name());
-               } 
-               
+               }
+
+               if (Config->get_midi_clock_port_name() != N_("default")) {
+                       default_midi_port =  MIDI::Manager::instance()->port (Config->get_midi_clock_port_name());
+               }
+
                /* If that didn't work, just use the first listed port */
 
                if (default_mmc_port == 0) {
-                       default_mmc_port = MIDI::Manager::instance()->port (0);
+                       default_mmc_port = first;
                }
 
                if (default_mtc_port == 0) {
-                       default_mtc_port = MIDI::Manager::instance()->port (0);
+                       default_mtc_port = first;
                }
 
                if (default_midi_port == 0) {
-                       default_midi_port = MIDI::Manager::instance()->port (0);
+                       default_midi_port = first;
+               }
+
+               if (default_midi_clock_port == 0) {
+                       default_midi_clock_port = first;
                }
-               
-       } else {
+
+       } else if (ports.size() == 1) {
+
+               first = ports.begin()->second;
 
                /* Only one port described, so use it for both MTC and MMC */
 
-               default_mmc_port = MIDI::Manager::instance()->port (0);
+               default_mmc_port = first;
                default_mtc_port = default_mmc_port;
                default_midi_port = default_mmc_port;
+               default_midi_clock_port = default_mmc_port;
        }
 
        if (default_mmc_port == 0) {
-               warning << string_compose (_("No MMC control (MIDI port \"%1\" not available)"), Config->get_mmc_port_name()) 
+               warning << string_compose (_("No MMC control (MIDI port \"%1\" not available)"), Config->get_mmc_port_name())
                        << endmsg;
                return 0;
-       } 
+       }
 
        if (default_mtc_port == 0) {
-               warning << string_compose (_("No MTC support (MIDI port \"%1\" not available)"), Config->get_mtc_port_name()) 
+               warning << string_compose (_("No MTC support (MIDI port \"%1\" not available)"), Config->get_mtc_port_name())
                        << endmsg;
-       }
+       } 
 
        if (default_midi_port == 0) {
-               warning << string_compose (_("No MIDI parameter support (MIDI port \"%1\" not available)"), Config->get_midi_port_name()) 
+               warning << string_compose (_("No MIDI parameter support (MIDI port \"%1\" not available)"), Config->get_midi_port_name())
+                       << endmsg;
+       } 
+
+       if (default_midi_clock_port == 0) {
+               warning << string_compose (_("No MIDI Clock support (MIDI port \"%1\" not available)"), Config->get_midi_clock_port_name())
                        << endmsg;
        }
 
        return 0;
 }
 
-int
-ARDOUR::init (ARDOUR::AudioEngine& engine, bool use_vst, bool try_optimization)
+void
+setup_hardware_optimization (bool try_optimization)
 {
        bool generic_mix_functions = true;
 
+       if (try_optimization) {
+
+               FPU fpu;
+
+#if defined (ARCH_X86) && defined (BUILD_SSE_OPTIMIZATIONS)
+
+               if (fpu.has_sse()) {
+
+                       info << "Using SSE optimized routines" << endmsg;
+
+                       // SSE SET
+                       compute_peak          = x86_sse_compute_peak;
+                       find_peaks            = x86_sse_find_peaks;
+                       apply_gain_to_buffer  = x86_sse_apply_gain_to_buffer;
+                       mix_buffers_with_gain = x86_sse_mix_buffers_with_gain;
+                       mix_buffers_no_gain   = x86_sse_mix_buffers_no_gain;
+
+                       generic_mix_functions = false;
+
+               }
+
+#elif defined (__APPLE__) && defined (BUILD_VECLIB_OPTIMIZATIONS)
+               long sysVersion = 0;
+
+               if (noErr != Gestalt(gestaltSystemVersion, &sysVersion))
+                       sysVersion = 0;
+
+               if (sysVersion >= 0x00001040) { // Tiger at least
+                       compute_peak           = veclib_compute_peak;
+                       find_peaks             = veclib_find_peaks;
+                       apply_gain_to_buffer   = veclib_apply_gain_to_buffer;
+                       mix_buffers_with_gain  = veclib_mix_buffers_with_gain;
+                       mix_buffers_no_gain    = veclib_mix_buffers_no_gain;
+
+                       generic_mix_functions = false;
+
+                       info << "Apple VecLib H/W specific optimizations in use" << endmsg;
+               }
+#endif
+
+               /* consider FPU denormal handling to be "h/w optimization" */
+
+               setup_fpu ();
+       }
+
+       if (generic_mix_functions) {
+
+               compute_peak          = default_compute_peak;
+               find_peaks            = default_find_peaks;
+               apply_gain_to_buffer  = default_apply_gain_to_buffer;
+               mix_buffers_with_gain = default_mix_buffers_with_gain;
+               mix_buffers_no_gain   = default_mix_buffers_no_gain;
+
+               info << "No H/W specific optimizations in use" << endmsg;
+       }
+}
+
+static void
+lotsa_files_please ()
+{
+       struct rlimit rl;
+
+       if (getrlimit (RLIMIT_NOFILE, &rl) == 0) {
+
+               rl.rlim_cur = rl.rlim_max;
+
+               if (setrlimit (RLIMIT_NOFILE, &rl) != 0) {
+                       if (rl.rlim_cur == RLIM_INFINITY) {
+                               error << _("Could not set system open files limit to \"unlimited\"") << endmsg;
+                       } else {
+                               error << string_compose (_("Could not set system open files limit to %1"), rl.rlim_cur) << endmsg;
+                       }
+               } else {
+                       if (rl.rlim_cur == RLIM_INFINITY) {
+                               info << _("Removed open file count limit. Excellent!") << endmsg;
+                       } else {
+                               info << string_compose (_("Ardour will be limited to %1 open files"), rl.rlim_cur) << endmsg;
+                       }
+               }
+       } else {
+               error << string_compose (_("Could not get system open files limit (%1)"), strerror (errno)) << endmsg;
+       }
+}
+
+int
+ARDOUR::init (bool use_vst, bool try_optimization)
+{
+       extern void setup_enum_writer ();
+
        (void) bindtextdomain(PACKAGE, LOCALEDIR);
 
-       PBD::ID::init ();
+       setup_enum_writer ();
+
+       // allow ardour the absolute maximum number of open files
+       lotsa_files_please ();
 
        lrdf_init();
        Library = new AudioLibrary;
 
+       BootMessage (_("Loading configuration"));
+
        Config = new Configuration;
 
        if (Config->load_state ()) {
@@ -212,10 +339,8 @@ ARDOUR::init (ARDOUR::AudioEngine& engine, bool use_vst, bool try_optimization)
 
        Config->set_use_vst (use_vst);
 
-       if (setup_midi (engine)) {
-               return -1;
-       }
-    
+       Profile = new RuntimeProfile;
+
 #ifdef HAVE_LIBLO
        if (setup_osc ()) {
                return -1;
@@ -228,92 +353,38 @@ ARDOUR::init (ARDOUR::AudioEngine& engine, bool use_vst, bool try_optimization)
        }
 #endif
 
-       if (try_optimization) {
-
-#if defined (ARCH_X86) && defined (BUILD_SSE_OPTIMIZATIONS)
-       
-               unsigned int use_sse = 0;
-
-#ifndef USE_X86_64_ASM
-               asm volatile (
-                                "mov $1, %%eax\n"
-                                "pushl %%ebx\n"
-                                "cpuid\n"
-                                "popl %%ebx\n"
-                                "andl $33554432, %%edx\n"
-                                "movl %%edx, %0\n"
-                            : "=m" (use_sse)
-                            : 
-                        : "%eax", "%ecx", "%edx", "memory");
-#else
-
-               asm volatile (
-                                "movq $1, %%rax\n"
-                                "pushq %%rbx\n"
-                                "cpuid\n"
-                                "popq %%rbx\n"
-                                "andq $33554432, %%rdx\n"
-                                "movq %%rdx, %0\n"
-                            : "=m" (use_sse)
-                            : 
-                        : "%rax", "%rcx", "%rdx", "memory");
-
-#endif /* USE_X86_64_ASM */
-               
-               if (use_sse) {
-                       cerr << "Enabling SSE optimized routines" << endl;
-       
-                       // SSE SET
-                       Session::compute_peak                   = x86_sse_compute_peak;
-                       Session::apply_gain_to_buffer   = x86_sse_apply_gain_to_buffer;
-                       Session::mix_buffers_with_gain  = x86_sse_mix_buffers_with_gain;
-                       Session::mix_buffers_no_gain    = x86_sse_mix_buffers_no_gain;
-
-                       generic_mix_functions = false;
-
-                }
-
-#elif defined (__APPLE__) && defined (BUILD_VECLIB_OPTIMIZATIONS)
-                long sysVersion = 0;
-
-                if (noErr != Gestalt(gestaltSystemVersion, &sysVersion))
-                        sysVersion = 0;
+#ifdef HAVE_AUDIOUNITS
+       AUPluginInfo::load_cached_info ();
+#endif
 
-                if (sysVersion >= 0x00001040) { // Tiger at least
-                        Session::compute_peak           = veclib_compute_peak;
-                        Session::apply_gain_to_buffer   = veclib_apply_gain_to_buffer;
-                        Session::mix_buffers_with_gain  = veclib_mix_buffers_with_gain;
-                        Session::mix_buffers_no_gain    = veclib_mix_buffers_no_gain;
+       /* Make VAMP look in our library ahead of anything else */
 
-                        generic_mix_functions = false;
+       char *p = getenv ("VAMP_PATH");
+       string vamppath = VAMP_DIR;
+       if (p) {
+               vamppath += ':';
+               vamppath += p;
+       }
+       setenv ("VAMP_PATH", vamppath.c_str(), 1);
 
-                        info << "Apple VecLib H/W specific optimizations in use" << endmsg;
-                }
-#endif
-        }
 
-        if (generic_mix_functions) {
+       setup_hardware_optimization (try_optimization);
 
-               Session::compute_peak                   = compute_peak;
-               Session::apply_gain_to_buffer   = apply_gain_to_buffer;
-               Session::mix_buffers_with_gain  = mix_buffers_with_gain;
-               Session::mix_buffers_no_gain    = mix_buffers_no_gain;
-               
-               info << "No H/W specific optimizations in use" << endmsg;
-       }
+       SourceFactory::init ();
+       Analyser::init ();
 
        /* singleton - first object is "it" */
        new PluginManager ();
-       
+
        /* singleton - first object is "it" */
        new ControlProtocolManager ();
-       ControlProtocolManager::instance().discover_control_protocols (Session::control_protocol_path());
+       ControlProtocolManager::instance().discover_control_protocols ();
 
        XMLNode* node;
        if ((node = Config->control_protocol_state()) != 0) {
                ControlProtocolManager::instance().set_state (*node);
        }
-       
+
        BoundsChanged = Change (StartChanged|PositionChanged|LengthChanged);
 
        return 0;
@@ -332,11 +403,7 @@ ARDOUR::cleanup ()
 microseconds_t
 ARDOUR::get_microseconds ()
 {
-       /* XXX need JACK to export its functionality */
-
-       struct timeval now;
-       gettimeofday (&now, 0);
-       return now.tv_sec * 1000000ULL + now.tv_usec;
+       return (microseconds_t) jack_get_time ();
 }
 
 ARDOUR::Change
@@ -361,142 +428,114 @@ ARDOUR::new_change ()
 }
 
 string
-ARDOUR::get_user_ardour_path ()
+ARDOUR::get_ardour_revision ()
 {
-       string path;
-       char* envvar;
-       
-       if ((envvar = getenv ("HOME")) == 0 || strlen (envvar) == 0) {
-               return "/";
-       }
-               
-       path = envvar;
-       path += "/.ardour2/";
+       return "$Rev$";
+}
 
-       /* create it if necessary */
+void
+ARDOUR::find_bindings_files (map<string,string>& files)
+{
+       vector<sys::path> found;
+       SearchPath spath = ardour_search_path() + user_config_directory() + system_config_search_path();
 
-       mkdir (path.c_str (), 0755);
+       if (getenv ("ARDOUR_SAE")) {
+               Glib::PatternSpec pattern("*SAE-*.bindings");
+               find_matching_files_in_search_path (spath, pattern, found);
+       } else {
+               Glib::PatternSpec pattern("*.bindings");
+               find_matching_files_in_search_path (spath, pattern, found);
+       }
+
+       if (found.empty()) {
+               return;
+       }
 
-       return path;
+       for (vector<sys::path>::iterator x = found.begin(); x != found.end(); ++x) {
+               sys::path path = *x;
+               pair<string,string> namepath;
+               namepath.second = path.to_string();
+               namepath.first = path.leaf().substr (0, path.leaf().find_first_of ('.'));
+               files.insert (namepath);
+       }
 }
 
-string
-ARDOUR::get_system_data_path ()
+ARDOUR::LocaleGuard::LocaleGuard (const char* str)
 {
-       string path;
-
-       path += DATA_DIR;
-       path += "/ardour2/";
-       
-       return path;
+       old = strdup (setlocale (LC_NUMERIC, NULL));
+       if (strcmp (old, str)) {
+               setlocale (LC_NUMERIC, str);
+       }
 }
 
-string
-ARDOUR::get_system_module_path ()
+ARDOUR::LocaleGuard::~LocaleGuard ()
 {
-       string path;
-
-       path += MODULE_DIR;
-       path += "/ardour2/";
-       
-       return path;
+       setlocale (LC_NUMERIC, old);
+       free ((char*)old);
 }
 
-static string
-find_file (string name, string dir, string subdir = "")
+void
+ARDOUR::setup_fpu ()
 {
-       string path;
-       char* envvar = getenv("ARDOUR_PATH");
-
-       /* 1st attempt: any directory in ARDOUR_PATH */
-       
-       if (envvar != 0) {
-
-               vector<string> split_path;
-       
-               split (envvar, split_path, ':');
-               
-               for (vector<string>::iterator i = split_path.begin(); i != split_path.end(); ++i) {
-                       path = *i;
-                       path += "/" + name;
-                       if (access (path.c_str(), R_OK) == 0) {
-                               // cerr << "Using file " << path << " found in ARDOUR_PATH." << endl;
-                               return path;
-                       }
-               }
-       }
-
-       /* 2nd attempt: ~/.ardour/ */
 
-       path = get_user_ardour_path();
-               
-       if (subdir.length()) {
-               path += subdir + "/";
-       }
-               
-       path += name;
-       if (access (path.c_str(), R_OK) == 0) {
-               return path;
+       if (getenv ("ARDOUR_RUNNING_UNDER_VALGRIND")) {
+               // valgrind doesn't understand this assembler stuff
+               // September 10th, 2007
+               return;
        }
 
-       /* 3rd attempt: dir/... */
-       
-       path = dir;
-       path += "/ardour2/";
-       
-       if (subdir.length()) {
-               path += subdir + "/";
-       }
-       
-       path += name;
-       
-       if (access (path.c_str(), R_OK) == 0) {
-               return path;
-       }
+#if defined(ARCH_X86) && defined(USE_XMMINTRIN)
 
-       return "";
-}
+       int MXCSR;
+       FPU fpu;
 
-string
-ARDOUR::find_config_file (string name)
-{
-       char* envvar;
+       /* XXX use real code to determine if the processor supports
+          DenormalsAreZero and FlushToZero
+       */
 
-       if ((envvar = getenv("ARDOUR_CONFIG_PATH")) == 0) {
-               envvar = CONFIG_DIR;
+       if (!fpu.has_flush_to_zero() && !fpu.has_denormals_are_zero()) {
+               return;
        }
 
-       return find_file (name, envvar);
-}
+       MXCSR  = _mm_getcsr();
 
-string
-ARDOUR::find_data_file (string name, string subdir)
-{
-       char* envvar;
-       if ((envvar = getenv("ARDOUR_DATA_PATH")) == 0) {
-               envvar = DATA_DIR;
-       }
+       switch (Config->get_denormal_model()) {
+       case DenormalNone:
+               MXCSR &= ~(_MM_FLUSH_ZERO_ON|0x8000);
+               break;
 
-       return find_file (name, envvar, subdir);
-}
+       case DenormalFTZ:
+               if (fpu.has_flush_to_zero()) {
+                       MXCSR |= _MM_FLUSH_ZERO_ON;
+               }
+               break;
 
-ARDOUR::LocaleGuard::LocaleGuard (const char* str)
-{
-       old = strdup (setlocale (LC_NUMERIC, NULL));
-       if (strcmp (old, str)) {
-               setlocale (LC_NUMERIC, str);
-       } 
-}
+       case DenormalDAZ:
+               MXCSR &= ~_MM_FLUSH_ZERO_ON;
+               if (fpu.has_denormals_are_zero()) {
+                       MXCSR |= 0x8000;
+               }
+               break;
+
+       case DenormalFTZDAZ:
+               if (fpu.has_flush_to_zero()) {
+                       if (fpu.has_denormals_are_zero()) {
+                               MXCSR |= _MM_FLUSH_ZERO_ON | 0x8000;
+                       } else {
+                               MXCSR |= _MM_FLUSH_ZERO_ON;
+                       }
+               }
+               break;
+       }
 
-ARDOUR::LocaleGuard::~LocaleGuard ()
-{
-       setlocale (LC_NUMERIC, old);
-       free ((char*)old);
+       _mm_setcsr (MXCSR);
+
+#endif
 }
 
 ARDOUR::OverlapType
-ARDOUR::coverage (jack_nframes_t sa, jack_nframes_t ea, 
-                 jack_nframes_t sb, jack_nframes_t eb)
+ARDOUR::coverage (nframes_t sa, nframes_t ea,
+                 nframes_t sb, nframes_t eb)
 {
        /* OverlapType returned reflects how the second (B)
           range overlaps the first (A).
@@ -520,7 +559,7 @@ ARDOUR::coverage (jack_nframes_t sa, jack_nframes_t ea,
                |-----------------|   B
 
 
-             "B is internal to A"              
+             "B is internal to A"
 
        */
 #ifdef OLD_COVERAGE
@@ -536,7 +575,7 @@ ARDOUR::coverage (jack_nframes_t sa, jack_nframes_t ea,
           ----|                      B
            -----------------------|   B
           --|                        B
-          
+
             "B overlaps the start of A"
 
        */
@@ -544,21 +583,21 @@ ARDOUR::coverage (jack_nframes_t sa, jack_nframes_t ea,
        if ((eb >= sa) && (eb <= ea)) {
                return OverlapStart;
        }
-       /* 
+       /*
             |---------------------|  A
                    |----------------- B
-            |----------------------- B    
+            |----------------------- B
                                    |- B
 
-            "B overlaps the end of A"                             
+            "B overlaps the end of A"
 
        */
-       if ((sb >= sa) && (sb <= ea)) {
+       if ((sb > sa) && (sb <= ea)) {
                return OverlapEnd;
        }
        /*
             |--------------------|     A
-          --------------------------  B   
+          --------------------------  B
             |-----------------------  B
            ----------------------|    B
              |--------------------|    B
@@ -575,16 +614,26 @@ ARDOUR::coverage (jack_nframes_t sa, jack_nframes_t ea,
 
 /* not sure where to put these */
 
-std::istream& operator>>(std::istream& o, HeaderFormat& hf) {
+template<class T>
+std::istream& int_to_type (std::istream& o, T& hf) {
        int val;
        o >> val;
-       hf = (HeaderFormat) val;
+       hf = (T) val;
        return o;
 }
 
-std::istream& operator>>(std::istream& o, SampleFormat& sf) {
-       int val;
-       o >> val;
-       sf = (SampleFormat) val;
-       return o;
-}
+std::istream& operator>>(std::istream& o, HeaderFormat& var) { return int_to_type<HeaderFormat> (o, var); }
+std::istream& operator>>(std::istream& o, SampleFormat& var) { return int_to_type<SampleFormat> (o, var); }
+std::istream& operator>>(std::istream& o, AutoConnectOption& var) { return int_to_type<AutoConnectOption> (o, var); }
+std::istream& operator>>(std::istream& o, MonitorModel& var) { return int_to_type<MonitorModel> (o, var); }
+std::istream& operator>>(std::istream& o, RemoteModel& var) { return int_to_type<RemoteModel> (o, var); }
+std::istream& operator>>(std::istream& o, EditMode& var) { return int_to_type<EditMode> (o, var); }
+std::istream& operator>>(std::istream& o, SoloModel& var) { return int_to_type<SoloModel> (o, var); }
+std::istream& operator>>(std::istream& o, LayerModel& var) { return int_to_type<LayerModel> (o, var); }
+std::istream& operator>>(std::istream& o, CrossfadeModel& var) { return int_to_type<CrossfadeModel> (o, var); }
+std::istream& operator>>(std::istream& o, SlaveSource& var) { return int_to_type<SlaveSource> (o, var); }
+std::istream& operator>>(std::istream& o, ShuttleBehaviour& var) { return int_to_type<ShuttleBehaviour> (o, var); }
+std::istream& operator>>(std::istream& o, ShuttleUnits& var) { return int_to_type<ShuttleUnits> (o, var); }
+std::istream& operator>>(std::istream& o, SmpteFormat& var) { return int_to_type<SmpteFormat> (o, var); }
+std::istream& operator>>(std::istream& o, DenormalModel& var) { return int_to_type<DenormalModel> (o, var); }
+