summaryrefslogtreecommitdiff
path: root/src/lib/format.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-05-04 15:59:31 +0100
committerCarl Hetherington <cth@carlh.net>2013-05-04 15:59:31 +0100
commitcd4a82d90677cec80e891ac190000cb70767446f (patch)
tree835776cf87239fb13b2da994c2d4285b03d0bea0 /src/lib/format.cc
parent2cc2dc2aeaec62a4983991170fc5368e10d21748 (diff)
parent1738f2e7336734190bed7e94ce3d691d4a9c9e4c (diff)
Merge master.
Diffstat (limited to 'src/lib/format.cc')
-rw-r--r--src/lib/format.cc17
1 files changed, 0 insertions, 17 deletions
diff --git a/src/lib/format.cc b/src/lib/format.cc
index a83d53ebd..f5026c0da 100644
--- a/src/lib/format.cc
+++ b/src/lib/format.cc
@@ -60,13 +60,6 @@ FixedFormat::name () const
return s.str ();
}
-/** @return Identifier for this format as metadata for a Film's metadata file */
-string
-Format::as_metadata () const
-{
- return _id;
-}
-
/** Fill our _formats vector with all available formats */
void
Format::setup_formats ()
@@ -165,16 +158,6 @@ Format::from_id (string i)
return *j;
}
-
-/** @param m Metadata, as returned from as_metadata().
- * @return Matching Format, or 0.
- */
-Format const *
-Format::from_metadata (string m)
-{
- return from_id (m);
-}
-
/** @return All available formats */
vector<Format const *>
Format::all ()