comparison layer/ImageLayer.h @ 1608:6616e1899daa

Make ImageLayer able to report whether an image format can be opened

 
     void setLayerDormant(const LayerGeometryProvider *v, bool dormant) override;
 
     void setProperties(const QXmlAttributes &attributes) override;
 
+    static bool isImageFileSupported(QString url); // based on extension alone
+    
     virtual bool addImage(sv_frame_t frame, QString url); // using a command
 
 protected slots:
     void checkAddSources();
     void fileSourceReady();

     typedef std::map<QString, QImage> ImageMap;
     typedef std::map<const LayerGeometryProvider *, ImageMap> ViewImageMap;
     typedef std::map<QString, FileSource *> FileSourceMap;
 
     static ImageMap m_images;
-    static QMutex m_imageMapMutex;
+    static FileSourceMap m_fileSources;
+    static QMutex m_staticMutex;
+
     mutable ViewImageMap m_scaled;
-    mutable FileSourceMap m_fileSources;
 
-    QString getLocalFilename(QString img) const;
-    void checkAddSource(QString img) const;
+    static QString getLocalFilename(QString img);
+    static void checkAddSource(QString img, bool synchronise);
+    void checkAddSourceAndConnect(QString img);
 
     ModelId m_model; // an ImageModel
     bool m_editing;
     QPoint m_editOrigin;
     Event m_originalPoint;