/*
- 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
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
+#ifdef WAF_BUILD
+#include "libardour-config.h"
+#endif
+
#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
-#include <lrdf.h>
+#ifdef HAVE_AUDIOUNITS
+#include "ardour/audio_unit.h"
+#endif
-#include <pbd/error.h>
-#include <pbd/id.h>
-#include <pbd/strsplit.h>
-
-#include <midi++/port.h>
-#include <midi++/port_request.h>
-#include <midi++/manager.h>
-#include <midi++/mmc.h>
-
-#include <ardour/ardour.h>
-#include <ardour/audio_library.h>
-#include <ardour/configuration.h>
-#include <ardour/plugin_manager.h>
-#include <ardour/audiosource.h>
-#include <ardour/utils.h>
-#include <ardour/session.h>
-#include <ardour/control_protocol_manager.h>
-#include <ardour/audioengine.h>
-
-#ifdef HAVE_LIBLO
-#include <ardour/osc.h>
+#ifdef __SSE__
+#include <xmmintrin.h>
#endif
-#include <ardour/mix.h>
+#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 "pbd/enumwriter.h"
+
+#include "midi++/port.h"
+#include "midi++/manager.h"
+#include "midi++/mmc.h"
+
+#include "ardour/analyser.h"
+#include "ardour/ardour.h"
+#include "ardour/audio_library.h"
+#include "ardour/audioengine.h"
+#include "ardour/audioregion.h"
+#include "ardour/audiosource.h"
+#include "ardour/buffer_manager.h"
+#include "ardour/control_protocol_manager.h"
+#include "ardour/debug.h"
+#include "ardour/filesystem_paths.h"
+#include "ardour/mix.h"
+#include "ardour/playlist.h"
+#include "ardour/plugin_manager.h"
+#include "ardour/process_thread.h"
+#include "ardour/profile.h"
+#include "ardour/region.h"
+#include "ardour/rc_configuration.h"
+#include "ardour/route_group.h"
+#include "ardour/runtime_functions.h"
+#include "ardour/session.h"
+#include "ardour/session_event.h"
+#include "ardour/source_factory.h"
+#include "ardour/utils.h"
+
+#include "audiographer/routines.h"
#if defined (__APPLE__)
#include <Carbon/Carbon.h> // For Gestalt
#endif
-
+
#include "i18n.h"
-ARDOUR::Configuration* ARDOUR::Config = 0;
+ARDOUR::RCConfiguration* ARDOUR::Config = 0;
+ARDOUR::RuntimeProfile* ARDOUR::Profile = 0;
ARDOUR::AudioLibrary* ARDOUR::Library = 0;
-#ifdef HAVE_LIBLO
-ARDOUR::OSC* ARDOUR::osc = 0;
-#endif
-
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;
+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;
-Change ARDOUR::StartChanged = ARDOUR::new_change ();
-Change ARDOUR::LengthChanged = ARDOUR::new_change ();
-Change ARDOUR::PositionChanged = ARDOUR::new_change ();
-Change ARDOUR::NameChanged = ARDOUR::new_change ();
-Change ARDOUR::BoundsChanged = Change (0); // see init(), below
+PBD::Signal1<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
- */
-
- osc = new OSC (Config->get_osc_port());
-
- if (Config->get_use_osc ()) {
- return osc->start ();
- } else {
- return 0;
- }
-}
-#endif
+void ARDOUR::setup_enum_writer ();
-static int
-setup_midi (AudioEngine& engine )
-{
- std::map<string,Configuration::MidiPortDescriptor*>::iterator i;
- int nports;
+/* this is useful for quite a few things that want to check
+ if any bounds-related property has changed
+*/
+PBD::PropertyChange ARDOUR::bounds_change;
- if ((nports = Config->midi_ports.size()) == 0) {
- warning << _("no MIDI ports specified: no MMC or MTC control possible") << endmsg;
- return 0;
- }
+namespace ARDOUR {
+ namespace Properties {
- MIDI::Manager::instance()->set_api_data(engine.jack());
+ /* the envelope and fades are not scalar items and so
+ currently (2010/02) are not stored using Property.
+ However, these descriptors enable us to notify
+ about changes to them via PropertyChange.
- for (i = Config->midi_ports.begin(); i != Config->midi_ports.end(); ++i) {
- Configuration::MidiPortDescriptor* port_descriptor;
+ Declared in ardour/audioregion.h ...
+ */
- port_descriptor = (*i).second;
+ PBD::PropertyDescriptor<bool> fade_in;
+ PBD::PropertyDescriptor<bool> fade_out;
+ PBD::PropertyDescriptor<bool> envelope;
+ }
+}
- MIDI::PortRequest request (port_descriptor->device,
- port_descriptor->tag,
- port_descriptor->mode,
- port_descriptor->type);
+void
+ARDOUR::make_property_quarks ()
+{
+ Properties::fade_in.property_id = g_quark_from_static_string (X_("fade_in_FAKE"));
+ DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for fade_in_FAKE = %1\n", Properties::fade_in.property_id));
+ Properties::fade_out.property_id = g_quark_from_static_string (X_("fade_out_FAKE"));
+ DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for fade_out_FAKE = %1\n", Properties::fade_out.property_id));
+ Properties::envelope.property_id = g_quark_from_static_string (X_("envelope_FAKE"));
+ DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for envelope_FAKE = %1\n", Properties::envelope.property_id));
+}
- 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);
+void
+setup_hardware_optimization (bool try_optimization)
+{
+ bool generic_mix_functions = true;
- nports++;
- }
+ if (try_optimization) {
- if (nports > 1) {
+ FPU fpu;
- /* More than one port, so try using specific names for each port */
+#if defined (ARCH_X86) && defined (BUILD_SSE_OPTIMIZATIONS)
- map<string,Configuration::MidiPortDescriptor *>::iterator i;
+ if (fpu.has_sse()) {
- if (Config->get_mmc_port_name() != N_("default")) {
- default_mmc_port = MIDI::Manager::instance()->port (Config->get_mmc_port_name());
- }
+ info << "Using SSE optimized routines" << endmsg;
- if (Config->get_mtc_port_name() != N_("default")) {
- default_mtc_port = MIDI::Manager::instance()->port (Config->get_mtc_port_name());
- }
+ // 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;
- if (Config->get_midi_port_name() != N_("default")) {
- default_midi_port = MIDI::Manager::instance()->port (Config->get_midi_port_name());
- }
-
- /* If that didn't work, just use the first listed port */
+ generic_mix_functions = false;
- if (default_mmc_port == 0) {
- default_mmc_port = MIDI::Manager::instance()->port (0);
}
- if (default_mtc_port == 0) {
- default_mtc_port = MIDI::Manager::instance()->port (0);
- }
+#elif defined (__APPLE__) && defined (BUILD_VECLIB_OPTIMIZATIONS)
+ long sysVersion = 0;
- if (default_midi_port == 0) {
- default_midi_port = MIDI::Manager::instance()->port (0);
- }
-
- } else {
+ if (noErr != Gestalt(gestaltSystemVersion, &sysVersion))
+ sysVersion = 0;
- /* Only one port described, so use it for both MTC and MMC */
+ 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;
- default_mmc_port = MIDI::Manager::instance()->port (0);
- default_mtc_port = default_mmc_port;
- default_midi_port = default_mmc_port;
- }
+ generic_mix_functions = false;
- if (default_mmc_port == 0) {
- warning << string_compose (_("No MMC control (MIDI port \"%1\" not available)"), Config->get_mmc_port_name())
- << endmsg;
- return 0;
- }
+ info << "Apple VecLib H/W specific optimizations in use" << endmsg;
+ }
+#endif
- if (default_mtc_port == 0) {
- warning << string_compose (_("No MTC support (MIDI port \"%1\" not available)"), Config->get_mtc_port_name())
- << endmsg;
- }
+ /* consider FPU denormal handling to be "h/w optimization" */
- if (default_midi_port == 0) {
- warning << string_compose (_("No MIDI parameter support (MIDI port \"%1\" not available)"), Config->get_midi_port_name())
- << endmsg;
+ setup_fpu ();
}
- return 0;
-}
-
-void
-setup_hardware_optimization (bool try_optimization)
-{
- bool generic_mix_functions = true;
+ 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;
- if (try_optimization) {
-
-#if defined (ARCH_X86) && defined (BUILD_SSE_OPTIMIZATIONS)
-
- unsigned long use_sse = 0;
-
-#ifndef USE_X86_64_ASM
- asm (
- "mov $1, %%eax\n"
- "pushl %%ebx\n"
- "cpuid\n"
- "movl %%edx, %0\n"
- "popl %%ebx\n"
- : "=l" (use_sse)
- :
- : "%eax", "%ecx", "%edx", "memory");
-
-#else
-
- asm (
- "pushq %%rbx\n"
- "movq $1, %%rax\n"
- "cpuid\n"
- "movq %%rdx, %0\n"
- "popq %%rbx\n"
- : "=l" (use_sse)
- :
- : "%rax", "%rcx", "%rdx", "memory");
-
-#endif /* USE_X86_64_ASM */
- use_sse &= (1 << 25); // bit 25 = SSE support
-
- if (use_sse) {
- info << "Using SSE optimized routines" << endmsg;
+ info << "No H/W specific optimizations in use" << endmsg;
+ }
- // 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;
-
- 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;
+ AudioGrapher::Routines::override_compute_peak (compute_peak);
+ AudioGrapher::Routines::override_apply_gain_to_buffer (apply_gain_to_buffer);
+}
- generic_mix_functions = false;
+static void
+lotsa_files_please ()
+{
+ struct rlimit rl;
- info << "Apple VecLib H/W specific optimizations in use" << endmsg;
- }
-#endif
- }
+ if (getrlimit (RLIMIT_NOFILE, &rl) == 0) {
- if (generic_mix_functions) {
+ rl.rlim_cur = rl.rlim_max;
- 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;
+ 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 (_("%1 will be limited to %2 open files"), PROGRAM_NAME, rl.rlim_cur) << endmsg;
+ }
+ }
+ } else {
+ error << string_compose (_("Could not get system open files limit (%1)"), strerror (errno)) << endmsg;
}
}
int
-ARDOUR::init (ARDOUR::AudioEngine& engine, bool use_vst, bool try_optimization)
+ARDOUR::init (bool use_vst, bool try_optimization)
{
- extern void setup_enum_writer ();
+ if (!Glib::thread_supported()) {
+ Glib::thread_init();
+ }
(void) bindtextdomain(PACKAGE, LOCALEDIR);
PBD::ID::init ();
+ SessionEvent::init_event_pool ();
+ make_property_quarks ();
+ SessionObject::make_property_quarks ();
+ Region::make_property_quarks ();
+ AudioRegion::make_property_quarks ();
+ RouteGroup::make_property_quarks ();
+ Playlist::make_property_quarks ();
+
+ /* this is a useful ready to use PropertyChange that many
+ things need to check. This avoids having to compose
+ it every time we want to check for any of the relevant
+ property changes.
+ */
+
+ bounds_change.add (ARDOUR::Properties::start);
+ bounds_change.add (ARDOUR::Properties::position);
+ bounds_change.add (ARDOUR::Properties::length);
+
+ /* provide a state version for the few cases that need it and are not
+ driven by reading state from disk (e.g. undo/redo)
+ */
+
+ Stateful::current_state_version = CURRENT_SESSION_FILE_VERSION;
+
setup_enum_writer ();
+ // allow ardour the absolute maximum number of open files
+ lotsa_files_please ();
+
lrdf_init();
Library = new AudioLibrary;
- Config = new Configuration;
+ BootMessage (_("Loading configuration"));
+
+ Config = new RCConfiguration;
if (Config->load_state ()) {
return -1;
}
+
Config->set_use_vst (use_vst);
- if (setup_midi (engine)) {
- return -1;
- }
-
-#ifdef HAVE_LIBLO
- if (setup_osc ()) {
- return -1;
- }
-#endif
+ Profile = new RuntimeProfile;
+
#ifdef VST_SUPPORT
- if (Config->get_use_vst() && fst_init ()) {
+ if (Config->get_use_vst() && fst_init (0)) {
return -1;
}
#endif
+#ifdef HAVE_AUDIOUNITS
+ AUPluginInfo::load_cached_info ();
+#endif
+
+ /* Make VAMP look in our library ahead of anything else */
+
+ char *p = getenv ("VAMP_PATH");
+ string vamppath = VAMP_DIR;
+ if (p) {
+ vamppath += ':';
+ vamppath += p;
+ }
+ setenv ("VAMP_PATH", vamppath.c_str(), 1);
+
+
setup_hardware_optimization (try_optimization);
+ 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());
+
+ ProcessThread::init ();
+ BufferManager::init (10); // XX should be num_processors_for_dsp
+
+ return 0;
+}
+
+void
+ARDOUR::init_post_engine ()
+{
+ ControlProtocolManager::instance().discover_control_protocols ();
XMLNode* node;
if ((node = Config->control_protocol_state()) != 0) {
- ControlProtocolManager::instance().set_state (*node);
+ ControlProtocolManager::instance().set_state (*node, Stateful::loading_state_version);
}
-
- BoundsChanged = Change (StartChanged|PositionChanged|LengthChanged);
-
- return 0;
}
int
delete Library;
lrdf_cleanup ();
delete &ControlProtocolManager::instance();
+#ifdef VST_SUPPORT
+ fst_exit ();
+#endif
return 0;
}
-
-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;
-}
-
-ARDOUR::Change
-ARDOUR::new_change ()
-{
- Change c;
- static uint32_t change_bit = 1;
-
- /* catch out-of-range */
- if (!change_bit)
- {
- fatal << _("programming error: ")
- << "change_bit out of range in ARDOUR::new_change()"
- << endmsg;
- /*NOTREACHED*/
- }
-
- c = Change (change_bit);
- change_bit <<= 1; // if it shifts too far, change_bit == 0
-
- return c;
-}
-
string
ARDOUR::get_ardour_revision ()
{
return "$Rev$";
}
-string
-ARDOUR::get_user_ardour_path ()
+void
+ARDOUR::find_bindings_files (map<string,string>& files)
{
- string path;
- char* envvar;
-
- if ((envvar = getenv ("HOME")) == 0 || strlen (envvar) == 0) {
- return "/";
- }
-
- path = envvar;
- path += "/.ardour2/";
+ vector<sys::path> found;
+ SearchPath spath = ardour_search_path() + user_config_directory() + system_config_search_path();
- /* create it if necessary */
-
- if (g_mkdir_with_parents (path.c_str (), 0755)) {
- throw exception ();
+ 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);
}
- return path;
-}
-
-string
-ARDOUR::get_system_data_path ()
-{
- string path;
-
- char *envvar;
+ if (found.empty()) {
+ return;
+ }
- if ((envvar = getenv ("ARDOUR_DATA_PATH")) != 0) {
- path = envvar;
- } else {
- path += DATA_DIR;
- path += "/ardour2/";
+ 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);
}
-
- return path;
}
-string
-ARDOUR::get_system_module_path ()
+bool
+ARDOUR::no_auto_connect()
{
- string path;
- char *envvar;
-
- if ((envvar = getenv ("ARDOUR_MODULE_PATH")) != 0) {
- path = envvar;
- } else {
- path += MODULE_DIR;
- path += "/ardour2/";
- }
-
- return path;
+ return getenv ("ARDOUR_NO_AUTOCONNECT") != 0;
}
-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;
- }
- }
+ if (getenv ("ARDOUR_RUNNING_UNDER_VALGRIND")) {
+ // valgrind doesn't understand this assembler stuff
+ // September 10th, 2007
+ return;
}
- /* 2nd attempt: ~/.ardour/ */
+#if defined(ARCH_X86) && defined(USE_XMMINTRIN)
- path = get_user_ardour_path();
-
- if (subdir.length()) {
- path += subdir + "/";
- }
-
- path += name;
- if (access (path.c_str(), R_OK) == 0) {
- return path;
- }
+ int MXCSR;
+ FPU fpu;
- /* 3rd attempt: dir/... */
-
- path = dir;
- path += "/ardour2/";
-
- if (subdir.length()) {
- path += subdir + "/";
- }
-
- path += name;
-
- if (access (path.c_str(), R_OK) == 0) {
- return path;
+ /* XXX use real code to determine if the processor supports
+ DenormalsAreZero and FlushToZero
+ */
+
+ if (!fpu.has_flush_to_zero() && !fpu.has_denormals_are_zero()) {
+ return;
}
- return "";
-}
+ MXCSR = _mm_getcsr();
-string
-ARDOUR::find_config_file (string name)
-{
- char* envvar;
+ switch (Config->get_denormal_model()) {
+ case DenormalNone:
+ MXCSR &= ~(_MM_FLUSH_ZERO_ON|0x8000);
+ break;
- if ((envvar = getenv("ARDOUR_CONFIG_PATH")) == 0) {
- envvar = CONFIG_DIR;
- }
-
- return find_file (name, envvar);
-}
+ case DenormalFTZ:
+ if (fpu.has_flush_to_zero()) {
+ MXCSR |= _MM_FLUSH_ZERO_ON;
+ }
+ break;
-string
-ARDOUR::find_data_file (string name, string subdir)
-{
- char* envvar;
- if ((envvar = getenv("ARDOUR_DATA_PATH")) == 0) {
- envvar = DATA_DIR;
+ 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;
}
- return find_file (name, envvar, subdir);
-}
-
-ARDOUR::LocaleGuard::LocaleGuard (const char* str)
-{
- old = strdup (setlocale (LC_NUMERIC, NULL));
- if (strcmp (old, str)) {
- setlocale (LC_NUMERIC, str);
- }
-}
+ _mm_setcsr (MXCSR);
-ARDOUR::LocaleGuard::~LocaleGuard ()
-{
- setlocale (LC_NUMERIC, old);
- free ((char*)old);
+#endif
}
ARDOUR::OverlapType
-ARDOUR::coverage (nframes_t sa, nframes_t ea,
- nframes_t sb, nframes_t eb)
+ARDOUR::coverage (framepos_t sa, framepos_t ea,
+ framepos_t sb, framepos_t eb)
{
/* OverlapType returned reflects how the second (B)
range overlaps the first (A).
|-----------------| B
- "B is internal to A"
+ "B is internal to A"
*/
-#ifdef OLD_COVERAGE
- if ((sb >= sa) && (eb <= ea)) {
-#else
+
if ((sb > sa) && (eb <= ea)) {
-#endif
return OverlapInternal;
}
----| B
-----------------------| B
--| B
-
+
"B overlaps the start of A"
*/
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
return OverlapNone;
}
-/* not sure where to put these */
-
-template<class T>
-std::istream& int_to_type (std::istream& o, T& hf) {
- int val;
- o >> val;
- hf = (T) 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, 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); }
-
projects / ardour.git / blobdiff