tabs -> spaces.

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 239a9dc98a2851e0d2cf38a76c6ce66be1355abd..58d00e6860906fdd40662ff53f3567e0db6c3fa3 100644 (file)
--- 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 9929b9a8a22ab0b7e0bc796466db5ca02b720b40..64966ab786b98c05433a66728531e6a1cef98915 100644 (file)
--- 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 fa318e56828eb9140555c6c6ea72a48b7eab0c57..e6a99b157b4ba2d4d5871583109a5375d78f02f3 100644 (file)
--- 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 ec84865ed7cce45fdcc40999e5bb4f197fb55ce2..4912d899a85f7a70015fa83c72fe61743cb6aab2 100644 (file)
--- 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 ce3a87f5efdb29b8a8555c06c7446dc7972705b9..716b0c5c62ae8fe4119d155d6b55a77b0772f6dd 100644 (file)
--- 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 5346dd5e7488591d7aabbfb7f722e0946e71c8dd..a31b6826e667db00cfd1f0b68cc198a740d27714 100644 (file)
--- 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 87350eac70d13314f0721128564e25466465bd46..3b61eee64a848253ec6afe439dc778be67beeea4 100644 (file)
--- 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 173d0d961f44daed81d3145d4c5a24d3edfe8c75..4a5aa12de331c0fe5b024144bc18923e76ccc8eb 100644 (file)
--- 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 67384103d2145ab42b1f888459cd94890ecb7f5b..fcf45ffa04ccb17cc7fc144f9eca01e4efe5d615 100644 (file)
--- 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 5187dddcf40d899cbc0cde5da24529274db84675..4888a023f2bf6359f607206029fa5c17e1192b1c 100644 (file)
--- 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;