ardour/livetrax
13
0
Fork 0
Code

Use const reference and renames variable

Browse Source
This commit is contained in:
Mathias Buhr 2015-08-29 13:45:43 +02:00 committed by Mathias Buhr
parent 30af404def
commit 95b144ee58
8 changed files with 66 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ardour/ardour/audio_playlist_source.h
View File

@ -37,7 +37,7 @@ public:
virtual ~AudioPlaylistSource ();
bool empty() const;
std::string peak_path (std::string audio_path);
std::string generate_peak_path (const std::string& audio_path);
uint32_t n_channels() const;
bool clamped_at_unity () const { return false; }

14
libs/ardour/ardour/audiofilesource.h
View File

@ -39,13 +39,13 @@ class LIBARDOUR_API AudioFileSource : public AudioSource, public FileSource {
public:
virtual ~AudioFileSource ();
std::string peak_path (std::string audio_path);
std::string find_broken_peakfile (std::string missing_peak_path,
std::string audio_path);
std::string generate_peak_path (const std::string& audio_path);
std::string find_broken_peakfile (const std::string& missing_peak_path,
const std::string& audio_path);
static void set_peak_dir (std::string dir) { peak_dir = dir; }
static void set_peak_dir (const std::string& dir) { peak_dir = dir; }
static bool get_soundfile_info (std::string path, SoundFileInfo& _info, std::string& error);
static bool get_soundfile_info (const std::string& path, SoundFileInfo& _info, std::string& error);
bool safe_file_extension (const std::string& path) const {
return safe_audio_file_extension(path);
@ -119,8 +119,8 @@ protected:
static framecnt_t header_position_offset;
private:
std::string old_peak_path (std::string audio_path);
std::string broken_peak_path (std::string audio_path);
std::string old_peak_path (const std::string& audio_path);
std::string broken_peak_path (const std::string& audio_path);
};
} // namespace ARDOUR

14
libs/ardour/ardour/audiosource.h
View File

@ -43,7 +43,7 @@ class LIBARDOUR_API AudioSource : virtual public Source,
public boost::enable_shared_from_this<ARDOUR::AudioSource>
{
public:
AudioSource (Session&, std::string name);
AudioSource (Session&, const std::string& name);
AudioSource (Session&, const XMLNode&);
virtual ~AudioSource ();
@ -115,18 +115,18 @@ class LIBARDOUR_API AudioSource : virtual public Source,
thread, or a lock around calls that use them.
*/
static std::vector<boost::shared_array<Sample> > _mixdown_buffers;
static std::vector<boost::shared_array<Sample> > _mixdown_buffers;
static std::vector<boost::shared_array<gain_t> > _gain_buffers;
static Glib::Threads::Mutex _level_buffer_lock;
static Glib::Threads::Mutex _level_buffer_lock;
static void ensure_buffers_for_level (uint32_t, framecnt_t);
static void ensure_buffers_for_level_locked (uint32_t, framecnt_t);
framecnt_t _length;
std::string peakpath;
std::string _peakpath;
std::string _captured_for;
int initialize_peakfile (std::string path);
int initialize_peakfile (const std::string& path);
int build_peaks_from_scratch ();
int compute_and_write_peaks (Sample* buf, framecnt_t first_frame, framecnt_t cnt,
bool force, bool intermediate_peaks_ready_signal);
@ -136,9 +136,9 @@ class LIBARDOUR_API AudioSource : virtual public Source,
virtual framecnt_t read_unlocked (Sample *dst, framepos_t start, framecnt_t cnt) const = 0;
virtual framecnt_t write_unlocked (Sample *dst, framecnt_t cnt) = 0;
virtual std::string peak_path(std::string audio_path) = 0;
virtual std::string generate_peak_path(const std::string& audio_path) = 0;
virtual std::string find_broken_peakfile (std::string /* missing_peak_path */,
std::string audio_path) { return peak_path (audio_path); }
std::string audio_path) { return generate_peak_path (audio_path); }
virtual int read_peaks_with_fpp (PeakData *peaks,
framecnt_t npeaks, framepos_t start, framecnt_t cnt,

3
libs/ardour/ardour/session.h
View File

@ -198,9 +198,8 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop
std::string plugins_dir () const; ///< Plugin state
std::string externals_dir () const; ///< Links to external files
std::string peak_path (std::string) const;
std::string peak_path (const std::string&) const;
std::string peak_path_from_audio_path (std::string) const;
bool audio_source_name_is_unique (const std::string& name);
std::string format_audio_source_name (const std::string& legalized_base, uint32_t nchan, uint32_t chan, bool destructive, bool take_required, uint32_t cnt, bool related_exists);
std::string new_audio_source_path_for_embedded (const std::string& existing_path);

2
libs/ardour/audio_playlist_source.cc
View File

@ -217,7 +217,7 @@ AudioPlaylistSource::setup_peakfile ()
}
string
AudioPlaylistSource::peak_path (string /*audio_path_IGNORED*/)
AudioPlaylistSource::generate_peak_path (const string& /*audio_path_IGNORED*/)
{
return _peak_path;
}

