smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-24 07:27:44 +01:00
Code Issues Projects Releases Wiki Activity

fix incorrect return type for SndFileSource::last_capture_start_frame() in the non-destructive case; fix compiler warnings for utils.cc

Browse source 
git-svn-id: svn://localhost/ardour2/trunk@1084 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2006-11-07 00:42:44 +00:00
parent 150fcb2b70
commit f4d1fa1d9e
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libs/ardour/sndfilesource.cc
View file

@ -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

5
libs/ardour/utils.cc
View file

@ -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" {