Rename some methods.

[dcpomatic.git] / src / lib / audio_decoder.cc

diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index 268a9d29629cfa7b108f3c6853e568fefd1e69ab..404c85466bd036dbf0224f01fcdbf96fafedcddb 100644 (file)
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -30,25 +30,25 @@ using std::cout;
 using std::map;
 using boost::shared_ptr;
 
-AudioDecoder::AudioDecoder (shared_ptr<const AudioContent> content)
-       : _audio_content (content)
-       , _ignore_audio (false)
+AudioDecoder::AudioDecoder (Decoder* parent, shared_ptr<const AudioContent> content, bool fast, shared_ptr<Log> log)
+       : _ignore (false)
+       , _fast (fast)
 {
-       BOOST_FOREACH (AudioStreamPtr i, content->audio_streams ()) {
-               _streams[i] = shared_ptr<AudioDecoderStream> (new AudioDecoderStream (_audio_content, i, this));
+       BOOST_FOREACH (AudioStreamPtr i, content->streams ()) {
+               _streams[i] = shared_ptr<AudioDecoderStream> (new AudioDecoderStream (content, i, parent, log));
        }
 }
 
 ContentAudio
-AudioDecoder::get_audio (AudioStreamPtr stream, Frame frame, Frame length, bool accurate)
+AudioDecoder::get (AudioStreamPtr stream, Frame frame, Frame length, bool accurate)
 {
        return _streams[stream]->get (frame, length, accurate);
 }
 
 void
-AudioDecoder::audio (AudioStreamPtr stream, shared_ptr<const AudioBuffers> data, ContentTime time)
+AudioDecoder::give (AudioStreamPtr stream, shared_ptr<const AudioBuffers> data, ContentTime time)
 {
-       if (_ignore_audio) {
+       if (_ignore) {
                return;
        }
 
@@ -94,9 +94,9 @@ AudioDecoder::seek (ContentTime t, bool accurate)
        }
 }
 
-/** Set this player never to produce any audio data */
+/** Set this decoder never to produce any data */
 void
-AudioDecoder::set_ignore_audio ()
+AudioDecoder::set_ignore ()
 {
-       _ignore_audio = true;
+       _ignore = true;
 }