diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-17 01:10:35 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-17 01:10:35 +0100 |
| commit | 77fd65d0dd95506b5b51802ab58b6bd5eae60dc7 (patch) | |
| tree | efe16b8542b7b026d9fb35539b536190cefe7372 /src/lib | |
| parent | 3e56e4126ec8199f15e03c213b37f39d72c27cc3 (diff) | |
tabs -> spaces.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/audio_content.h | 6 | ||||
| -rw-r--r-- | src/lib/dcp_video_frame.h | 14 | ||||
| -rw-r--r-- | src/lib/ffmpeg_decoder.h | 2 | ||||
| -rw-r--r-- | src/lib/ffmpeg_examiner.h | 4 | ||||
| -rw-r--r-- | src/lib/job.h | 8 | ||||
| -rw-r--r-- | src/lib/playlist.h | 2 | ||||
| -rw-r--r-- | src/lib/sndfile_content.h | 8 | ||||
| -rw-r--r-- | src/lib/timer.h | 2 | ||||
| -rw-r--r-- | src/lib/types.h | 4 | ||||
| -rw-r--r-- | src/lib/util.h | 8 |
10 files changed, 29 insertions, 29 deletions
diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h index 239a9dc98..58d00e686 100644 --- a/src/lib/audio_content.h +++ b/src/lib/audio_content.h @@ -49,9 +49,9 @@ public: void as_xml (xmlpp::Node *) const; - virtual int audio_channels () const = 0; - virtual AudioContent::Frame audio_length () const = 0; - virtual int content_audio_frame_rate () const = 0; + virtual int audio_channels () const = 0; + virtual AudioContent::Frame audio_length () const = 0; + virtual int content_audio_frame_rate () const = 0; virtual int output_audio_frame_rate () const = 0; virtual AudioMapping audio_mapping () const = 0; virtual void set_audio_mapping (AudioMapping) = 0; diff --git a/src/lib/dcp_video_frame.h b/src/lib/dcp_video_frame.h index 9929b9a8a..64966ab78 100644 --- a/src/lib/dcp_video_frame.h +++ b/src/lib/dcp_video_frame.h @@ -62,7 +62,7 @@ public: protected: uint8_t* _data; ///< data - int _size; ///< data size in bytes + int _size; ///< data size in bytes }; /** @class LocallyEncodedData @@ -113,13 +113,13 @@ public: private: boost::shared_ptr<const Image> _image; - int _frame; ///< frame index within the DCP's intrinsic duration - int _frames_per_second; ///< Frames per second that we will use for the DCP - int _j2k_bandwidth; ///< J2K bandwidth to use + int _frame; ///< frame index within the DCP's intrinsic duration + int _frames_per_second; ///< Frames per second that we will use for the DCP + int _j2k_bandwidth; ///< J2K bandwidth to use boost::shared_ptr<Log> _log; ///< log - opj_cparameters_t* _parameters; ///< libopenjpeg's parameters - opj_cinfo_t* _cinfo; ///< libopenjpeg's opj_cinfo_t - opj_cio_t* _cio; ///< libopenjpeg's opj_cio_t + opj_cparameters_t* _parameters; ///< libopenjpeg's parameters + opj_cinfo_t* _cinfo; ///< libopenjpeg's opj_cinfo_t + opj_cio_t* _cio; ///< libopenjpeg's opj_cio_t }; diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h index fa318e568..e6a99b157 100644 --- a/src/lib/ffmpeg_decoder.h +++ b/src/lib/ffmpeg_decoder.h @@ -72,7 +72,7 @@ private: boost::shared_ptr<AudioBuffers> deinterleave_audio (uint8_t** data, int size); AVCodecContext* _subtitle_codec_context; ///< may be 0 if there is no subtitle - AVCodec* _subtitle_codec; ///< may be 0 if there is no subtitle + AVCodec* _subtitle_codec; ///< may be 0 if there is no subtitle std::list<boost::shared_ptr<FilterGraph> > _filter_graphs; boost::mutex _filter_graphs_mutex; diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h index ec84865ed..4912d899a 100644 --- a/src/lib/ffmpeg_examiner.h +++ b/src/lib/ffmpeg_examiner.h @@ -49,7 +49,7 @@ private: std::string stream_name (AVStream* s) const; boost::optional<double> frame_time (int) const; - std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams; - std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams; + std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams; + std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams; boost::optional<double> _first_video; }; diff --git a/src/lib/job.h b/src/lib/job.h index ce3a87f5e..716b0c5c6 100644 --- a/src/lib/job.h +++ b/src/lib/job.h @@ -80,10 +80,10 @@ protected: /** Description of a job's state */ enum State { - NEW, ///< the job hasn't been started yet - RUNNING, ///< the job is running - PAUSED, ///< the job has been paused - FINISHED_OK, ///< the job has finished successfully + NEW, ///< the job hasn't been started yet + RUNNING, ///< the job is running + PAUSED, ///< the job has been paused + FINISHED_OK, ///< the job has finished successfully FINISHED_ERROR, ///< the job has finished in error FINISHED_CANCELLED ///< the job was cancelled }; diff --git a/src/lib/playlist.h b/src/lib/playlist.h index 5346dd5e7..a31b6826e 100644 --- a/src/lib/playlist.h +++ b/src/lib/playlist.h @@ -41,7 +41,7 @@ class Region; * @brief A set of content files (video and audio), with knowledge of how they should be arranged into * a DCP. * - * This class holds Content objects, and it knows how they should be arranged. At the moment + * This class holds Content objects, and it knows how they should be arranged. At the moment * the ordering is implicit; video content is placed sequentially, and audio content is taken * from the video unless any sound-only files are present. If sound-only files exist, they * are played simultaneously (i.e. they can be split up into multiple files for different channels) diff --git a/src/lib/sndfile_content.h b/src/lib/sndfile_content.h index 87350eac7..3b61eee64 100644 --- a/src/lib/sndfile_content.h +++ b/src/lib/sndfile_content.h @@ -45,18 +45,18 @@ public: void as_xml (xmlpp::Node *) const; Time length () const; - /* AudioContent */ - int audio_channels () const { + /* AudioContent */ + int audio_channels () const { boost::mutex::scoped_lock lm (_mutex); return _audio_channels; } - AudioContent::Frame audio_length () const { + AudioContent::Frame audio_length () const { boost::mutex::scoped_lock lm (_mutex); return _audio_length; } - int content_audio_frame_rate () const { + int content_audio_frame_rate () const { boost::mutex::scoped_lock lm (_mutex); return _audio_frame_rate; } diff --git a/src/lib/timer.h b/src/lib/timer.h index 173d0d961..4a5aa12de 100644 --- a/src/lib/timer.h +++ b/src/lib/timer.h @@ -53,7 +53,7 @@ private: * spends in one of a set of states. * * Once constructed, the caller can call set_state() whenever - * its state changes. When StateTimer is destroyed, it will + * its state changes. When StateTimer is destroyed, it will * output (to cout) a summary of the time spent in each state. */ class StateTimer diff --git a/src/lib/types.h b/src/lib/types.h index 67384103d..fcf45ffa0 100644 --- a/src/lib/types.h +++ b/src/lib/types.h @@ -29,9 +29,9 @@ class Content; typedef int64_t Time; #define TIME_MAX INT64_MAX -#define TIME_HZ ((Time) 96000) +#define TIME_HZ ((Time) 96000) typedef int64_t OutputAudioFrame; -typedef int OutputVideoFrame; +typedef int OutputVideoFrame; /** @struct Crop * @brief A description of the crop of an image or video. diff --git a/src/lib/util.h b/src/lib/util.h index 5187dddcf..4888a023f 100644 --- a/src/lib/util.h +++ b/src/lib/util.h @@ -94,11 +94,11 @@ struct FrameRateConversion /** true if this DCP will run its video faster or slower than the source * without taking into account `repeat' nor `skip'. * (e.g. change_speed will be true if - * source is 29.97fps, DCP is 30fps - * source is 14.50fps, DCP is 30fps + * source is 29.97fps, DCP is 30fps + * source is 14.50fps, DCP is 30fps * but not if - * source is 15.00fps, DCP is 30fps - * source is 12.50fps, DCP is 25fps) + * source is 15.00fps, DCP is 30fps + * source is 12.50fps, DCP is 25fps) */ bool change_speed; |
