projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
format.h
diff --git
a/src/lib/format.h
b/src/lib/format.h
index f240c89fc85db4b76ee45f34291e8294dfdbd5b4..d45a3a10acc4bc6f6c3d2ebf64be445d9b6c0f07 100644
(file)
--- a/
src/lib/format.h
+++ b/
src/lib/format.h
@@
-67,10
+67,7
@@
public:
return _dci_name;
}
return _dci_name;
}
- std::string as_metadata () const;
-
static Format const * from_nickname (std::string n);
static Format const * from_nickname (std::string n);
- static Format const * from_metadata (std::string m);
static Format const * from_id (std::string i);
static std::vector<Format const *> all ();
static void setup_formats ();
static Format const * from_id (std::string i);
static std::vector<Format const *> all ();
static void setup_formats ();