Merge branch 'master' of github.com:brunoherbelin/vimix

This commit is contained in:
brunoherbelin
2020-05-25 21:35:49 +02:00
2 changed files with 2 additions and 2 deletions

View File

@@ -149,7 +149,7 @@ public:
bool failed() const override { return origin_ == nullptr; }
void accept (Visitor& v) override;
CloneSource *clone();
CloneSource *clone() override;
inline Source *origin() const { return origin_; }
protected:

View File

@@ -112,7 +112,7 @@ static void ImportFileDialogOpen(char *filename, std::atomic<bool> *success, con
return;
fileDialogPending_ = true;
char const * open_pattern[18] = { "*vmx", "*.mp4", "*.mpg", "*.avi", "*.mov", "*.mkv", "*.webm", "*.mod", "*.wmv", "*.mxf", "*.ogg", "*.flv", "*.asf", "*.jpg", "*.png", "*.gif", "*.tif", "*.svg" };
char const * open_pattern[18] = { "*.vmx", "*.mp4", "*.mpg", "*.avi", "*.mov", "*.mkv", "*.webm", "*.mod", "*.wmv", "*.mxf", "*.ogg", "*.flv", "*.asf", "*.jpg", "*.png", "*.gif", "*.tif", "*.svg" };
char const * open_file_name;
open_file_name = tinyfd_openFileDialog( "Import a file", path.c_str(), 18, open_pattern, "All supported formats", 0);