From 3e56e4126ec8199f15e03c213b37f39d72c27cc3 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 17 Jul 2013 01:10:23 +0100 Subject: [PATCH] tabs -> spaces. --- src/lib/cross.cc | 4 +-- src/lib/dolby_cp750.cc | 2 +- src/lib/filter.cc | 48 +++++++++++++++++----------------- src/lib/image.cc | 12 ++++----- src/lib/job.cc | 2 +- src/lib/player.cc | 56 ++++++++++++++++++++-------------------- src/lib/util.cc | 12 ++++----- src/lib/video_content.cc | 14 +++++----- src/lib/video_decoder.cc | 2 +- 9 files changed, 76 insertions(+), 76 deletions(-) diff --git a/src/lib/cross.cc b/src/lib/cross.cc index ee0ef89b2..4e3739f57 100644 --- a/src/lib/cross.cc +++ b/src/lib/cross.cc @@ -82,8 +82,8 @@ cpu_info () char buffer[64]; N = sizeof (buffer); if (sysctlbyname ("machdep.cpu.brand_string", buffer, &N, 0, 0) == 0) { - info.first = buffer; - } + info.first = buffer; + } #endif return info; diff --git a/src/lib/dolby_cp750.cc b/src/lib/dolby_cp750.cc index b45e62b87..162626ff0 100644 --- a/src/lib/dolby_cp750.cc +++ b/src/lib/dolby_cp750.cc @@ -24,7 +24,7 @@ using namespace std; DolbyCP750::DolbyCP750 () - : SoundProcessor ("dolby_cp750", _("Dolby CP750")) + : SoundProcessor ("dolby_cp750", _("Dolby CP750")) { } diff --git a/src/lib/filter.cc b/src/lib/filter.cc index 4d429b303..640a531e8 100644 --- a/src/lib/filter.cc +++ b/src/lib/filter.cc @@ -65,30 +65,30 @@ Filter::setup_filters () { /* Note: "none" is a magic id name, so don't use it here */ - maybe_add (N_("pphb"), _("Horizontal deblocking filter"), _("De-blocking"), N_(""), N_("hb")); - maybe_add (N_("ppvb"), _("Vertical deblocking filter"), _("De-blocking"), N_(""), N_("vb")); - maybe_add (N_("ppha"), _("Horizontal deblocking filter A"), _("De-blocking"), N_(""), N_("ha")); - maybe_add (N_("ppva"), _("Vertical deblocking filter A"), _("De-blocking"), N_(""), N_("va")); - maybe_add (N_("pph1"), _("Experimental horizontal deblocking filter 1"), _("De-blocking"), N_(""), N_("h1")); - maybe_add (N_("pphv"), _("Experimental vertical deblocking filter 1"), _("De-blocking"), N_(""), N_("v1")); - maybe_add (N_("ppdr"), _("Deringing filter"), _("Misc"), N_(""), N_("dr")); - maybe_add (N_("pplb"), _("Linear blend deinterlacer"), _("De-interlacing"), N_(""), N_("lb")); - maybe_add (N_("ppli"), _("Linear interpolating deinterlacer"), _("De-interlacing"), N_(""), N_("li")); - maybe_add (N_("ppci"), _("Cubic interpolating deinterlacer"), _("De-interlacing"), N_(""), N_("ci")); - maybe_add (N_("ppmd"), _("Median deinterlacer"), _("De-interlacing"), N_(""), N_("md")); - maybe_add (N_("ppfd"), _("FFMPEG deinterlacer"), _("De-interlacing"), N_(""), N_("fd")); - maybe_add (N_("ppl5"), _("FIR low-pass deinterlacer"), _("De-interlacing"), N_(""), N_("l5")); - maybe_add (N_("mcdeint"), _("Motion compensating deinterlacer"), _("De-interlacing"), N_("mcdeint"), N_("")); - maybe_add (N_("kerndeint"), _("Kernel deinterlacer"), _("De-interlacing"), N_("kerndeint"), N_("")); - maybe_add (N_("yadif"), _("Yet Another Deinterlacing Filter"), _("De-interlacing"), N_("yadif"), N_("")); - maybe_add (N_("pptn"), _("Temporal noise reducer"), _("Noise reduction"), N_(""), N_("tn")); - maybe_add (N_("ppfq"), _("Force quantizer"), _("Misc"), N_(""), N_("fq")); - maybe_add (N_("gradfun"), _("Gradient debander"), _("Misc"), N_("gradfun"), N_("")); - maybe_add (N_("unsharp"), _("Unsharp mask and Gaussian blur"), _("Misc"), N_("unsharp"), N_("")); - maybe_add (N_("denoise3d"), _("3D denoiser"), _("Noise reduction"), N_("denoise3d"), N_("")); - maybe_add (N_("hqdn3d"), _("High quality 3D denoiser"), _("Noise reduction"), N_("hqdn3d"), N_("")); - maybe_add (N_("telecine"), _("Telecine filter"), _("Misc"), N_("telecine"), N_("")); - maybe_add (N_("ow"), _("Overcomplete wavelet denoiser"), _("Noise reduction"), N_("mp=ow"), N_("")); + maybe_add (N_("pphb"), _("Horizontal deblocking filter"), _("De-blocking"), N_(""), N_("hb")); + maybe_add (N_("ppvb"), _("Vertical deblocking filter"), _("De-blocking"), N_(""), N_("vb")); + maybe_add (N_("ppha"), _("Horizontal deblocking filter A"), _("De-blocking"), N_(""), N_("ha")); + maybe_add (N_("ppva"), _("Vertical deblocking filter A"), _("De-blocking"), N_(""), N_("va")); + maybe_add (N_("pph1"), _("Experimental horizontal deblocking filter 1"), _("De-blocking"), N_(""), N_("h1")); + maybe_add (N_("pphv"), _("Experimental vertical deblocking filter 1"), _("De-blocking"), N_(""), N_("v1")); + maybe_add (N_("ppdr"), _("Deringing filter"), _("Misc"), N_(""), N_("dr")); + maybe_add (N_("pplb"), _("Linear blend deinterlacer"), _("De-interlacing"), N_(""), N_("lb")); + maybe_add (N_("ppli"), _("Linear interpolating deinterlacer"), _("De-interlacing"), N_(""), N_("li")); + maybe_add (N_("ppci"), _("Cubic interpolating deinterlacer"), _("De-interlacing"), N_(""), N_("ci")); + maybe_add (N_("ppmd"), _("Median deinterlacer"), _("De-interlacing"), N_(""), N_("md")); + maybe_add (N_("ppfd"), _("FFMPEG deinterlacer"), _("De-interlacing"), N_(""), N_("fd")); + maybe_add (N_("ppl5"), _("FIR low-pass deinterlacer"), _("De-interlacing"), N_(""), N_("l5")); + maybe_add (N_("mcdeint"), _("Motion compensating deinterlacer"), _("De-interlacing"), N_("mcdeint"), N_("")); + maybe_add (N_("kerndeint"), _("Kernel deinterlacer"), _("De-interlacing"), N_("kerndeint"), N_("")); + maybe_add (N_("yadif"), _("Yet Another Deinterlacing Filter"), _("De-interlacing"), N_("yadif"), N_("")); + maybe_add (N_("pptn"), _("Temporal noise reducer"), _("Noise reduction"), N_(""), N_("tn")); + maybe_add (N_("ppfq"), _("Force quantizer"), _("Misc"), N_(""), N_("fq")); + maybe_add (N_("gradfun"), _("Gradient debander"), _("Misc"), N_("gradfun"), N_("")); + maybe_add (N_("unsharp"), _("Unsharp mask and Gaussian blur"), _("Misc"), N_("unsharp"), N_("")); + maybe_add (N_("denoise3d"), _("3D denoiser"), _("Noise reduction"), N_("denoise3d"), N_("")); + maybe_add (N_("hqdn3d"), _("High quality 3D denoiser"), _("Noise reduction"), N_("hqdn3d"), N_("")); + maybe_add (N_("telecine"), _("Telecine filter"), _("Misc"), N_("telecine"), N_("")); + maybe_add (N_("ow"), _("Overcomplete wavelet denoiser"), _("Noise reduction"), N_("mp=ow"), N_("")); } void diff --git a/src/lib/image.cc b/src/lib/image.cc index f8dc111b0..bdf7fd173 100644 --- a/src/lib/image.cc +++ b/src/lib/image.cc @@ -243,13 +243,13 @@ void Image::make_black () { /* U/V black value for 8-bit colour */ - static uint8_t const eight_bit_uv = (1 << 7) - 1; + static uint8_t const eight_bit_uv = (1 << 7) - 1; /* U/V black value for 9-bit colour */ - static uint16_t const nine_bit_uv = (1 << 8) - 1; + static uint16_t const nine_bit_uv = (1 << 8) - 1; /* U/V black value for 10-bit colour */ - static uint16_t const ten_bit_uv = (1 << 9) - 1; + static uint16_t const ten_bit_uv = (1 << 9) - 1; /* U/V black value for 16-bit colour */ - static uint16_t const sixteen_bit_uv = (1 << 15) - 1; + static uint16_t const sixteen_bit_uv = (1 << 15) - 1; switch (_pixel_format) { case PIX_FMT_YUV420P: @@ -305,9 +305,9 @@ Image::make_black () for (int y = 0; y < Y; ++y) { for (int x = 0; x < X / 4; ++x) { *p++ = eight_bit_uv; // Cb - *p++ = 0; // Y0 + *p++ = 0; // Y0 *p++ = eight_bit_uv; // Cr - *p++ = 0; // Y1 + *p++ = 0; // Y1 } } break; diff --git a/src/lib/job.cc b/src/lib/job.cc index 080d1eaf6..4fbe70771 100644 --- a/src/lib/job.cc +++ b/src/lib/job.cc @@ -86,7 +86,7 @@ Job::run_wrapper () } catch (boost::thread_interrupted &) { set_state (FINISHED_CANCELLED); - + } catch (std::exception& e) { set_progress (1); diff --git a/src/lib/player.cc b/src/lib/player.cc index 50f401fb7..ec20892ef 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -73,11 +73,11 @@ public: std::ostream& operator<<(std::ostream& s, Piece const & p) { if (dynamic_pointer_cast (p.content)) { - s << "\tffmpeg "; + s << "\tffmpeg "; } else if (dynamic_pointer_cast (p.content)) { s << "\timagemagick"; } else if (dynamic_pointer_cast (p.content)) { - s << "\tsndfile "; + s << "\tsndfile "; } s << " at " << p.content->start() << " until " << p.content->end(); @@ -126,8 +126,8 @@ Player::pass () cout << "= PASS\n"; #endif - Time earliest_t = TIME_MAX; - shared_ptr earliest; + Time earliest_t = TIME_MAX; + shared_ptr earliest; enum { VIDEO, AUDIO @@ -198,7 +198,7 @@ Player::pass () cout << "\tpost pass " << _video_position << " " << _audio_position << "\n"; #endif - return false; + return false; } void @@ -242,7 +242,7 @@ Player::process_video (weak_ptr weak_piece, shared_ptr image _last_video = piece->content; #endif - Video (work_image, same, time); + Video (work_image, same, time); time += TIME_HZ / _film->dcp_video_frame_rate(); if (frc.repeat) { @@ -298,13 +298,13 @@ Player::process_audio (weak_ptr weak_piece, shared_ptr _audio_position) { - /* We can emit some audio from our buffers */ - OutputAudioFrame const N = _film->time_to_audio_frames (time - _audio_position); + if (time > _audio_position) { + /* We can emit some audio from our buffers */ + OutputAudioFrame const N = _film->time_to_audio_frames (time - _audio_position); if (N > _audio_buffers.frames()) { /* We need some extra silence before whatever is in the buffers */ _audio_buffers.ensure_size (N); @@ -313,21 +313,21 @@ Player::process_audio (weak_ptr weak_piece, shared_ptr emit (new AudioBuffers (_audio_buffers.channels(), N)); - emit->copy_from (&_audio_buffers, N, 0, 0); - Audio (emit, _audio_position); - _audio_position = piece->audio_position = time + _film->audio_frames_to_time (N); - - /* And remove it from our buffers */ - if (_audio_buffers.frames() > N) { - _audio_buffers.move (N, 0, _audio_buffers.frames() - N); - } - _audio_buffers.set_frames (_audio_buffers.frames() - N); - } - - /* Now accumulate the new audio into our buffers */ - _audio_buffers.ensure_size (_audio_buffers.frames() + audio->frames()); - _audio_buffers.accumulate_frames (audio.get(), 0, 0, audio->frames ()); + shared_ptr emit (new AudioBuffers (_audio_buffers.channels(), N)); + emit->copy_from (&_audio_buffers, N, 0, 0); + Audio (emit, _audio_position); + _audio_position = piece->audio_position = time + _film->audio_frames_to_time (N); + + /* And remove it from our buffers */ + if (_audio_buffers.frames() > N) { + _audio_buffers.move (N, 0, _audio_buffers.frames() - N); + } + _audio_buffers.set_frames (_audio_buffers.frames() - N); + } + + /* Now accumulate the new audio into our buffers */ + _audio_buffers.ensure_size (_audio_buffers.frames() + audio->frames()); + _audio_buffers.accumulate_frames (audio.get(), 0, 0, audio->frames ()); _audio_buffers.set_frames (_audio_buffers.frames() + audio->frames()); } @@ -408,7 +408,7 @@ Player::setup_pieces () shared_ptr piece (new Piece (*i)); - /* XXX: into content? */ + /* XXX: into content? */ shared_ptr fc = dynamic_pointer_cast (*i); if (fc) { diff --git a/src/lib/util.cc b/src/lib/util.cc index ec99b2f89..7e7e579a4 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -724,12 +724,12 @@ LocaleGuard::LocaleGuard () { char const * old = setlocale (LC_NUMERIC, 0); - if (old) { - _old = strdup (old); - if (strcmp (_old, "C")) { - setlocale (LC_NUMERIC, "C"); - } - } + if (old) { + _old = strdup (old); + if (strcmp (_old, "C")) { + setlocale (LC_NUMERIC, "C"); + } + } } LocaleGuard::~LocaleGuard () diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 4b8941c00..a157b0599 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -97,14 +97,14 @@ VideoContent::take_from_video_examiner (shared_ptr d) libdcp::Size const vs = d->video_size (); float const vfr = d->video_frame_rate (); - { - boost::mutex::scoped_lock lm (_mutex); - _video_size = vs; + { + boost::mutex::scoped_lock lm (_mutex); + _video_size = vs; _video_frame_rate = vfr; - } - - signal_changed (VideoContentProperty::VIDEO_SIZE); - signal_changed (VideoContentProperty::VIDEO_FRAME_RATE); + } + + signal_changed (VideoContentProperty::VIDEO_SIZE); + signal_changed (VideoContentProperty::VIDEO_FRAME_RATE); } diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc index 457cfe47b..38d5dfcb8 100644 --- a/src/lib/video_decoder.cc +++ b/src/lib/video_decoder.cc @@ -35,7 +35,7 @@ VideoDecoder::VideoDecoder (shared_ptr f) void VideoDecoder::video (shared_ptr image, bool same, VideoContent::Frame frame) { - Video (image, same, frame); + Video (image, same, frame); _video_position = frame + 1; } -- 2.30.2