Commit 1c2211c8 authored by Randell Jesup's avatar Randell Jesup
Browse files

Bug 926598: fix some this-in-initializer warnings and remove tabs in MediaPipeline r=ekr

parent e1c19dc4

media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp

+4 −3
Original line number Diff line number Diff line 
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */

/* This Source Code Form is subject to the terms of the Mozilla Public

 * License, v. 2.0. If a copy of the MPL was not distributed with this file,

 * You can obtain one at http://mozilla.org/MPL/2.0/. */

media/webrtc/signaling/src/mediapipeline/MediaPipeline.h

+10 −8
Original line number Diff line number Diff line 
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */

/* This Source Code Form is subject to the terms of the Mozilla Public

 * License, v. 2.0. If a copy of the MPL was not distributed with this file,

 * You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -83,7 +84,6 @@ class MediaPipeline : public sigslot::has_slots<> { 
        rtcp_state_(MP_CONNECTING),

        main_thread_(main_thread),

        sts_thread_(sts_thread),

        transport_(new PipelineTransport(this)),

        rtp_send_srtp_(),

        rtcp_send_srtp_(),

        rtp_recv_srtp_(),
@@ -102,6 +102,8 @@ class MediaPipeline : public sigslot::has_slots<> { 
      if (!rtcp_transport_) {

        rtcp_transport_ = rtp_transport;

      }

      // PipelineTransport() will access this->sts_thread_; moved here for safety

      transport_ = new PipelineTransport(this);

  }



  virtual ~MediaPipeline();
@@ -517,7 +519,7 @@ class MediaPipelineReceiveVideo : public MediaPipelineReceive { 
      MediaPipelineReceive(pc, main_thread, sts_thread,

                           stream, track_id, conduit, rtp_transport,

                           rtcp_transport),

      renderer_(new PipelineRenderer(this)),

      renderer_(new PipelineRenderer(MOZ_THIS_IN_INITIALIZER_LIST())),

      listener_(new PipelineListener(stream->AsSourceStream(), track_id)) {

  }