[haiku-commits] Re: r36932 - haiku/trunk/src/add-ons/media/media-add-ons/video_mixer
- From: Stephan Assmus <superstippi@xxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 25 May 2010 11:07:51 +0200
Hi,
On 2010-05-25 at 11:06:26 [+0200], dlmcpaul@xxxxxxxxx wrote:
> Author: dlmcpaul
> Date: 2010-05-25 11:06:26 +0200 (Tue, 25 May 2010)
> New Revision: 36932
> Changeset: http://dev.haiku-os.org/changeset/36932/haiku
>
> Modified:
> haiku/trunk/src/add-ons/media/media-add-ons/video_mixer/BufferMixer.cpp
> haiku/trunk/src/add-ons/media/media-add-ons/video_mixer/BufferMixer.h
> haiku/trunk/src/add-ons/media/media-add-ons/video_mixer/VideoMixerNodeCon
> sumer.cpp
> Log:
> gcc4 fixes and add removal of buffer when source disconnected
David, you should really know the style guide by now, it's annoying when new
code gets checked in that violates the style.
> Modified:
> haiku/trunk/src/add-ons/media/media-add-ons/video_mixer/BufferMixer.cpp
> ===================================================================
> --- haiku/trunk/src/add-ons/media/media-add-ons/video_mixer/BufferMixer.cpp
> 2010-05-25 06:22:39 UTC (rev 36931)
> +++ haiku/trunk/src/add-ons/media/media-add-ons/video_mixer/BufferMixer.cpp
> 2010-05-25 09:06:26 UTC (rev 36932)
> @@ -33,7 +33,7 @@
> BBuffer *outputBuffer = groupedBuffers[0];
> groupedBuffers[0] = NULL;
>
> - map<int32, BBuffer*>::iterator each;
> + std::map<int32, BBuffer*>::iterator each;
>
> for (each=groupedBuffers.begin(); each != groupedBuffers.end();
Spaces around operators.
> each++) {
> if (each->second != outputBuffer) {
> @@ -86,3 +86,17 @@
> oldBuffer->Recycle();
> }
> }
> +
> +void
> +BufferMixer::RemoveBuffer(int32 id) {
Opening brackets for methods go on a new line.
> + BBuffer *oldBuffer;
> +
> + if (id < groupedBuffers.size()) {
> + oldBuffer = groupedBuffers[id];
> + groupedBuffers[id] = NULL;
> +
> + if (oldBuffer != NULL) {
> + oldBuffer->Recycle();
> + }
Not so important IMHO, but while I am at it - single line if/while/for
statements don't need the parenthesis.
> + }
> +}
Best regards,
-Stephan
Other related posts:
