diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-10-17 20:40:39 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-10-17 20:40:39 +0000 |
| commit | 0ef71e47de8870e74f02b457cb513930df514266 (patch) | |
| tree | 6c1e093957805161c88ac6294bfc3c6534f95e7f /libs/ardour | |
| parent | fe7c3976c9382bb9f19797034dece570eefcbf01 (diff) | |
reduce calls to fit_to_pixels(); flip back to old fix for rec regions botch; executable stack fix; avoid delete this in MementoCommand lifetime management
git-svn-id: svn://localhost/ardour2/trunk@988 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/session_state.cc | 7 | ||||
| -rw-r--r-- | libs/ardour/session_time.cc | 1 | ||||
| -rw-r--r-- | libs/ardour/sse_functions.s | 4 |
3 files changed, 11 insertions, 1 deletions
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index c302633918..e577dfb94a 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -1291,6 +1291,13 @@ Session::XMLRegionFactory (const XMLNode& node, bool full) nchans = atoi (prop->value().c_str()); } + + if ((prop = node.property ("name")) == 0) { + cerr << "no name for this region\n"; + abort (); + } + cerr << "name of this region = " << prop->value() << endl; + if ((prop = node.property (X_("source-0"))) == 0) { if ((prop = node.property ("source")) == 0) { diff --git a/libs/ardour/session_time.cc b/libs/ardour/session_time.cc index dfaab9d4c4..abe4f50696 100644 --- a/libs/ardour/session_time.cc +++ b/libs/ardour/session_time.cc @@ -26,6 +26,7 @@ #include <ardour/timestamps.h> #include <pbd/error.h> +#include <pbd/stacktrace.h> #include <ardour/ardour.h> #include <ardour/configuration.h> diff --git a/libs/ardour/sse_functions.s b/libs/ardour/sse_functions.s index 7df689188c..934ce6887a 100644 --- a/libs/ardour/sse_functions.s +++ b/libs/ardour/sse_functions.s @@ -524,6 +524,8 @@ x86_sse_compute_peak: .size x86_sse_compute_peak, .-x86_sse_compute_peak #; end proc - +#ifdef __ELF__ +.section .note.GNU-stack,"",%progbits +#endif |