make 3.0 catch up with transport and other changes in 2.X (hand applied, not merged)

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

diff --git a/libs/ardour/ardour/sndfilesource.h b/libs/ardour/ardour/sndfilesource.h
index 4ad967c132a2a4e8ce46ad7ccb9b416453be5b6e..7983b2e340f1d5b44bc7ecec9e8fda223941ad07 100644 (file)
--- a/libs/ardour/ardour/sndfilesource.h
+++ b/libs/ardour/ardour/sndfilesource.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2006 Paul Davis 
+    Copyright (C) 2006 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,40 +17,39 @@
 
 */
 
-#ifndef __sndfile_source_h__ 
+#ifndef __sndfile_source_h__
 #define __sndfile_source_h__
 
 #include <sndfile.h>
 
-#include <ardour/audiofilesource.h>
+#include "ardour/audiofilesource.h"
+#include "ardour/broadcast_info.h"
 
 namespace ARDOUR {
 
 class SndFileSource : public AudioFileSource {
   public:
-       /* constructor to be called for existing external-to-session files */
+       /** Constructor to be called for existing external-to-session files */
+       SndFileSource (Session&, const Glib::ustring& path, bool embedded, int chn, Flag flags);
 
-        SndFileSource (Session&, Glib::ustring path, int chn, Flag flags);
+       /* Constructor to be called for new in-session files */
+       SndFileSource (Session&, const Glib::ustring& path, bool embedded,
+                       SampleFormat samp_format, HeaderFormat hdr_format, nframes_t rate,
+                       Flag flags = SndFileSource::default_writable_flags);
 
-       /* constructor to be called for new in-session files */
-
-       SndFileSource (Session&, Glib::ustring path, SampleFormat samp_format, HeaderFormat hdr_format, nframes_t rate, 
-                      Flag flags = SndFileSource::default_writable_flags);
-                      
-       /* constructor to be called for existing in-session files */
-       
+       /** Constructor to be called for existing in-session files */
        SndFileSource (Session&, const XMLNode&);
 
        ~SndFileSource ();
 
        float sample_rate () const;
-       int update_header (nframes_t when, struct tm&, time_t);
+       int update_header (sframes_t when, struct tm&, time_t);
        int flush_header ();
 
-       nframes_t natural_position () const;
+       nframes64_t natural_position () const;
 
-       nframes_t last_capture_start_frame() const;
-       void mark_capture_start (nframes_t);
+       sframes_t last_capture_start_frame() const;
+       void mark_capture_start (sframes_t);
        void mark_capture_end ();
        void clear_capture_marks();
 
@@ -58,27 +57,27 @@ class SndFileSource : public AudioFileSource {
 
        bool one_of_several_channels () const;
 
-       static void setup_standard_crossfades (nframes_t sample_rate);
-       static const AudioFileSource::Flag default_writable_flags;
+       static void setup_standard_crossfades (Session const &, nframes_t sample_rate);
+       static const Source::Flag default_writable_flags;
 
-       static int get_soundfile_info (const Glib::ustring& path, SoundFileInfo& _info, string& error_msg);
+       static int get_soundfile_info (const Glib::ustring& path, SoundFileInfo& _info, std::string& error_msg);
 
   protected:
        void set_header_timeline_position ();
 
-       nframes_t read_unlocked (Sample *dst, nframes_t start, nframes_t cnt) const;
+       nframes_t read_unlocked (Sample *dst, sframes_t start, nframes_t cnt) const;
        nframes_t write_unlocked (Sample *dst, nframes_t cnt);
 
-       nframes_t write_float (Sample* data, nframes_t pos, nframes_t cnt);
+       nframes_t write_float (Sample* data, sframes_t pos, nframes_t cnt);
 
   private:
        SNDFILE *sf;
        SF_INFO _info;
-       SF_BROADCAST_INFO *_broadcast_info;
+       BroadcastInfo *_broadcast_info;
 
-       void init ();
+       void init_sndfile ();
        int open();
-       int setup_broadcast_info (nframes_t when, struct tm&, time_t);
+       int setup_broadcast_info (sframes_t when, struct tm&, time_t);
 
        /* destructive */
 
@@ -88,8 +87,8 @@ class SndFileSource : public AudioFileSource {
 
        bool          _capture_start;
        bool          _capture_end;
-       nframes_t      capture_start_frame;
-       nframes_t      file_pos; // unit is frames
+       sframes_t      capture_start_frame;
+       sframes_t      file_pos; // unit is frames
        nframes_t      xfade_out_count;
        nframes_t      xfade_in_count;
        Sample*        xfade_buf;
@@ -99,8 +98,6 @@ class SndFileSource : public AudioFileSource {
        nframes_t destructive_write_unlocked (Sample *dst, nframes_t cnt);
        nframes_t nondestructive_write_unlocked (Sample *dst, nframes_t cnt);
        void handle_header_position_change ();
-
-       static int64_t get_timecode_info (SNDFILE* sf, SF_BROADCAST_INFO* binfo, bool& exists);
 };
 
 } // namespace ARDOUR