X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcontent_audio.h;h=509e7e4a6c92f326536637238db75bebb2081f14;hp=6ee702f2c6b47b0fe10cee10e67f4f4e4735025d;hb=5eb8b5c3a1566aef638e9d9df03b88d320735092;hpb=854f2e5bbb7ffb9758b823af87034033033f3cb8 diff --git a/src/lib/content_audio.h b/src/lib/content_audio.h index 6ee702f2c..509e7e4a6 100644 --- a/src/lib/content_audio.h +++ b/src/lib/content_audio.h @@ -1,24 +1,36 @@ /* Copyright (C) 2014 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic 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, + DCP-o-matic 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. + along with DCP-o-matic. If not, see . */ +#ifndef DCPOMATIC_CONTENT_AUDIO_H +#define DCPOMATIC_CONTENT_AUDIO_H + +/** @file src/lib/content_audio.h + * @brief ContentAudio class. + */ + #include "audio_buffers.h" +#include "types.h" +/** @class ContentAudio + * @brief A block of audio from a piece of content, with a timestamp as a frame within that content. + */ class ContentAudio { public: @@ -26,12 +38,14 @@ public: : audio (new AudioBuffers (0, 0)) , frame (0) {} - - ContentAudio (boost::shared_ptr a, AudioFrame f) + + ContentAudio (boost::shared_ptr a, Frame f) : audio (a) , frame (f) {} - boost::shared_ptr audio; - AudioFrame frame; + boost::shared_ptr audio; + Frame frame; }; + +#endif