projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add session-scope selection ops for Stripables
[ardour.git]
/
libs
/
ardour
/
ardour
/
audiosource.h
diff --git
a/libs/ardour/ardour/audiosource.h
b/libs/ardour/ardour/audiosource.h
index c6ec2a56ada30e0a905c2817b595a6943115022e..59d5add12237bfa39892cbfe3b20749d83ca7e09 100644
(file)
--- a/
libs/ardour/ardour/audiosource.h
+++ b/
libs/ardour/ardour/audiosource.h
@@
-21,28
+21,29
@@
#define __ardour_audio_source_h__
#include <boost/shared_ptr.hpp>
#define __ardour_audio_source_h__
#include <boost/shared_ptr.hpp>
+#include <boost/shared_array.hpp>
#include <boost/enable_shared_from_this.hpp>
#include <time.h>
#include <boost/enable_shared_from_this.hpp>
#include <time.h>
-#include <glibmm/thread.h>
+#include <glibmm/thread
s
.h>
#include <boost/function.hpp>
#include <boost/function.hpp>
+#include <boost/scoped_array.hpp>
#include "ardour/source.h"
#include "ardour/ardour.h"
#include "ardour/readable.h"
#include "ardour/source.h"
#include "ardour/ardour.h"
#include "ardour/readable.h"
-#include "pbd/file_manager.h"
#include "pbd/stateful.h"
#include "pbd/xml++.h"
namespace ARDOUR {
#include "pbd/stateful.h"
#include "pbd/xml++.h"
namespace ARDOUR {
-class AudioSource : virtual public Source,
+class
LIBARDOUR_API
AudioSource : virtual public Source,
public ARDOUR::Readable,
public boost::enable_shared_from_this<ARDOUR::AudioSource>
{
public:
public ARDOUR::Readable,
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 ();
AudioSource (Session&, const XMLNode&);
virtual ~AudioSource ();
@@
-60,7
+61,7
@@
class AudioSource : virtual public Source,
virtual float sample_rate () const = 0;
virtual float sample_rate () const = 0;
- virtual void mark_streaming_write_completed ();
+ virtual void mark_streaming_write_completed (
const Lock& lock
);
virtual bool can_truncate_peaks() const { return true; }
virtual bool can_truncate_peaks() const { return true; }
@@
-95,6
+96,7
@@
class AudioSource : virtual public Source,
}
virtual int setup_peakfile () { return 0; }
}
virtual int setup_peakfile () { return 0; }
+ int close_peakfile ();
int prepare_for_peakfile_writes ();
void done_with_peakfile_writes (bool done = true);
int prepare_for_peakfile_writes ();
void done_with_peakfile_writes (bool done = true);
@@
-108,26
+110,24
@@
class AudioSource : virtual public Source,
static bool _build_missing_peakfiles;
static bool _build_peakfiles;
static bool _build_missing_peakfiles;
static bool _build_peakfiles;
- static size_t _working_buffers_size;
-
/* these collections of working buffers for supporting
playlist's reading from potentially nested/recursive
sources assume SINGLE THREADED reads by the butler
thread, or a lock around calls that use them.
*/
/* these collections of working buffers for supporting
playlist's reading from potentially nested/recursive
sources assume SINGLE THREADED reads by the butler
thread, or a lock around calls that use them.
*/
- static std::vector<boost::shared_
ptr
<Sample> > _mixdown_buffers;
- static std::vector<boost::shared_
ptr
<gain_t> > _gain_buffers;
- static Glib::
Static
Mutex _level_buffer_lock;
+ 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 void ensure_buffers_for_level (uint32_t, framecnt_t);
static void ensure_buffers_for_level_locked (uint32_t, framecnt_t);
framecnt_t _length;
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;
std::string _captured_for;
- int initialize_peakfile (
bool newfile, std::string path
);
+ int initialize_peakfile (
const std::string& path, const bool in_session = false
);
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);
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);
@@
-137,9
+137,7
@@
class 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 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 find_broken_peakfile (std::string /* missing_peak_path */,
- std::string audio_path) { return peak_path (audio_path); }
+ virtual std::string construct_peak_filepath (const std::string& audio_path, const bool in_session = false, const bool old_peak_name = false) const = 0;
virtual int read_peaks_with_fpp (PeakData *peaks,
framecnt_t npeaks, framepos_t start, framecnt_t cnt,
virtual int read_peaks_with_fpp (PeakData *peaks,
framecnt_t npeaks, framepos_t start, framecnt_t cnt,
@@
-157,14
+155,20
@@
class AudioSource : virtual public Source,
* PeaksReady means that _peaks_built cannot be changed
* during the handling of the signal.
*/
* PeaksReady means that _peaks_built cannot be changed
* during the handling of the signal.
*/
- mutable Glib::Mutex _peaks_ready_lock;
+ mutable Glib::Threads::Mutex _peaks_ready_lock;
+ Glib::Threads::Mutex _initialize_peaks_lock;
- PBD::FdFileDescriptor* _peakfile_descriptor;
int _peakfile_fd;
framecnt_t peak_leftover_cnt;
framecnt_t peak_leftover_size;
Sample* peak_leftovers;
framepos_t peak_leftover_frame;
int _peakfile_fd;
framecnt_t peak_leftover_cnt;
framecnt_t peak_leftover_size;
Sample* peak_leftovers;
framepos_t peak_leftover_frame;
+
+ mutable bool _first_run;
+ mutable double _last_scale;
+ mutable off_t _last_map_off;
+ mutable size_t _last_raw_map_length;
+ mutable boost::scoped_array<PeakData> peak_cache;
};
}
};
}