X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Faudiofilesource.h;h=7688fc7872fc7b379240055f2e027d6935f0d06f;hb=9a2164056752a958542f2d162ed3bf0f9c304121;hp=57b5ced93cf406253ea427ebe767d937616048fc;hpb=ede4ecbb00ecc866c502454c81e711baea780ccd;p=ardour.git diff --git a/libs/ardour/ardour/audiofilesource.h b/libs/ardour/ardour/audiofilesource.h index 57b5ced93c..7688fc7872 100644 --- a/libs/ardour/ardour/audiofilesource.h +++ b/libs/ardour/ardour/audiofilesource.h @@ -28,11 +28,11 @@ namespace ARDOUR { struct SoundFileInfo { - float samplerate; - uint16_t channels; - int64_t length; - std::string format_name; - int64_t timecode; + float samplerate; + uint16_t channels; + int64_t length; + std::string format_name; + int64_t timecode; }; class AudioFileSource : public AudioSource, public FileSource { @@ -43,9 +43,9 @@ public: return (set_source_name(newname, destructive()) == 0); } - std::string peak_path (std::string audio_path); - std::string find_broken_peakfile (std::string missing_peak_path, - std::string audio_path); + std::string peak_path (std::string audio_path); + std::string find_broken_peakfile (std::string missing_peak_path, + std::string audio_path); static void set_peak_dir (std::string dir) { peak_dir = dir; } @@ -82,7 +82,7 @@ public: static bool is_empty (Session&, std::string path); static void set_bwf_serial_number (int); - static void set_header_position_offset (nframes_t offset ); + static void set_header_position_offset (framecnt_t offset); static PBD::Signal0 HeaderPositionOffsetChanged; @@ -91,7 +91,7 @@ protected: AudioFileSource (Session&, const std::string& path, Source::Flag flags); /** Constructor to be called for new in-session files */ - AudioFileSource (Session&, const std::string& path, Source::Flag flags, + AudioFileSource (Session&, const std::string& path, const std::string& origin, Source::Flag flags, SampleFormat samp_format, HeaderFormat hdr_format); /** Constructor to be called for existing in-session files */ @@ -104,7 +104,7 @@ protected: int move_dependents_to_trash(); - static Sample* get_interleave_buffer (nframes_t size); + static Sample* get_interleave_buffer (framecnt_t size); static std::string peak_dir;