diff main/MainWindow.h @ 197:c08c312b2399

* 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

--- a/main/MainWindow.h	Thu Oct 18 10:15:07 2007 +0000
+++ b/main/MainWindow.h	Thu Oct 18 15:31:20 2007 +0000
@@ -30,6 +30,7 @@
 #include "transform/Transform.h"
 #include "document/SVFileReader.h"
 #include "data/fileio/FileFinder.h"
+#include "data/fileio/RemoteFile.h"
 #include <map>
 
 class Document;
@@ -80,14 +81,14 @@
         FileOpenWrongMode // attempted to open layer when no main model present
     };
 
-    FileOpenStatus openSomeFile(QString path, AudioFileOpenMode = AskUser);
-    FileOpenStatus openAudioFile(QString path, AudioFileOpenMode = AskUser);
-    FileOpenStatus openPlaylistFile(QString path, AudioFileOpenMode = AskUser);
-    FileOpenStatus openLayerFile(QString path);
-    FileOpenStatus openImageFile(QString path);
-    FileOpenStatus openSessionFile(QString path);
-    FileOpenStatus openURL(QUrl url, AudioFileOpenMode = AskUser);
-    FileOpenStatus openURL(QString url, AudioFileOpenMode = AskUser);
+    FileOpenStatus open(QString fileOrUrl, AudioFileOpenMode = AskUser);
+    FileOpenStatus open(RemoteFile source, AudioFileOpenMode = AskUser);
+
+    FileOpenStatus openAudio(RemoteFile source, AudioFileOpenMode = AskUser);
+    FileOpenStatus openPlaylist(RemoteFile source, AudioFileOpenMode = AskUser);
+    FileOpenStatus openLayer(RemoteFile source);
+    FileOpenStatus openImage(RemoteFile source);
+    FileOpenStatus openSession(RemoteFile source);
 
     bool saveSessionFile(QString path);
     bool commitData(bool mayAskUser); // on session shutdown
@@ -429,16 +430,6 @@
     virtual void closeEvent(QCloseEvent *e);
     bool checkSaveModified();
 
-    FileOpenStatus openSomeFile(QString path, QString location,
-                                AudioFileOpenMode = AskUser);
-    FileOpenStatus openAudioFile(QString path, QString location,
-                                 AudioFileOpenMode = AskUser);
-    FileOpenStatus openPlaylistFile(QString path, QString location,
-                                    AudioFileOpenMode = AskUser);
-    FileOpenStatus openLayerFile(QString path, QString location);
-    FileOpenStatus openImageFile(QString path, QString location);
-    FileOpenStatus openSessionFile(QString path, QString location);
-
     QString getOpenFileName(FileFinder::FileType type);
     QString getSaveFileName(FileFinder::FileType type);
     void registerLastOpenedFilePath(FileFinder::FileType type, QString path);