Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(192)

Unified Diff: talk/app/webrtc/mediastream.h

Issue 1610243002: Move talk/app/webrtc to webrtc/api (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Removed processing of api.gyp for Chromium builds Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « talk/app/webrtc/mediacontroller.cc ('k') | talk/app/webrtc/mediastream.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/app/webrtc/mediastream.h
diff --git a/talk/app/webrtc/mediastream.h b/talk/app/webrtc/mediastream.h
deleted file mode 100644
index 240512d9c9ce9cabdecb955c8bc2abaaca6e8bd9..0000000000000000000000000000000000000000
--- a/talk/app/webrtc/mediastream.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * libjingle
- * Copyright 2011 Google Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// This file contains the implementation of MediaStreamInterface interface.
-
-#ifndef TALK_APP_WEBRTC_MEDIASTREAM_H_
-#define TALK_APP_WEBRTC_MEDIASTREAM_H_
-
-#include <string>
-#include <vector>
-
-#include "talk/app/webrtc/mediastreaminterface.h"
-#include "talk/app/webrtc/notifier.h"
-
-namespace webrtc {
-
-class MediaStream : public Notifier<MediaStreamInterface> {
- public:
- static rtc::scoped_refptr<MediaStream> Create(const std::string& label);
-
- std::string label() const override { return label_; }
-
- bool AddTrack(AudioTrackInterface* track) override;
- bool AddTrack(VideoTrackInterface* track) override;
- bool RemoveTrack(AudioTrackInterface* track) override;
- bool RemoveTrack(VideoTrackInterface* track) override;
- virtual rtc::scoped_refptr<AudioTrackInterface>
- FindAudioTrack(const std::string& track_id);
- virtual rtc::scoped_refptr<VideoTrackInterface>
- FindVideoTrack(const std::string& track_id);
-
- AudioTrackVector GetAudioTracks() override { return audio_tracks_; }
- VideoTrackVector GetVideoTracks() override { return video_tracks_; }
-
- protected:
- explicit MediaStream(const std::string& label);
-
- private:
- template <typename TrackVector, typename Track>
- bool AddTrack(TrackVector* Tracks, Track* track);
- template <typename TrackVector>
- bool RemoveTrack(TrackVector* Tracks, MediaStreamTrackInterface* track);
-
- std::string label_;
- AudioTrackVector audio_tracks_;
- VideoTrackVector video_tracks_;
-};
-
-} // namespace webrtc
-
-#endif // TALK_APP_WEBRTC_MEDIASTREAM_H_
« no previous file with comments | « talk/app/webrtc/mediacontroller.cc ('k') | talk/app/webrtc/mediastream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698