diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-04 00:32:52 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-04 00:32:52 -0400 |
| commit | aaea166135ace01709f7e0be64f40be80f4107ec (patch) | |
| tree | 0e794ef7a723e4aaf909b841a6816e405b4ceca1 /libs/ardour/ardour/audioregion.h | |
| parent | 1d8bac08c0c00d44e22c581768a275e1b21a99a7 (diff) | |
initial commit of hand merging, plus getting "ancient" waf script to work correctly
Diffstat (limited to 'libs/ardour/ardour/audioregion.h')
| -rw-r--r-- | libs/ardour/ardour/audioregion.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h index 83cd227bce..13e46e4979 100644 --- a/libs/ardour/ardour/audioregion.h +++ b/libs/ardour/ardour/audioregion.h @@ -94,7 +94,7 @@ class AudioRegion : public Region virtual framecnt_t read_peaks (PeakData *buf, framecnt_t npeaks, framecnt_t offset, framecnt_t cnt, - uint32_t chan_n=0, double samples_per_unit= 1.0) const; + uint32_t chan_n=0, double frames_per_pixel = 1.0) const; /* Readable interface */ @@ -235,12 +235,4 @@ class AudioRegion : public Region } /* namespace ARDOUR */ -/* access from C objects */ - -extern "C" { - int region_read_peaks_from_c (void *arg, uint32_t npeaks, uint32_t start, uint32_t length, intptr_t data, uint32_t n_chan, double samples_per_unit); - uint32_t region_length_from_c (void *arg); - uint32_t sourcefile_length_from_c (void *arg, double); -} - #endif /* __ardour_audio_region_h__ */ |