diff options
| -rw-r--r-- | libs/ardour/sndfilesource.cc | 6 | ||||
| -rw-r--r-- | libs/ardour/utils.cc | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc index 2ebd27e637..3c3798c8ab 100644 --- a/libs/ardour/sndfilesource.cc +++ b/libs/ardour/sndfilesource.cc @@ -844,7 +844,11 @@ SndFileSource::crossfade (Sample* data, nframes_t cnt, int fade_in) nframes_t SndFileSource::last_capture_start_frame () const { - return capture_start_frame; + if (destructive()) { + return capture_start_frame; + } else { + return 0; + } } void diff --git a/libs/ardour/utils.cc b/libs/ardour/utils.cc index d6c767de12..5196403323 100644 --- a/libs/ardour/utils.cc +++ b/libs/ardour/utils.cc @@ -448,6 +448,7 @@ ARDOUR::string_to_auto_style (std::string str) fatal << string_compose (_("programming error: %1 %2"), "illegal AutoStyle string: ", str) << endmsg; /*NOTREACHED*/ + return Trim; } string @@ -463,6 +464,10 @@ ARDOUR::auto_style_to_string (AutoStyle as) return X_("Trim"); break; } + + fatal << string_compose (_("programming error: %1 %2"), "illegal AutoStyle type: ", as) << endmsg; + /*NOTREACHED*/ + return ""; } extern "C" { |