a better fix for CUE/TOC string escaping: if the text is not Latin-1 already, reject...

[ardour.git] / libs / ardour / ardour / audiofilesource.h

diff --git a/libs/ardour/ardour/audiofilesource.h b/libs/ardour/ardour/audiofilesource.h
index 4f01bf4182b8c858cc4dbb4f606d50301e435374..7688fc7872fc7b379240055f2e027d6935f0d06f 100644 (file)
--- 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<void> HeaderPositionOffsetChanged;
 
@@ -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;