summaryrefslogtreecommitdiff
path: root/src/lib/player.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-07-27 21:10:45 +0100
committerCarl Hetherington <cth@carlh.net>2013-07-27 21:10:45 +0100
commitbcb746a19d5cc5377eacb33b73b59549a7372487 (patch)
tree119fcf92cdf8e294e44dbf7d8dee240141d2ec00 /src/lib/player.h
parent2777ab63db3d190a5bc0ea238541558e87ea9b47 (diff)
Adjust AudioMerger to non-signalling API.
Diffstat (limited to 'src/lib/player.h')
-rw-r--r--src/lib/player.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/lib/player.h b/src/lib/player.h
index 206254713..79eecf136 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -94,7 +94,6 @@ private:
boost::shared_ptr<Resampler> resampler (boost::shared_ptr<AudioContent>, bool);
void film_changed (Film::Property);
void update_subtitle ();
- void merger_process_audio (boost::shared_ptr<const AudioBuffers>, Time);
boost::shared_ptr<const Film> _film;
boost::shared_ptr<const Playlist> _playlist;