From 09a9ac376db005a40a351736bcff4077f098825d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 26 Jun 2013 01:21:21 +0100 Subject: Another try at sorting out the thorny question of timing. --- src/lib/null_content.cc | 57 ------------------------------------------------- 1 file changed, 57 deletions(-) delete mode 100644 src/lib/null_content.cc (limited to 'src/lib/null_content.cc') diff --git a/src/lib/null_content.cc b/src/lib/null_content.cc deleted file mode 100644 index 3bbda92da..000000000 --- a/src/lib/null_content.cc +++ /dev/null @@ -1,57 +0,0 @@ -/* - Copyright (C) 2013 Carl Hetherington - - 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 - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - -#include "null_content.h" -#include "film.h" - -using boost::shared_ptr; - -NullContent::NullContent (shared_ptr f, Time s, Time len) - : Content (f, s) - , VideoContent (f, s, f->time_to_video_frames (len)) - , AudioContent (f, s) - , _audio_length (f->time_to_audio_frames (len)) - , _length (len) -{ - -} - -int -NullContent::content_audio_frame_rate () const -{ - return output_audio_frame_rate (); -} - - -int -NullContent::output_audio_frame_rate () const -{ - shared_ptr film = _film.lock (); - assert (film); - return film->dcp_audio_frame_rate (); -} - -int -NullContent::audio_channels () const -{ - shared_ptr film = _film.lock (); - assert (film); - return film->dcp_audio_channels (); -} - -- cgit v1.2.3