comparison data/model/WaveFileModel.h @ 316:3a6725f285d6

* Make RemoteFile far more pervasive, and use it for local files as well
  so that we can handle both transparently.  Make it shallow copy with
  reference counting, so it can be used by value without having to worry
  about the cache file lifetime.  Use RemoteFile for MainWindow file-open
  functions, etc

 
 #include "base/Thread.h"
 #include <QMutex>
 #include <QTimer>
 
+#include "data/fileio/RemoteFile.h"
+
 #include "RangeSummarisableTimeValueModel.h"
 #include "PowerOfSqrtTwoZoomConstraint.h"
 
 #include <stdlib.h>
 

 class WaveFileModel : public RangeSummarisableTimeValueModel
 {
     Q_OBJECT
 
 public:
-    WaveFileModel(QString path, size_t targetRate = 0);
-    WaveFileModel(QString path, QString originalLocation, size_t targetRate = 0);
-    WaveFileModel(QString originalLocation, AudioFileReader *reader);
+    WaveFileModel(RemoteFile source, size_t targetRate = 0);
+    WaveFileModel(RemoteFile source, AudioFileReader *reader);
     ~WaveFileModel();
 
     bool isOK() const;
     bool isReady(int *) const;
 

 	size_t m_fillExtent;
         size_t m_frameCount;
     };
          
     void fillCache();
-    
+
+    RemoteFile m_source;
     QString m_path;
     AudioFileReader *m_reader;
     bool m_myReader;
 
     size_t m_startFrame;