18
libs/ardour/audiofilesource.cc
View File

@ -153,7 +153,7 @@ AudioFileSource::~AudioFileSource ()
DEBUG_TRACE (DEBUG::Destruction, string_compose ("AudioFileSource destructor %1, removable? %2\n", _path, removable()));
if (removable()) {
::g_unlink (_path.c_str());
::g_unlink (peakpath.c_str());
::g_unlink (_peakpath.c_str());
}
}
@ -164,7 +164,7 @@ AudioFileSource::init (const string& pathstr, bool must_exist)
}
string
AudioFileSource::peak_path (string audio_path)
AudioFileSource::generate_peak_path (const string& audio_path)
{
string base;
@ -187,7 +187,7 @@ AudioFileSource::peak_path (string audio_path)
}
string
AudioFileSource::find_broken_peakfile (string peak_path, string audio_path)
AudioFileSource::find_broken_peakfile (const string& peak_path, const string& audio_path)
{
string str;
@ -203,7 +203,7 @@ AudioFileSource::find_broken_peakfile (string peak_path, string audio_path)
the bug means that we can't reliably use it.
*/
peak_path = str;
return str;
} else {
/* all native files are mono, so we can just rename
@ -219,7 +219,7 @@ AudioFileSource::find_broken_peakfile (string peak_path, string audio_path)
#ifndef PLATFORM_WINDOWS // there's no old_peak_path() for windows
str = old_peak_path (audio_path);
if (Glib::file_test (str, Glib::FILE_TEST_EXISTS)) {
peak_path = str;
return str;
}
#endif
}
@ -228,13 +228,13 @@ AudioFileSource::find_broken_peakfile (string peak_path, string audio_path)
}
string
AudioFileSource::broken_peak_path (string audio_path)
AudioFileSource::broken_peak_path (const string& audio_path)
{
return _session.peak_path (basename_nosuffix (audio_path));
}
string
AudioFileSource::old_peak_path (string audio_path)
AudioFileSource::old_peak_path (const string& audio_path)
{
/* XXX hardly bombproof! fix me */
@ -264,7 +264,7 @@ AudioFileSource::old_peak_path (string audio_path)
}
bool
AudioFileSource::get_soundfile_info (string path, SoundFileInfo& _info, string& error_msg)
AudioFileSource::get_soundfile_info (const string& path, SoundFileInfo& _info, string& error_msg)
{
/* try sndfile first because it gets timecode info from .wav (BWF) if it exists,
which at present, ExtAudioFile from Apple seems unable to do.
@ -325,7 +325,7 @@ AudioFileSource::mark_streaming_write_completed (const Lock& lock)
int
AudioFileSource::move_dependents_to_trash()
{
return ::g_unlink (peakpath.c_str());
return ::g_unlink (_peakpath.c_str());
}
void

74
libs/ardour/audiosource.cc
View File

@ -75,7 +75,7 @@ bool AudioSource::_build_peakfiles = false;
#define _FPP 256
AudioSource::AudioSource (Session& s, string name)
AudioSource::AudioSource (Session& s, const string& name)
: Source (s, DataType::AUDIO, name)
, _length (0)
, _peak_byte_max (0)
@ -203,7 +203,7 @@ AudioSource::touch_peakfile ()
{
GStatBuf statbuf;
if (g_stat (peakpath.c_str(), &statbuf) != 0 || statbuf.st_size == 0) {
if (g_stat (_peakpath.c_str(), &statbuf) != 0 || statbuf.st_size == 0) {
return;
}
@ -212,7 +212,7 @@ AudioSource::touch_peakfile ()
tbuf.actime = statbuf.st_atime;
tbuf.modtime = time ((time_t*) 0);
g_utime (peakpath.c_str(), &tbuf);
g_utime (_peakpath.c_str(), &tbuf);
}
int
@ -220,7 +220,7 @@ AudioSource::rename_peakfile (string newpath)
{
/* caller must hold _lock */
string oldpath = peakpath;
string oldpath = _peakpath;
if (Glib::file_test (oldpath, Glib::FILE_TEST_EXISTS)) {
if (g_rename (oldpath.c_str(), newpath.c_str()) != 0) {
@ -229,35 +229,35 @@ AudioSource::rename_peakfile (string newpath)
}
}
peakpath = newpath;
_peakpath = newpath;
return 0;
}
int
AudioSource::initialize_peakfile (string audio_path)
AudioSource::initialize_peakfile (const string& audio_path)
{
GStatBuf statbuf;
peakpath = peak_path (audio_path);
_peakpath = generate_peak_path (audio_path);
DEBUG_TRACE(DEBUG::Peaks, string_compose ("Initialize Peakfile %1 for Audio file %2\n", peakpath, audio_path));
DEBUG_TRACE(DEBUG::Peaks, string_compose ("Initialize Peakfile %1 for Audio file %2\n", _peakpath, audio_path));
/* if the peak file should be there, but isn't .... */
if (!empty() && !Glib::file_test (peakpath.c_str(), Glib::FILE_TEST_EXISTS)) {
peakpath = find_broken_peakfile (peakpath, audio_path);
if (!empty() && !Glib::file_test (_peakpath.c_str(), Glib::FILE_TEST_EXISTS)) {
_peakpath = find_broken_peakfile (_peakpath, audio_path);
}
if (g_stat (peakpath.c_str(), &statbuf)) {
if (g_stat (_peakpath.c_str(), &statbuf)) {
if (errno != ENOENT) {
/* it exists in the peaks dir, but there is some kind of error */
error << string_compose(_("AudioSource: cannot stat peakfile \"%1\""), peakpath) << endmsg;
error << string_compose(_("AudioSource: cannot stat peakfile \"%1\""), _peakpath) << endmsg;
return -1;
}
DEBUG_TRACE(DEBUG::Peaks, string_compose("Peakfile %1 does not exist\n", peakpath));
DEBUG_TRACE(DEBUG::Peaks, string_compose("Peakfile %1 does not exist\n", _peakpath));
_peaks_built = false;
@ -266,7 +266,7 @@ AudioSource::initialize_peakfile (string audio_path)
/* we found it in the peaks dir, so check it out */
if (statbuf.st_size == 0 || (statbuf.st_size < (off_t) ((length(_timeline_position) / _FPP) * sizeof (PeakData)))) {
DEBUG_TRACE(DEBUG::Peaks, string_compose("Peakfile %1 is empty\n", peakpath));
DEBUG_TRACE(DEBUG::Peaks, string_compose("Peakfile %1 is empty\n", _peakpath));
_peaks_built = false;
} else {
// Check if the audio file has changed since the peakfile was built.
@ -278,7 +278,7 @@ AudioSource::initialize_peakfile (string audio_path)
/* no audio path - nested source or we can't
read it or ... whatever, use the peakfile as-is.
*/
DEBUG_TRACE(DEBUG::Peaks, string_compose("Error when calling stat on Peakfile %1\n", peakpath));
DEBUG_TRACE(DEBUG::Peaks, string_compose("Error when calling stat on Peakfile %1\n", _peakpath));
_peaks_built = true;
_peak_byte_max = statbuf.st_size;
@ -358,8 +358,8 @@ AudioSource::read_peaks_with_fpp (PeakData *peaks, framecnt_t npeaks, framepos_t
GStatBuf statbuf;
expected_peaks = (cnt / (double) samples_per_file_peak);
if (g_stat (peakpath.c_str(), &statbuf) != 0) {
error << string_compose (_("Cannot open peakfile @ %1 for size check (%2)"), peakpath, strerror (errno)) << endmsg;
if (g_stat (_peakpath.c_str(), &statbuf) != 0) {
error << string_compose (_("Cannot open peakfile @ %1 for size check (%2)"), _peakpath, strerror (errno)) << endmsg;
return -1;
}
@ -380,10 +380,10 @@ AudioSource::read_peaks_with_fpp (PeakData *peaks, framecnt_t npeaks, framepos_t
const off_t expected_file_size = (_length / (double) samples_per_file_peak) * sizeof (PeakData);
if (statbuf.st_size < expected_file_size) {
warning << string_compose (_("peak file %1 is truncated from %2 to %3"), peakpath, expected_file_size, statbuf.st_size) << endmsg;
warning << string_compose (_("peak file %1 is truncated from %2 to %3"), _peakpath, expected_file_size, statbuf.st_size) << endmsg;
const_cast<AudioSource*>(this)->build_peaks_from_scratch ();
if (g_stat (peakpath.c_str(), &statbuf) != 0) {
error << string_compose (_("Cannot open peakfile @ %1 for size check (%2) after rebuild"), peakpath, strerror (errno)) << endmsg;
if (g_stat (_peakpath.c_str(), &statbuf) != 0) {
error << string_compose (_("Cannot open peakfile @ %1 for size check (%2) after rebuild"), _peakpath, strerror (errno)) << endmsg;
}
if (statbuf.st_size < expected_file_size) {
fatal << "peak file is still truncated after rebuild" << endmsg;
@ -392,10 +392,10 @@ AudioSource::read_peaks_with_fpp (PeakData *peaks, framecnt_t npeaks, framepos_t
}
}
ScopedFileDescriptor sfd (g_open (peakpath.c_str(), O_RDONLY, 0444));
ScopedFileDescriptor sfd (g_open (_peakpath.c_str(), O_RDONLY, 0444));
if (sfd < 0) {
error << string_compose (_("Cannot open peakfile @ %1 for reading (%2)"), peakpath, strerror (errno)) << endmsg;
error << string_compose (_("Cannot open peakfile @ %1 for reading (%2)"), _peakpath, strerror (errno)) << endmsg;
return -1;
}
@ -464,13 +464,13 @@ AudioSource::read_peaks_with_fpp (PeakData *peaks, framecnt_t npeaks, framepos_t
map_handle = CreateFileMapping(file_handle, NULL, PAGE_READONLY, 0, 0, NULL);
if (map_handle == NULL) {
error << string_compose (_("map failed - could not create file mapping for peakfile %1."), peakpath) << endmsg;
error << string_compose (_("map failed - could not create file mapping for peakfile %1."), _peakpath) << endmsg;
return -1;
}
view_handle = MapViewOfFile(map_handle, FILE_MAP_READ, 0, read_map_off, map_length);
if (view_handle == NULL) {
error << string_compose (_("map failed - could not map peakfile %1."), peakpath) << endmsg;
error << string_compose (_("map failed - could not map peakfile %1."), _peakpath) << endmsg;
return -1;
}
@ -481,13 +481,13 @@ AudioSource::read_peaks_with_fpp (PeakData *peaks, framecnt_t npeaks, framepos_t
err_flag = UnmapViewOfFile (view_handle);
err_flag = CloseHandle(map_handle);
if(!err_flag) {
error << string_compose (_("unmap failed - could not unmap peakfile %1."), peakpath) << endmsg;
error << string_compose (_("unmap failed - could not unmap peakfile %1."), _peakpath) << endmsg;
return -1;
}
#else
addr = (char*) mmap (0, map_length, PROT_READ, MAP_PRIVATE, sfd, read_map_off);
if (addr == MAP_FAILED) {
error << string_compose (_("map failed - could not mmap peakfile %1."), peakpath) << endmsg;
error << string_compose (_("map failed - could not mmap peakfile %1."), _peakpath) << endmsg;
return -1;
}
@ -559,13 +559,13 @@ AudioSource::read_peaks_with_fpp (PeakData *peaks, framecnt_t npeaks, framepos_t
map_handle = CreateFileMapping(file_handle, NULL, PAGE_READONLY, 0, 0, NULL);
if (map_handle == NULL) {
error << string_compose (_("map failed - could not create file mapping for peakfile %1."), peakpath) << endmsg;
error << string_compose (_("map failed - could not create file mapping for peakfile %1."), _peakpath) << endmsg;
return -1;
}
view_handle = MapViewOfFile(map_handle, FILE_MAP_READ, 0, read_map_off, map_length);
if (view_handle == NULL) {
error << string_compose (_("map failed - could not map peakfile %1."), peakpath) << endmsg;
error << string_compose (_("map failed - could not map peakfile %1."), _peakpath) << endmsg;
return -1;
}
@ -576,13 +576,13 @@ AudioSource::read_peaks_with_fpp (PeakData *peaks, framecnt_t npeaks, framepos_t
err_flag = UnmapViewOfFile (view_handle);
err_flag = CloseHandle(map_handle);
if(!err_flag) {
error << string_compose (_("unmap failed - could not unmap peakfile %1."), peakpath) << endmsg;
error << string_compose (_("unmap failed - could not unmap peakfile %1."), _peakpath) << endmsg;
return -1;
}
#else
addr = (char*) mmap (0, map_length, PROT_READ, MAP_PRIVATE, sfd, read_map_off);
if (addr == MAP_FAILED) {
error << string_compose (_("map failed - could not mmap peakfile %1."), peakpath) << endmsg;
error << string_compose (_("map failed - could not mmap peakfile %1."), _peakpath) << endmsg;
return -1;
}
@ -765,8 +765,8 @@ AudioSource::build_peaks_from_scratch ()
out:
if (ret) {
DEBUG_TRACE (DEBUG::Peaks, string_compose("Could not write peak data, attempting to remove peakfile %1\n", peakpath));
::g_unlink (peakpath.c_str());
DEBUG_TRACE (DEBUG::Peaks, string_compose("Could not write peak data, attempting to remove peakfile %1\n", _peakpath));
::g_unlink (_peakpath.c_str());
}
return ret;
@ -775,8 +775,8 @@ AudioSource::build_peaks_from_scratch ()
int
AudioSource::prepare_for_peakfile_writes ()
{
if ((_peakfile_fd = g_open (peakpath.c_str(), O_CREAT|O_RDWR, 0664)) < 0) {
error << string_compose(_("AudioSource: cannot open peakpath (c) \"%1\" (%2)"), peakpath, strerror (errno)) << endmsg;
if ((_peakfile_fd = g_open (_peakpath.c_str(), O_CREAT|O_RDWR, 0664)) < 0) {
error << string_compose(_("AudioSource: cannot open _peakpath (c) \"%1\" (%2)"), _peakpath, strerror (errno)) << endmsg;
return -1;
}
return 0;
@ -958,7 +958,7 @@ AudioSource::compute_and_write_peaks (Sample* buf, framecnt_t first_frame, frame
off_t target_length = blocksize * ((first_peak_byte + blocksize + 1) / blocksize);
if (endpos < target_length) {
DEBUG_TRACE(DEBUG::Peaks, string_compose ("Truncating Peakfile %1\n", peakpath));
DEBUG_TRACE(DEBUG::Peaks, string_compose ("Truncating Peakfile %1\n", _peakpath));
if (ftruncate (_peakfile_fd, target_length)) {
/* error doesn't actually matter so continue on without testing */
}
@ -1009,10 +1009,10 @@ AudioSource::truncate_peakfile ()
off_t end = lseek (_peakfile_fd, 0, SEEK_END);
if (end > _peak_byte_max) {
DEBUG_TRACE(DEBUG::Peaks, string_compose ("Truncating Peakfile %1\n", peakpath));
DEBUG_TRACE(DEBUG::Peaks, string_compose ("Truncating Peakfile %1\n", _peakpath));
if (ftruncate (_peakfile_fd, _peak_byte_max)) {
error << string_compose (_("could not truncate peakfile %1 to %2 (error: %3)"),
peakpath, _peak_byte_max, errno) << endmsg;
_peakpath, _peak_byte_max, errno) << endmsg;
}
}
}

6
libs/ardour/session.cc
View File

@ -4362,7 +4362,7 @@ Session::count_sources_by_origin (const string& path)
}
string
Session::peak_path (string base) const
Session::peak_path (const string& base) const
{
if (Glib::path_is_absolute (base)) {
@ -4398,8 +4398,8 @@ Session::peak_path (string base) const
}
}
base = Glib::path_get_basename (base);
return Glib::build_filename (_session_dir->peak_path(), base + peakfile_suffix);
std::string basename = Glib::path_get_basename (base);
return Glib::build_filename (_session_dir->peak_path(), basename + peakfile_suffix);
}
string