From f9fcc34179a6f86425427741c60d8876099d3ed3 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 1 Jul 2015 17:25:48 +0100
Subject: [PATCH] Remove some unused methods.

---
 src/lib/audio_stream.cc |  7 -------
 src/lib/audio_stream.h  |  1 -
 src/lib/film.cc         | 16 ----------------
 src/lib/film.h          |  1 -
 src/lib/util.cc         | 24 ------------------------
 src/lib/util.h          |  3 ---
 6 files changed, 52 deletions(-)

diff --git a/src/lib/audio_stream.cc b/src/lib/audio_stream.cc
index bf55e0255..2119d0834 100644
--- a/src/lib/audio_stream.cc
+++ b/src/lib/audio_stream.cc
@@ -41,13 +41,6 @@ AudioStream::set_mapping (AudioMapping mapping)
 	_mapping = mapping;
 }
 
-void
-AudioStream::set_frame_rate (int frame_rate)
-{
-	boost::mutex::scoped_lock lm (_mutex);
-	_frame_rate = frame_rate;
-}
-
 int
 AudioStream::channels () const
 {
diff --git a/src/lib/audio_stream.h b/src/lib/audio_stream.h
index 80ccc4cdb..3b236542c 100644
--- a/src/lib/audio_stream.h
+++ b/src/lib/audio_stream.h
@@ -32,7 +32,6 @@ public:
 	AudioStream (int frame_rate, AudioMapping mapping);
 
 	void set_mapping (AudioMapping mapping);
-	void set_frame_rate (int frame_rate);
 
 	AudioMapping mapping () const {
 		boost::mutex::scoped_lock lm (_mutex);
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 51f4c7156..dbb73303c 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -227,22 +227,6 @@ Film::internal_video_asset_filename () const
 	return video_identifier() + ".mxf";
 }
 
-string
-Film::filename_safe_name () const
-{
-	string const n = name ();
-	string o;
-	for (size_t i = 0; i < n.length(); ++i) {
-		if (isalnum (n[i])) {
-			o += n[i];
-		} else {
-			o += "_";
-		}
-	}
-
-	return o;
-}
-
 boost::filesystem::path
 Film::audio_analysis_path () const
 {
diff --git a/src/lib/film.h b/src/lib/film.h
index 6c7333ec1..fe1795bd0 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -286,7 +286,6 @@ private:
 	std::string video_identifier () const;
 	void playlist_changed ();
 	void playlist_content_changed (boost::weak_ptr<Content>, int, bool frequent);
-	std::string filename_safe_name () const;
 	void maybe_add_content (boost::weak_ptr<Job>, boost::weak_ptr<Content>);
 
 	/** Log to write to */
diff --git a/src/lib/util.cc b/src/lib/util.cc
index 05eb3121e..3837aacc7 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -440,19 +440,6 @@ md5_digest_head_tail (vector<boost::filesystem::path> files, boost::uintmax_t si
 	return digester.get ();
 }
 
-/** @param An arbitrary audio frame rate.
- *  @return The appropriate DCP-approved frame rate (48kHz or 96kHz).
- */
-int
-dcp_audio_frame_rate (int fs)
-{
-	if (fs <= 48000) {
-		return 48000;
-	}
-
-	return 96000;
-}
-
 /** Round a number up to the nearest multiple of another number.
  *  @param c Index.
  *  @param s Array of numbers to round, indexed by c.
@@ -466,17 +453,6 @@ stride_round_up (int c, int const * stride, int t)
 	return a - (a % t);
 }
 
-/** @param n A number.
- *  @param r Rounding `boundary' (must be a power of 2)
- *  @return n rounded to the nearest r
- */
-int
-round_to (float n, int r)
-{
-	DCPOMATIC_ASSERT (r == 1 || r == 2 || r == 4);
-	return int (n + float(r) / 2) &~ (r - 1);
-}
-
 /** Trip an assert if the caller is not in the UI thread */
 void
 ensure_ui_thread ()
diff --git a/src/lib/util.h b/src/lib/util.h
index da6f660a7..836823607 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -76,9 +76,7 @@ extern boost::filesystem::path mo_path ();
 #endif
 extern std::string tidy_for_filename (std::string);
 extern dcp::Size fit_ratio_within (float ratio, dcp::Size);
-extern int dcp_audio_frame_rate (int);
 extern int stride_round_up (int, int const *, int);
-extern int round_to (float n, int r);
 extern void* wrapped_av_malloc (size_t);
 
 class FFmpegSubtitlePeriod
@@ -104,4 +102,3 @@ extern std::string video_asset_filename (boost::shared_ptr<dcp::PictureAsset> as
 extern std::string audio_asset_filename (boost::shared_ptr<dcp::SoundAsset> asset);
 
 #endif
-
-- 
2.30.2