diff options
| author | John Emmas <johne53@tiscali.co.uk> | 2013-09-21 09:17:25 +0100 |
|---|---|---|
| committer | John Emmas <johne53@tiscali.co.uk> | 2013-09-21 09:17:25 +0100 |
| commit | 19bb2b33a89a1291451f0740739a36daebe00bae (patch) | |
| tree | d0cafb4792ec4ff61d04d16c1e86199b2714a36f /libs/ardour/ardour/silentfilesource.h | |
| parent | 66aa6dfc8ecdb7591768bc45866a8c2b0d77e767 (diff) | |
| parent | fd23ebd0886cd61f8ee68d52d6576d00a16c9032 (diff) | |
Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows
Conflicts (hopefully resolved):
gtk2_ardour/marker.cc
gtk2_ardour/midi_region_view.h
gtk2_ardour/region_gain_line.h
gtk2_ardour/utils.cc
gtk2_ardour/video_image_frame.cc
gtk2_ardour/wscript
libs/backends/jack/wscript
Diffstat (limited to 'libs/ardour/ardour/silentfilesource.h')
| -rw-r--r-- | libs/ardour/ardour/silentfilesource.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ardour/ardour/silentfilesource.h b/libs/ardour/ardour/silentfilesource.h index b8ac40e178..1ff251e71a 100644 --- a/libs/ardour/ardour/silentfilesource.h +++ b/libs/ardour/ardour/silentfilesource.h @@ -60,7 +60,7 @@ protected: void set_header_timeline_position () {} int read_peaks_with_fpp (PeakData *peaks, framecnt_t npeaks, framepos_t /*start*/, framecnt_t /*cnt*/, - double /*samples_per_unit*/, framecnt_t /*fpp*/) const { + double /*frames_per_pixel*/, framecnt_t /*fpp*/) const { memset (peaks, 0, sizeof (PeakData) * npeaks); return 0; } |