diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-11-07 00:42:44 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-11-07 00:42:44 +0000 |
| commit | f4d1fa1d9e0a2d3a95dcb16a3986fe54d46797ca (patch) | |
| tree | 4c52231d686c1c8d3bec550c8915c461442ab16c /libs | |
| parent | 150fcb2b70c0260acb7c785fa91401c2d34b286f (diff) | |
fix incorrect return type for SndFileSource::last_capture_start_frame() in the non-destructive case; fix compiler warnings for utils.cc
git-svn-id: svn://localhost/ardour2/trunk@1084 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -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" { |